# HG changeset patch # User Guido Berhoerster # Date 1397725285 -7200 # Node ID 14f31e92372f9f83e16d7ecc4f9960041625c082 # Parent a59a7fd5be70f682653bcf7897d27490957f697e Fix style diff -r a59a7fd5be70 -r 14f31e92372f xia-debug.h --- a/xia-debug.h Thu Apr 17 10:48:09 2014 +0200 +++ b/xia-debug.h Thu Apr 17 11:01:25 2014 +0200 @@ -28,7 +28,7 @@ G_BEGIN_DECLS -void xia_debug_init(gboolean debug_mode); +void xia_debug_init(gboolean); G_END_DECLS diff -r a59a7fd5be70 -r 14f31e92372f xia-icon.c --- a/xia-icon.c Thu Apr 17 10:48:09 2014 +0200 +++ b/xia-icon.c Thu Apr 17 11:01:25 2014 +0200 @@ -28,11 +28,10 @@ G_DEFINE_TYPE(XiaIcon, xia_icon, G_TYPE_OBJECT) -#define XIA_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ - XIA_TYPE_ICON, XiaIconPrivate)) +#define XIA_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ + XIA_TYPE_ICON, XiaIconPrivate)) -struct _XiaIconPrivate -{ +struct _XiaIconPrivate { XiaInhibitor *inhibitor; GtkStatusIcon *status_icon; @@ -40,11 +39,11 @@ GtkWidget *check_menu_item_inhibited; }; -static void icon_update(XiaIcon *self); -static GtkWidget* icon_popup_menu_create(XiaIcon *self); -static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, +static void icon_update(XiaIcon *self); +static GtkWidget * icon_popup_menu_create(XiaIcon *self); +static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data); -static void icon_activate(GtkStatusIcon *status_icon, gpointer user_data); +static void icon_activate(GtkStatusIcon *status_icon, gpointer user_data); static void xia_icon_finalize(GObject *gobject) diff -r a59a7fd5be70 -r 14f31e92372f xia-icon.h --- a/xia-icon.h Thu Apr 17 10:48:09 2014 +0200 +++ b/xia-icon.h Thu Apr 17 11:01:25 2014 +0200 @@ -29,34 +29,32 @@ G_BEGIN_DECLS -#define XIA_TYPE_ICON (xia_icon_get_type()) -#define XIA_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - XIA_TYPE_ICON, XiaIcon)) -#define XIA_IS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - XIA_TYPE_ICON)) -#define XIA_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \ - XIA_TYPE_ICON, XiaIconClass)) -#define XIA_IS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \ - XIA_TYPE_ICON)) +#define XIA_TYPE_ICON (xia_icon_get_type()) +#define XIA_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + XIA_TYPE_ICON, XiaIcon) +#define XIA_IS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + XIA_TYPE_ICON)) +#define XIA_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + XIA_TYPE_ICON, XiaIconClass)) +#define XIA_IS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + XIA_TYPE_ICON)) #define XIA_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \ - XIA_TYPE_ICON, XiaIconClass)) + XIA_TYPE_ICON, XiaIconClass)) typedef struct _XiaIcon XiaIcon; typedef struct _XiaIconClass XiaIconClass; typedef struct _XiaIconPrivate XiaIconPrivate; -struct _XiaIcon -{ +struct _XiaIcon { GObject parent_instance; XiaIconPrivate *priv; }; -struct _XiaIconClass -{ +struct _XiaIconClass { GObjectClass parent_class; }; -XiaIcon *xia_icon_new(void); +XiaIcon *xia_icon_new(void); G_END_DECLS diff -r a59a7fd5be70 -r 14f31e92372f xia-inhibitor.c --- a/xia-inhibitor.c Thu Apr 17 10:48:09 2014 +0200 +++ b/xia-inhibitor.c Thu Apr 17 11:01:25 2014 +0200 @@ -36,11 +36,10 @@ G_DEFINE_TYPE(XiaInhibitor, xia_inhibitor, G_TYPE_OBJECT) -#define XIA_INHIBITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ - XIA_TYPE_INHIBITOR, XiaInhibitorPrivate)) +#define XIA_INHIBITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ + XIA_TYPE_INHIBITOR, XiaInhibitorPrivate)) -struct _XiaInhibitorPrivate -{ +struct _XiaInhibitorPrivate { XiaInhibitor *inhibitor; gboolean inhibited; gboolean have_xtest; diff -r a59a7fd5be70 -r 14f31e92372f xia-inhibitor.h --- a/xia-inhibitor.h Thu Apr 17 10:48:09 2014 +0200 +++ b/xia-inhibitor.h Thu Apr 17 11:01:25 2014 +0200 @@ -30,36 +30,34 @@ G_BEGIN_DECLS #define XIA_TYPE_INHIBITOR (xia_inhibitor_get_type()) -#define XIA_INHIBITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - XIA_TYPE_INHIBITOR, XiaInhibitor)) -#define XIA_IS_INHIBITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - XIA_TYPE_INHIBITOR)) -#define XIA_INHIBITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \ - XIA_TYPE_INHIBITOR, XiaInhibitorClass)) -#define XIA_IS_INHIBITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \ - XIA_TYPE_INHIBITOR)) -#define XIA_INHIBITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \ - XIA_TYPE_INHIBITOR, XiaInhibitorClass)) +#define XIA_INHIBITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ + XIA_TYPE_INHIBITOR, XiaInhibitor)) +#define XIA_IS_INHIBITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + XIA_TYPE_INHIBITOR)) +#define XIA_INHIBITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + XIA_TYPE_INHIBITOR, XiaInhibitorClass)) +#define XIA_IS_INHIBITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + XIA_TYPE_INHIBITOR)) +#define XIA_INHIBITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),\ + XIA_TYPE_INHIBITOR, XiaInhibitorClass)) typedef struct _XiaInhibitor XiaInhibitor; -typedef struct _XiaInhibitorClass XiaInhibitorClass; +typedef struct _XiaInhibitorClass XiaInhibitorClass; typedef struct _XiaInhibitorPrivate XiaInhibitorPrivate; -struct _XiaInhibitor -{ +struct _XiaInhibitor { GObject parent_instance; XiaInhibitorPrivate *priv; }; -struct _XiaInhibitorClass -{ +struct _XiaInhibitorClass { GObjectClass parent_class; }; -XiaInhibitor *xia_inhibitor_new(void); -void xia_inhibitor_set_inhibited(XiaInhibitor *self, gboolean inhibited); -gboolean xia_inhibitor_get_inhibited(XiaInhibitor *self); +XiaInhibitor * xia_inhibitor_new(void); +void xia_inhibitor_set_inhibited(XiaInhibitor *, gboolean); +gboolean xia_inhibitor_get_inhibited(XiaInhibitor *); G_END_DECLS