callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace fixes

Browse Source
This commit is contained in:
Matthias Clasen
2011-12-01 00:21:11 -05:00
committed by Ryan Lortie
parent cedc3cb6e1
commit 0683f086bb
5 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkapplication.c
View File

@ -332,10 +332,10 @@ gtk_application_remove_window (GtkApplication *application,
* gtk_application_get_windows: * gtk_application_get_windows:
* @application: a #GtkApplication * @application: a #GtkApplication
* *
* Gets a list of the #GtkWindow<!-- -->s 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 * 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.) * for a transient window.)
* *
* The list that is returned should not be modified in any way. It will * The list that is returned should not be modified in any way. It will

18
gtk/gtkapplication.h
View File

@ -19,7 +19,7 @@
* Author: Ryan Lortie <desrt@desrt.ca> * Author: Ryan Lortie <desrt@desrt.ca>
*/ */
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly." #error "Only <gtk/gtk.h> can be included directly."
#endif #endif
@ -64,18 +64,18 @@ struct _GtkApplicationClass
gpointer padding[14]; 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, GtkApplication * gtk_application_new (const gchar *application_id,
GApplicationFlags flags); GApplicationFlags flags);
void gtk_application_add_window (GtkApplication *application, void gtk_application_add_window (GtkApplication *application,
GtkWindow *window); GtkWindow *window);
void gtk_application_remove_window (GtkApplication *application, void gtk_application_remove_window (GtkApplication *application,
GtkWindow *window); GtkWindow *window);
GList * gtk_application_get_windows (GtkApplication *application); GList * gtk_application_get_windows (GtkApplication *application);
G_END_DECLS G_END_DECLS

18
gtk/gtkapplicationmenubutton.h
View File

@ -26,18 +26,18 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_APPLICATION_MENU_BUTTON (gtk_application_menu_button_get_type ()) #define GTK_TYPE_APPLICATION_MENU_BUTTON (gtk_application_menu_button_get_type ())
#define GTK_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ #define GTK_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
GTK_TYPE_APPLICATION_MENU_BUTTON, \ GTK_TYPE_APPLICATION_MENU_BUTTON, \
GtkApplicationMenuButton)) GtkApplicationMenuButton))
#define GTK_IS_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ #define GTK_IS_APPLICATION_MENU_BUTTON(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
GTK_TYPE_APPLICATION_MENU_BUTTON)) 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 G_END_DECLS

14
gtk/gtkapplicationwindow.c
View File

@ -63,12 +63,12 @@ struct _GtkApplicationWindowPrivate
}; };
static void static void
recalculate_app_menu_state (GtkApplicationWindow *window); recalculate_app_menu_state (GtkApplicationWindow *window);
static void static void
on_shell_shows_app_menu_changed (GtkSettings *settings, on_shell_shows_app_menu_changed (GtkSettings *settings,
GParamSpec *pspec, GParamSpec *pspec,
gpointer user_data) gpointer user_data)
{ {
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (user_data); GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (user_data);
gboolean val; gboolean val;
@ -122,7 +122,7 @@ gtk_application_window_change_action_state (GActionGroup *group,
} }
static GAction * static GAction *
gtk_application_window_lookup_action (GActionMap *action_map, gtk_application_window_lookup_action (GActionMap *action_map,
const gchar *action_name) const gchar *action_name)
{ {
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map); GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map);
@ -472,7 +472,7 @@ gtk_application_window_get_show_app_menu (GtkApplicationWindow *window)
} }
static void static void
recalculate_app_menu_state (GtkApplicationWindow *window) recalculate_app_menu_state (GtkApplicationWindow *window)
{ {
if ((window->priv->did_override_show_app_menu if ((window->priv->did_override_show_app_menu
&& window->priv->override_show_app_menu) && window->priv->override_show_app_menu)
@ -922,5 +922,3 @@ gtk_application_window_get_app_menu (GtkApplicationWindow *window)
return menu; return menu;
} }

40
gtk/gtkapplicationwindow.h
View File

@ -26,21 +26,21 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_TYPE_APPLICATION_WINDOW (gtk_application_window_get_type ()) #define GTK_TYPE_APPLICATION_WINDOW (gtk_application_window_get_type ())
#define GTK_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ #define GTK_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow)) GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow))
#define GTK_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ #define GTK_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
#define GTK_IS_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ #define GTK_IS_APPLICATION_WINDOW(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
GTK_TYPE_APPLICATION_WINDOW)) GTK_TYPE_APPLICATION_WINDOW))
#define GTK_IS_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ #define GTK_IS_APPLICATION_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
GTK_TYPE_APPLICATION_WINDOW)) GTK_TYPE_APPLICATION_WINDOW))
#define GTK_APPLICATION_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ #define GTK_APPLICATION_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass)) GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowClass))
typedef struct _GtkApplicationWindowPrivate GtkApplicationWindowPrivate; typedef struct _GtkApplicationWindowPrivate GtkApplicationWindowPrivate;
typedef struct _GtkApplicationWindowClass GtkApplicationWindowClass; typedef struct _GtkApplicationWindowClass GtkApplicationWindowClass;
typedef struct _GtkApplicationWindow GtkApplicationWindow; typedef struct _GtkApplicationWindow GtkApplicationWindow;
struct _GtkApplicationWindow struct _GtkApplicationWindow
{ {
@ -58,14 +58,14 @@ struct _GtkApplicationWindowClass
gpointer padding[14]; gpointer padding[14];
}; };
GType gtk_application_window_get_type (void) G_GNUC_CONST; GType gtk_application_window_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_application_window_new (GtkApplication *application); GtkWidget * gtk_application_window_new (GtkApplication *application);
void gtk_application_window_set_show_app_menu (GtkApplicationWindow *window, void gtk_application_window_set_show_app_menu (GtkApplicationWindow *window,
gboolean show_app_menu); gboolean show_app_menu);
gboolean gtk_application_window_get_show_app_menu (GtkApplicationWindow *window); 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 G_END_DECLS