From 0683f086bba9e0d711d29e932b4f019b9c2ea5ef Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 1 Dec 2011 00:21:11 -0500 Subject: [PATCH] Whitespace fixes --- gtk/gtkapplication.c | 4 ++-- gtk/gtkapplication.h | 18 +++++++-------- gtk/gtkapplicationmenubutton.h | 18 +++++++-------- gtk/gtkapplicationwindow.c | 14 +++++------- gtk/gtkapplicationwindow.h | 40 +++++++++++++++++----------------- 5 files changed, 46 insertions(+), 48 deletions(-) diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index cd5482a9dc..f86c4b47bf 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -332,10 +332,10 @@ gtk_application_remove_window (GtkApplication *application, * gtk_application_get_windows: * @application: a #GtkApplication * - * Gets a list of the #GtkWindows associated with @application. + * Gets a list of the #GtkWindows associated with @application. * * The list is sorted by most recently focused window, such that the first - * element is the currently focused window. (Useful for choosing a parent + * element is the currently focused window. (Useful for choosing a parent * for a transient window.) * * The list that is returned should not be modified in any way. It will diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h index c975f08af1..e1d189fc4e 100644 --- a/gtk/gtkapplication.h +++ b/gtk/gtkapplication.h @@ -19,7 +19,7 @@ * Author: Ryan Lortie */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only can be included directly." #endif @@ -64,18 +64,18 @@ struct _GtkApplicationClass gpointer padding[14]; }; -GType gtk_application_get_type (void) G_GNUC_CONST; +GType gtk_application_get_type (void) G_GNUC_CONST; -GtkApplication * gtk_application_new (const gchar *application_id, - GApplicationFlags flags); +GtkApplication * gtk_application_new (const gchar *application_id, + GApplicationFlags flags); -void gtk_application_add_window (GtkApplication *application, - GtkWindow *window); +void gtk_application_add_window (GtkApplication *application, + GtkWindow *window); -void gtk_application_remove_window (GtkApplication *application, - GtkWindow *window); +void gtk_application_remove_window (GtkApplication *application, + GtkWindow *window); -GList * gtk_application_get_windows (GtkApplication *application); +GList * gtk_application_get_windows (GtkApplication *application); G_END_DECLS diff --git a/gtk/gtkapplicationmenubutton.h b/gtk/gtkapplicationmenubutton.h index 9227c7abc4..450940adb6 100644 --- a/gtk/gtkapplicationmenubutton.h +++ b/gtk/gtkapplicationmenubutton.h @@ -26,18 +26,18 @@ G_BEGIN_DECLS -#define GTK_TYPE_APPLICATION_MENU_BUTTON (gtk_application_menu_button_get_type ()) -#define GTK_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ - GTK_TYPE_APPLICATION_MENU_BUTTON, \ - GtkApplicationMenuButton)) -#define GTK_IS_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ - GTK_TYPE_APPLICATION_MENU_BUTTON)) +#define GTK_TYPE_APPLICATION_MENU_BUTTON (gtk_application_menu_button_get_type ()) +#define GTK_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ + GTK_TYPE_APPLICATION_MENU_BUTTON, \ + GtkApplicationMenuButton)) +#define GTK_IS_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ + GTK_TYPE_APPLICATION_MENU_BUTTON)) -typedef struct _GtkApplicationMenuButton GtkApplicationMenuButton; +typedef struct _GtkApplicationMenuButton GtkApplicationMenuButton; -GType gtk_application_menu_button_get_type (void) G_GNUC_CONST; +GType gtk_application_menu_button_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_application_menu_button_new (void); +GtkWidget * gtk_application_menu_button_new (void); G_END_DECLS diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 176be3665f..58302279a6 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -63,12 +63,12 @@ struct _GtkApplicationWindowPrivate }; static void -recalculate_app_menu_state (GtkApplicationWindow *window); +recalculate_app_menu_state (GtkApplicationWindow *window); static void -on_shell_shows_app_menu_changed (GtkSettings *settings, - GParamSpec *pspec, - gpointer user_data) +on_shell_shows_app_menu_changed (GtkSettings *settings, + GParamSpec *pspec, + gpointer user_data) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (user_data); gboolean val; @@ -122,7 +122,7 @@ gtk_application_window_change_action_state (GActionGroup *group, } static GAction * -gtk_application_window_lookup_action (GActionMap *action_map, +gtk_application_window_lookup_action (GActionMap *action_map, const gchar *action_name) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map); @@ -472,7 +472,7 @@ gtk_application_window_get_show_app_menu (GtkApplicationWindow *window) } static void -recalculate_app_menu_state (GtkApplicationWindow *window) +recalculate_app_menu_state (GtkApplicationWindow *window) { if ((window->priv->did_override_show_app_menu && window->priv->override_show_app_menu) @@ -922,5 +922,3 @@ gtk_application_window_get_app_menu (GtkApplicationWindow *window) return menu; } - - diff --git a/gtk/gtkapplicationwindow.h b/gtk/gtkapplicationwindow.h index 3d658e5010..f30d8d796d 100644 --- a/gtk/gtkapplicationwindow.h +++ b/gtk/gtkapplicationwindow.h @@ -26,21 +26,21 @@ G_BEGIN_DECLS -#define GTK_TYPE_APPLICATION_WINDOW (gtk_application_window_get_type ()) -#define GTK_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ - GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow)) -#define GTK_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ - GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) -#define GTK_IS_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ - GTK_TYPE_APPLICATION_WINDOW)) -#define GTK_IS_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ - GTK_TYPE_APPLICATION_WINDOW)) -#define GTK_APPLICATION_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ - GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) +#define GTK_TYPE_APPLICATION_WINDOW (gtk_application_window_get_type ()) +#define GTK_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ + GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow)) +#define GTK_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ + GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) +#define GTK_IS_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ + GTK_TYPE_APPLICATION_WINDOW)) +#define GTK_IS_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ + GTK_TYPE_APPLICATION_WINDOW)) +#define GTK_APPLICATION_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ + GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) -typedef struct _GtkApplicationWindowPrivate GtkApplicationWindowPrivate; -typedef struct _GtkApplicationWindowClass GtkApplicationWindowClass; -typedef struct _GtkApplicationWindow GtkApplicationWindow; +typedef struct _GtkApplicationWindowPrivate GtkApplicationWindowPrivate; +typedef struct _GtkApplicationWindowClass GtkApplicationWindowClass; +typedef struct _GtkApplicationWindow GtkApplicationWindow; struct _GtkApplicationWindow { @@ -58,14 +58,14 @@ struct _GtkApplicationWindowClass gpointer padding[14]; }; -GType gtk_application_window_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_application_window_new (GtkApplication *application); +GType gtk_application_window_get_type (void) G_GNUC_CONST; +GtkWidget * gtk_application_window_new (GtkApplication *application); -void gtk_application_window_set_show_app_menu (GtkApplicationWindow *window, - gboolean show_app_menu); -gboolean gtk_application_window_get_show_app_menu (GtkApplicationWindow *window); +void gtk_application_window_set_show_app_menu (GtkApplicationWindow *window, + gboolean show_app_menu); +gboolean gtk_application_window_get_show_app_menu (GtkApplicationWindow *window); -GtkWidget * gtk_application_window_get_app_menu (GtkApplicationWindow *window); +GtkWidget * gtk_application_window_get_app_menu (GtkApplicationWindow *window); G_END_DECLS