From 5bd0d4c7fb35186712c55b38f6f331cd838d59dc Mon Sep 17 00:00:00 2001 From: Alexander Schwinn Date: Thu, 12 Mar 2020 23:35:46 +0100 Subject: [PATCH 1/2] formatting --- libxfce4ui/xfce-filename-input.c | 58 +++++++++++++++++--------------- libxfce4ui/xfce-filename-input.h | 14 ++++---- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/libxfce4ui/xfce-filename-input.c b/libxfce4ui/xfce-filename-input.c index 7d5dad1..a11eb69 100644 --- a/libxfce4ui/xfce-filename-input.c +++ b/libxfce4ui/xfce-filename-input.c @@ -60,13 +60,13 @@ enum static void xfce_filename_input_changed (GtkEditable *editable, - gpointer data); + gpointer data); -static void xfce_filename_input_finalize (GObject *object); +static void xfce_filename_input_finalize (GObject *object); -static gboolean xfce_filename_input_entry_undo (GtkWidget *widget, - GdkEvent *event, - gpointer data); +static gboolean xfce_filename_input_entry_undo (GtkWidget *widget, + GdkEvent *event, + gpointer data); struct _XfceFilenameInputClass @@ -80,16 +80,16 @@ struct _XfceFilenameInputClass struct _XfceFilenameInput { - GtkBox parent; + GtkBox parent; GtkEntry *entry; GtkLabel *label; - GRegex *whitespace_regex; - GRegex *dir_sep_regex; + GRegex *whitespace_regex; + GRegex *dir_sep_regex; - guint max_text_length; - gchar *original_filename; + guint max_text_length; + gchar *original_filename; }; static guint signals[N_SIGS]; @@ -203,7 +203,8 @@ xfce_filename_input_check (XfceFilenameInput *filename_input) } void -xfce_filename_input_set_original_filename (XfceFilenameInput *filename_input, gchar *filename) +xfce_filename_input_set_original_filename (XfceFilenameInput *filename_input, + gchar *filename) { /* we only allow the original filename to be set once */ if (filename == NULL || filename_input->original_filename != NULL) @@ -214,7 +215,8 @@ xfce_filename_input_set_original_filename (XfceFilenameInput *filename_input, gc } void -xfce_filename_input_set_max_length (XfceFilenameInput *filename_input, gint max_length) +xfce_filename_input_set_max_length (XfceFilenameInput *filename_input, + gint max_length) { filename_input->max_text_length = max_length; } @@ -233,20 +235,20 @@ xfce_filename_input_get_text (XfceFilenameInput *filename_input) static void xfce_filename_input_changed (GtkEditable *editable, - gpointer data) + gpointer data) { XfceFilenameInput *filename_input = XFCE_FILENAME_INPUT (data); - GtkEntry *entry = GTK_ENTRY (editable); - GtkLabel *label = filename_input->label; + GtkEntry *entry = GTK_ENTRY (editable); + GtkLabel *label = filename_input->label; - gint text_length; - const gchar *text; - const gchar *label_text = ""; - const gchar *icon_name = NULL; - gboolean new_text_valid = TRUE; + gint text_length; + const gchar *text; + const gchar *label_text = ""; + const gchar *icon_name = NULL; + gboolean new_text_valid = TRUE; - GMatchInfo *matchInfo; - gboolean match_ws, match_ds; + GMatchInfo *matchInfo; + gboolean match_ws, match_ds; text_length = gtk_entry_get_text_length (entry); text = gtk_entry_get_text (entry); /* NB this string must not be modified or freed, @@ -289,7 +291,7 @@ xfce_filename_input_changed (GtkEditable *editable, gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, icon_name); - gtk_label_set_text (label,label_text); + gtk_label_set_text (label, label_text); /* send a signal to indicate whether the filename is valid */ gtk_entry_set_activates_default (entry, new_text_valid); @@ -302,10 +304,10 @@ xfce_filename_input_changed (GtkEditable *editable, static gboolean xfce_filename_input_entry_undo (GtkWidget *widget, GdkEvent *event, - gpointer data) + gpointer data) { - guint keyval; - GdkModifierType state; + guint keyval; + GdkModifierType state; XfceFilenameInput *filename_input = XFCE_FILENAME_INPUT (data); if (filename_input->original_filename == NULL) @@ -334,13 +336,13 @@ xfce_filename_input_entry_undo (GtkWidget *widget, */ void -xfce_filename_input_desensitise_widget( GtkWidget *widget) +xfce_filename_input_desensitise_widget (GtkWidget *widget) { gtk_widget_set_sensitive (widget, FALSE); } void -xfce_filename_input_sensitise_widget( GtkWidget *widget ) +xfce_filename_input_sensitise_widget (GtkWidget *widget) { gtk_widget_set_sensitive (widget, TRUE); } diff --git a/libxfce4ui/xfce-filename-input.h b/libxfce4ui/xfce-filename-input.h index f53da33..b9c798a 100644 --- a/libxfce4ui/xfce-filename-input.h +++ b/libxfce4ui/xfce-filename-input.h @@ -34,23 +34,23 @@ typedef struct _XfceFilenameInput XfceFilenameInput; #define XFCE_TYPE_FILENAME_INPUT (xfce_filename_input_get_type()) #define XFCE_FILENAME_INPUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_FILENAME_INPUT, XfceFilenameInput)) #define XFCE_IS_FILENAME_INPUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFCE_TYPE_FILENAME_INPUT)) -#define XFCE_FILENAME_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFCE_TYPE_FILENAME_INPUT, XfceFilenameInputClass)) -#define XFCE_IS_FILENAME_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFCE_TYPE_FILENAME_INPUT)) -#define XFCE_FILENAME_INPUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFCE_TYPE_FILENAME_INPUT, XfceFilenameInputClass)) +#define XFCE_FILENAME_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFCE_TYPE_FILENAME_INPUT, XfceFilenameInputClass)) +#define XFCE_IS_FILENAME_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFCE_TYPE_FILENAME_INPUT)) +#define XFCE_FILENAME_INPUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFCE_TYPE_FILENAME_INPUT, XfceFilenameInputClass)) GType xfce_filename_input_get_type (void) G_GNUC_CONST; const gchar *xfce_filename_input_get_text (XfceFilenameInput *filename_input); -void xfce_filename_input_sensitise_widget (GtkWidget *widget); +void xfce_filename_input_sensitise_widget (GtkWidget *widget); -void xfce_filename_input_desensitise_widget (GtkWidget *widget); +void xfce_filename_input_desensitise_widget (GtkWidget *widget); void xfce_filename_input_set_original_filename (XfceFilenameInput *filename_input, - gchar *filename); + gchar *filename); void xfce_filename_input_set_max_length (XfceFilenameInput *filename_input, - gint max_length); + gint max_length); void xfce_filename_input_check (XfceFilenameInput *filename_input); -- 2.25.0