diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2018-08-02 19:27:10 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2018-08-02 19:27:10 -0300 |
| commit | 0b1d4e99e1f12b61f473d70c86eef03caa88a537 (patch) | |
| tree | 6372e9c3c8f69ff5a37bb61da36a35047fe3605e | |
| parent | 583e024ef8f3ccdfc2d4aa9886f77aee46cd1caf (diff) | |
| download | glade-0b1d4e99e1f12b61f473d70c86eef03caa88a537.tar.gz | |
Fix tab/space identation
232 files changed, 6407 insertions, 6233 deletions
diff --git a/gladeui/glade-accumulators.c b/gladeui/glade-accumulators.c index fd557bdf..29f41e74 100644 --- a/gladeui/glade-accumulators.c +++ b/gladeui/glade-accumulators.c @@ -31,8 +31,9 @@ gboolean _glade_single_object_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, gpointer dummy) + GValue *return_accu, + const GValue *handler_return, + gpointer dummy) { GObject *object = g_value_get_object (handler_return); g_value_set_object (return_accu, object); @@ -42,9 +43,9 @@ _glade_single_object_accumulator (GSignalInvocationHint *ihint, gboolean _glade_integer_handled_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy) + GValue *return_accu, + const GValue *handler_return, + gpointer dummy) { gboolean continue_emission; gint retval; @@ -59,9 +60,9 @@ _glade_integer_handled_accumulator (GSignalInvocationHint *ihint, /* From gtkmain.c */ gboolean _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy) + GValue *return_accu, + const GValue *handler_return, + gpointer dummy) { gboolean continue_emission; gboolean signal_handled; @@ -75,8 +76,9 @@ _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint, gboolean _glade_string_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, gpointer dummy) + GValue *return_accu, + const GValue *handler_return, + gpointer dummy) { const gchar *handler_str; @@ -103,8 +105,9 @@ _glade_strv_handled_accumulator (GSignalInvocationHint *ihint, gboolean _glade_stop_emission_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, gpointer dummy) + GValue *return_accu, + const GValue *handler_return, + gpointer dummy) { g_value_copy (handler_return, return_accu); diff --git a/gladeui/glade-accumulators.h b/gladeui/glade-accumulators.h index 17156c59..58dc55b8 100644 --- a/gladeui/glade-accumulators.h +++ b/gladeui/glade-accumulators.h @@ -6,34 +6,34 @@ G_BEGIN_DECLS gboolean _glade_single_object_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); gboolean _glade_integer_handled_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); - + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); + gboolean _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); gboolean _glade_string_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); gboolean _glade_strv_handled_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); gboolean _glade_stop_emission_accumulator (GSignalInvocationHint *ihint, - GValue *return_accu, - const GValue *handler_return, - gpointer dummy); + GValue *return_accu, + const GValue *handler_return, + gpointer dummy); G_END_DECLS #endif /* __GLADE_ACCUMULATORS_H__ */ diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c index 5dfb37e2..24404832 100644 --- a/gladeui/glade-app.c +++ b/gladeui/glade-app.c @@ -417,7 +417,7 @@ static void glade_app_class_init (GladeAppClass *klass) { GObjectClass *object_class; - + object_class = G_OBJECT_CLASS (klass); object_class->constructor = glade_app_constructor; @@ -858,13 +858,13 @@ glade_app_new (void) void glade_app_search_docs (const gchar *book, - const gchar *page, - const gchar *search) + const gchar *page, + const gchar *search) { GladeApp *app; app = glade_app_get (); g_signal_emit (G_OBJECT (app), glade_app_signals[DOC_SEARCH], 0, - book, page, search); + book, page, search); } diff --git a/gladeui/glade-app.h b/gladeui/glade-app.h index 5c10bff1..a690ff1b 100644 --- a/gladeui/glade-app.h +++ b/gladeui/glade-app.h @@ -77,8 +77,8 @@ gint glade_app_config_save (void); gboolean glade_app_do_event (GdkEvent *event); gboolean glade_app_get_catalog_version (const gchar *name, - gint *major, - gint *minor); + gint *major, + gint *minor); GList *glade_app_get_catalogs (void); GladeCatalog *glade_app_get_catalog (const gchar *name); GladeClipboard* glade_app_get_clipboard (void); @@ -96,8 +96,8 @@ void glade_app_set_accel_group (GtkAccelGroup *accel_group); GtkAccelGroup *glade_app_get_accel_group (void); void glade_app_search_docs (const gchar *book, - const gchar *page, - const gchar *search); + const gchar *page, + const gchar *search); /* package paths */ const gchar *glade_app_get_catalogs_dir (void) G_GNUC_CONST; diff --git a/gladeui/glade-base-editor.h b/gladeui/glade-base-editor.h index f631c8df..5bb42b16 100644 --- a/gladeui/glade-base-editor.h +++ b/gladeui/glade-base-editor.h @@ -68,35 +68,35 @@ struct _GladeBaseEditorClass GType glade_base_editor_get_type (void); GladeBaseEditor *glade_base_editor_new (GObject *container, - GladeEditable *main_editable, - ...); + GladeEditable *main_editable, + ...); void glade_base_editor_append_types (GladeBaseEditor *editor, - GType parent_type, - ...); + GType parent_type, + ...); void glade_base_editor_add_editable (GladeBaseEditor *editor, - GladeWidget *gchild, - GladeEditorPageType page); + GladeWidget *gchild, + GladeEditorPageType page); void glade_base_editor_add_default_properties (GladeBaseEditor *editor, - GladeWidget *gchild); + GladeWidget *gchild); void glade_base_editor_add_properties (GladeBaseEditor *editor, - GladeWidget *gchild, - gboolean packing, - ...); + GladeWidget *gchild, + gboolean packing, + ...); void glade_base_editor_add_label (GladeBaseEditor *editor, - gchar *str); + gchar *str); void glade_base_editor_set_show_signal_editor (GladeBaseEditor *editor, - gboolean val); + gboolean val); /* Convenience functions */ GtkWidget *glade_base_editor_pack_new_window (GladeBaseEditor *editor, - gchar *title, - gchar *help_markup); + gchar *title, + gchar *help_markup); G_END_DECLS diff --git a/gladeui/glade-builtins.c b/gladeui/glade-builtins.c index 7eb6f2a2..d6144827 100644 --- a/gladeui/glade-builtins.c +++ b/gladeui/glade-builtins.c @@ -303,8 +303,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS { gchar *clean_name = clean_stock_name (item.label); - if (!glade_get_displayable_value (etype, enum_values[i].value_nick)) - glade_register_translated_value (etype, enum_values[i].value_nick, clean_name); + if (!glade_get_displayable_value (etype, enum_values[i].value_nick)) + glade_register_translated_value (etype, enum_values[i].value_nick, clean_name); g_free (clean_name); } } @@ -340,8 +340,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS gchar *clean_name = clean_stock_name (item.label); /* These are translated, we just cut out the mnemonic underscores */ - if (!glade_get_displayable_value (etype, enum_values[i].value_nick)) - glade_register_translated_value (etype, enum_values[i].value_nick, clean_name); + if (!glade_get_displayable_value (etype, enum_values[i].value_nick)) + glade_register_translated_value (etype, enum_values[i].value_nick, clean_name); g_free (clean_name); } } @@ -349,11 +349,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS for (i = 0; i < G_N_ELEMENTS (builtin_stock_images); i++) { /* these ones are translated from glade */ - if (!glade_get_displayable_value (etype, builtin_stock_images[i])) - glade_register_displayable_value (etype, - builtin_stock_images[i], - GETTEXT_PACKAGE, - builtin_stock_displayables[i]); + if (!glade_get_displayable_value (etype, builtin_stock_images[i])) + glade_register_displayable_value (etype, + builtin_stock_images[i], + GETTEXT_PACKAGE, + builtin_stock_displayables[i]); } } return etype; @@ -427,7 +427,7 @@ param_objects_validate (GParamSpec * pspec, GValue * value) object = list->data; if (!(G_OBJECT_TYPE (object) == ospec->type || - g_type_is_a (G_OBJECT_TYPE (object), ospec->type))) + g_type_is_a (G_OBJECT_TYPE (object), ospec->type))) toremove = g_list_prepend (toremove, object); } @@ -526,7 +526,7 @@ glade_standard_pixbuf_spec (void) { return g_param_spec_object ("pixbuf", _("Image File Name"), _("Enter a filename, relative path or full path to " - "load the image"), GDK_TYPE_PIXBUF, + "load the image"), GDK_TYPE_PIXBUF, G_PARAM_READWRITE); } diff --git a/gladeui/glade-builtins.h b/gladeui/glade-builtins.h index 7edabd38..5837900d 100644 --- a/gladeui/glade-builtins.h +++ b/gladeui/glade-builtins.h @@ -11,8 +11,8 @@ typedef struct _GladeParamSpecObjects GladeParamSpecObjects; #define GLADE_TYPE_STOCK (glade_standard_stock_get_type()) #define GLADE_TYPE_STOCK_IMAGE (glade_standard_stock_image_get_type()) -#define GLADE_TYPE_GLIST (glade_glist_get_type()) -#define GLADE_TYPE_PARAM_OBJECTS (glade_param_objects_get_type()) +#define GLADE_TYPE_GLIST (glade_glist_get_type()) +#define GLADE_TYPE_PARAM_OBJECTS (glade_param_objects_get_type()) #define GLADE_IS_STOCK(pspec) \ (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GLADE_TYPE_STOCK)) @@ -33,13 +33,13 @@ GType glade_glist_get_type (void) G_GNUC_CONST; GType glade_param_objects_get_type (void) G_GNUC_CONST; GParamSpec *glade_param_spec_objects (const gchar *name, - const gchar *nick, - const gchar *blurb, - GType accepted_type, - GParamFlags flags); + const gchar *nick, + const gchar *blurb, + GType accepted_type, + GParamFlags flags); void glade_param_spec_objects_set_type (GladeParamSpecObjects *pspec, - GType type); + GType type); GType glade_param_spec_objects_get_type (GladeParamSpecObjects *pspec); GParamSpec *glade_standard_pixbuf_spec (void); diff --git a/gladeui/glade-catalog.c b/gladeui/glade-catalog.c index ea05220a..37366ef5 100644 --- a/gladeui/glade-catalog.c +++ b/gladeui/glade-catalog.c @@ -522,18 +522,18 @@ catalogs_from_path (GList *catalogs, const gchar *path) if (!g_str_has_suffix (filename, ".xml")) continue; - /* Special case, ignore gresource files (which are present - * while running tests) - */ - if (g_str_has_suffix (filename, ".gresource.xml")) - continue; - - /* If we're running in the bundle, don't ever try to load - * anything except the GTK+ catalog - */ - if (g_getenv (GLADE_ENV_BUNDLED) != NULL && - strcmp (filename, "gtk+.xml") != 0) - continue; + /* Special case, ignore gresource files (which are present + * while running tests) + */ + if (g_str_has_suffix (filename, ".gresource.xml")) + continue; + + /* If we're running in the bundle, don't ever try to load + * anything except the GTK+ catalog + */ + if (g_getenv (GLADE_ENV_BUNDLED) != NULL && + strcmp (filename, "gtk+.xml") != 0) + continue; catalog_filename = g_build_filename (path, filename, NULL); catalog = catalog_open (catalog_filename); @@ -574,7 +574,7 @@ glade_catalog_add_path (const gchar *path) g_return_if_fail (path != NULL); if (g_list_find_custom (catalog_paths, path, (GCompareFunc) g_strcmp0) == NULL) - catalog_paths = g_list_append (catalog_paths, g_strdup (path)); + catalog_paths = g_list_append (catalog_paths, g_strdup (path)); } /** @@ -590,14 +590,14 @@ glade_catalog_remove_path (const gchar *path) GList *l; if (path == NULL) - { - g_list_free_full (catalog_paths, g_free); - catalog_paths = NULL; - } + { + g_list_free_full (catalog_paths, g_free); + catalog_paths = NULL; + } else if ((l = g_list_find_custom (catalog_paths, path, (GCompareFunc) g_strcmp0))) - { - catalog_paths = g_list_remove_link (catalog_paths, l); - } + { + catalog_paths = g_list_remove_link (catalog_paths, l); + } } /** @@ -685,17 +685,17 @@ glade_catalog_load_all (void) /* Dont print missing icons in unit tests */ if (glade_widget_adaptor_get_missing_icon (adaptor) && - g_getenv (GLADE_ENV_TESTING) == NULL) + g_getenv (GLADE_ENV_TESTING) == NULL) { if (!icon_warning) icon_warning = g_string_new ("Glade needs artwork; " "a default icon will be used for " "the following classes:"); - g_string_append_printf (icon_warning, - "\n\t%s\tneeds an icon named '%s'", - glade_widget_adaptor_get_name (adaptor), - glade_widget_adaptor_get_missing_icon (adaptor)); + g_string_append_printf (icon_warning, + "\n\t%s\tneeds an icon named '%s'", + glade_widget_adaptor_get_name (adaptor), + glade_widget_adaptor_get_missing_icon (adaptor)); } } diff --git a/gladeui/glade-cell-renderer-icon.h b/gladeui/glade-cell-renderer-icon.h index 1e61bb18..3bb3fb44 100644 --- a/gladeui/glade-cell-renderer-icon.h +++ b/gladeui/glade-cell-renderer-icon.h @@ -28,11 +28,11 @@ G_BEGIN_DECLS -#define GLADE_TYPE_CELL_RENDERER_ICON (glade_cell_renderer_icon_get_type ()) -#define GLADE_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIcon)) -#define GLADE_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass)) -#define GLADE_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_ICON)) -#define GLADE_IS_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_ICON)) +#define GLADE_TYPE_CELL_RENDERER_ICON (glade_cell_renderer_icon_get_type ()) +#define GLADE_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIcon)) +#define GLADE_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass)) +#define GLADE_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_ICON)) +#define GLADE_IS_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_ICON)) #define GLADE_CELL_RENDERER_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass)) typedef struct _GladeCellRendererIcon GladeCellRendererIcon; @@ -51,7 +51,7 @@ struct _GladeCellRendererIconClass GtkCellRendererPixbufClass parent_class; void (* activate) (GladeCellRendererIcon *cell_renderer_icon, - const gchar *path); + const gchar *path); }; GType glade_cell_renderer_icon_get_type (void) G_GNUC_CONST; @@ -59,11 +59,11 @@ GtkCellRenderer *glade_cell_renderer_icon_new (void); gboolean glade_cell_renderer_icon_get_active (GladeCellRendererIcon *icon); void glade_cell_renderer_icon_set_active (GladeCellRendererIcon *icon, - gboolean setting); + gboolean setting); gboolean glade_cell_renderer_icon_get_activatable (GladeCellRendererIcon *icon); void glade_cell_renderer_icon_set_activatable (GladeCellRendererIcon *icon, - gboolean setting); + gboolean setting); G_END_DECLS diff --git a/gladeui/glade-clipboard.h b/gladeui/glade-clipboard.h index 6f266c79..b0d23299 100644 --- a/gladeui/glade-clipboard.h +++ b/gladeui/glade-clipboard.h @@ -35,7 +35,7 @@ GType glade_clipboard_get_type (void); GladeClipboard *glade_clipboard_new (void); void glade_clipboard_add (GladeClipboard *clipboard, - GList *widgets); + GList *widgets); void glade_clipboard_clear (GladeClipboard *clipboard); gboolean glade_clipboard_get_has_selection(GladeClipboard *clipboard); @@ -43,4 +43,4 @@ GList *glade_clipboard_widgets (GladeClipboard *clipboard); G_END_DECLS -#endif /* __GLADE_CLIPBOARD_H__ */ +#endif /* __GLADE_CLIPBOARD_H__ */ diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c index 15ec3c89..9899d30d 100644 --- a/gladeui/glade-command.c +++ b/gladeui/glade-command.c @@ -54,13 +54,13 @@ struct _GladeCommandPrivate GladeProject *project; /* The project this command is created for */ gchar *description; /* a string describing the command. - * It's used in the undo/redo menu entry. - */ + * It's used in the undo/redo menu entry. + */ gint group_id; /* If this is part of a command group, this is - * the group id (id is needed only to ensure that - * consecutive groups dont get merged). - */ + * the group id (id is needed only to ensure that + * consecutive groups dont get merged). + */ }; /* Concerning placeholders: we do not hold any reference to placeholders, @@ -143,59 +143,58 @@ glade_command_class_init (GladeCommandClass *klass) } /* Macros for defining the derived command types */ -#define MAKE_TYPE(func, type, parent) \ -GType \ -func ## _get_type (void) \ -{ \ - static GType cmd_type = 0; \ - \ - if (!cmd_type) \ - { \ - static const GTypeInfo info = \ - { \ - sizeof (type ## Class), \ - (GBaseInitFunc) NULL, \ - (GBaseFinalizeFunc) NULL, \ - (GClassInitFunc) func ## _class_init, \ - (GClassFinalizeFunc) NULL, \ - NULL, \ - sizeof (type), \ - 0, \ - (GInstanceInitFunc) NULL \ - }; \ - \ - cmd_type = g_type_register_static (parent, #type, &info, 0); \ - } \ - \ - return cmd_type; \ -} \ - -#define GLADE_MAKE_COMMAND(type, func) \ -static gboolean \ -func ## _undo (GladeCommand *me); \ -static gboolean \ -func ## _execute (GladeCommand *me); \ -static void \ -func ## _finalize (GObject *object); \ -static gboolean \ -func ## _unifies (GladeCommand *this_cmd, GladeCommand *other_cmd); \ -static void \ -func ## _collapse (GladeCommand *this_cmd, GladeCommand *other_cmd); \ -static void \ -func ## _class_init (gpointer parent_tmp, gpointer notused) \ -{ \ - GladeCommandClass *parent = parent_tmp; \ - GObjectClass* object_class; \ - object_class = G_OBJECT_CLASS (parent); \ - parent->undo = func ## _undo; \ - parent->execute = func ## _execute; \ - parent->unifies = func ## _unifies; \ - parent->collapse = func ## _collapse; \ - object_class->finalize = func ## _finalize; \ -} \ -typedef struct { \ - GladeCommandClass cmd; \ -} type ## Class; \ +#define MAKE_TYPE(func, type, parent) \ +GType \ +func ## _get_type (void) \ +{ \ + static GType cmd_type = 0; \ + \ + if (!cmd_type) \ + { \ + static const GTypeInfo info = { \ + sizeof (type ## Class), \ + (GBaseInitFunc) NULL, \ + (GBaseFinalizeFunc) NULL, \ + (GClassInitFunc) func ## _class_init, \ + (GClassFinalizeFunc) NULL, \ + NULL, \ + sizeof (type), \ + 0, \ + (GInstanceInitFunc) NULL \ + }; \ + \ + cmd_type = g_type_register_static (parent, #type, &info, 0); \ + } \ + \ + return cmd_type; \ +} + +#define GLADE_MAKE_COMMAND(type, func) \ +static gboolean \ +func ## _undo (GladeCommand *me); \ +static gboolean \ +func ## _execute (GladeCommand *me); \ +static void \ +func ## _finalize (GObject *object); \ +static gboolean \ +func ## _unifies (GladeCommand *this_cmd, GladeCommand *other_cmd); \ +static void \ +func ## _collapse (GladeCommand *this_cmd, GladeCommand *other_cmd); \ +static void \ +func ## _class_init (gpointer parent_tmp, gpointer notused) \ +{ \ + GladeCommandClass *parent = parent_tmp; \ + GObjectClass* object_class; \ + object_class = G_OBJECT_CLASS (parent); \ + parent->undo = func ## _undo; \ + parent->execute = func ## _execute; \ + parent->unifies = func ## _unifies; \ + parent->collapse = func ## _collapse; \ + object_class->finalize = func ## _finalize; \ +} \ +typedef struct { \ + GladeCommandClass cmd; \ +} type ## Class; \ static MAKE_TYPE(func, type, GLADE_TYPE_COMMAND) @@ -363,13 +362,13 @@ typedef struct /* standard macros */ GLADE_MAKE_COMMAND (GladeCommandPropertyEnabled, glade_command_property_enabled); #define GLADE_COMMAND_PROPERTY_ENABLED_TYPE (glade_command_property_enabled_get_type ()) -#define GLADE_COMMAND_PROPERTY_ENABLED(o) (G_TYPE_CHECK_INSTANCE_CAST \ - ((o), GLADE_COMMAND_PROPERTY_ENABLED_TYPE, \ - GladeCommandPropertyEnabled)) -#define GLADE_COMMAND_PROPERTY_ENABLED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST \ - ((k), GLADE_COMMAND_PROPERTY_ENABLED_TYPE, \ - GladeCommandPropertyEnabledClass)) -#define GLADE_IS_COMMAND_PROPERTY_ENABLED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_PROPERTY_ENABLED_TYPE)) +#define GLADE_COMMAND_PROPERTY_ENABLED(o) (G_TYPE_CHECK_INSTANCE_CAST \ + ((o), GLADE_COMMAND_PROPERTY_ENABLED_TYPE, \ + GladeCommandPropertyEnabled)) +#define GLADE_COMMAND_PROPERTY_ENABLED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST \ + ((k), GLADE_COMMAND_PROPERTY_ENABLED_TYPE, \ + GladeCommandPropertyEnabledClass)) +#define GLADE_IS_COMMAND_PROPERTY_ENABLED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_PROPERTY_ENABLED_TYPE)) #define GLADE_IS_COMMAND_PROPERTY_ENABLED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_PROPERTY_ENABLED_TYPE)) @@ -418,7 +417,7 @@ glade_command_property_enabled_unifies (GladeCommand *this_cmd, GladeCommand *ot { cmd1 = (GladeCommandPropertyEnabled *) this_cmd; - return (cmd1->old_enabled == cmd1->new_enabled); + return (cmd1->old_enabled == cmd1->new_enabled); } return FALSE; } @@ -437,7 +436,7 @@ glade_command_property_enabled_unifies (GladeCommand *this_cmd, GladeCommand *ot static void glade_command_property_enabled_collapse (GladeCommand *this_cmd, - GladeCommand *other_cmd) + GladeCommand *other_cmd) { GladeCommandPropertyEnabled *this = GLADE_COMMAND_PROPERTY_ENABLED (this_cmd); GladeCommandPropertyEnabled *other = GLADE_COMMAND_PROPERTY_ENABLED (other_cmd); @@ -453,13 +452,13 @@ glade_command_property_enabled_collapse (GladeCommand *this_cmd, if (this->new_enabled) this_cmd->priv->description = g_strdup_printf (_("Enabling property %s on widget %s"), - glade_property_class_get_name (pclass), - glade_widget_get_name (widget)); + glade_property_class_get_name (pclass), + glade_widget_get_name (widget)); else this_cmd->priv->description = g_strdup_printf (_("Disabling property %s on widget %s"), - glade_property_class_get_name (pclass), - glade_widget_get_name (widget)); + glade_property_class_get_name (pclass), + glade_widget_get_name (widget)); } /** @@ -473,7 +472,7 @@ glade_command_property_enabled_collapse (GladeCommand *this_cmd, */ void glade_command_set_property_enabled (GladeProperty *property, - gboolean enabled) + gboolean enabled) { GladeCommandPropertyEnabled *me; GladeCommand *cmd; @@ -509,13 +508,13 @@ glade_command_set_property_enabled (GladeProperty *property, if (enabled) cmd->priv->description = g_strdup_printf (_("Enabling property %s on widget %s"), - glade_property_class_get_name (pclass), - glade_widget_get_name (widget)); + glade_property_class_get_name (pclass), + glade_widget_get_name (widget)); else cmd->priv->description = g_strdup_printf (_("Disabling property %s on widget %s"), - glade_property_class_get_name (pclass), - glade_widget_get_name (widget)); + glade_property_class_get_name (pclass), + glade_widget_get_name (widget)); glade_command_check_group (GLADE_COMMAND (me)); @@ -542,11 +541,11 @@ typedef struct /* standard macros */ GLADE_MAKE_COMMAND (GladeCommandSetProperty, glade_command_set_property); -#define GLADE_COMMAND_SET_PROPERTY_TYPE (glade_command_set_property_get_type ()) -#define GLADE_COMMAND_SET_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_PROPERTY_TYPE, GladeCommandSetProperty)) -#define GLADE_COMMAND_SET_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_PROPERTY_TYPE, GladeCommandSetPropertyClass)) -#define GLADE_IS_COMMAND_SET_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_PROPERTY_TYPE)) -#define GLADE_IS_COMMAND_SET_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_PROPERTY_TYPE)) +#define GLADE_COMMAND_SET_PROPERTY_TYPE (glade_command_set_property_get_type ()) +#define GLADE_COMMAND_SET_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_PROPERTY_TYPE, GladeCommandSetProperty)) +#define GLADE_COMMAND_SET_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_PROPERTY_TYPE, GladeCommandSetPropertyClass)) +#define GLADE_IS_COMMAND_SET_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_PROPERTY_TYPE)) +#define GLADE_IS_COMMAND_SET_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_PROPERTY_TYPE)) /* Undo the last "set property command" */ static gboolean @@ -588,18 +587,18 @@ glade_command_set_property_execute (GladeCommand *cmd) #ifdef GLADE_ENABLE_DEBUG if (glade_get_debug_flags () & GLADE_DEBUG_COMMANDS) - { - gchar *str = + { + gchar *str = glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (pclass), pclass, &new_value); - g_print ("Setting %s property of %s to %s (sumode: %d)\n", - glade_property_class_id (pclass), - glade_widget_get_name (widget), - str, glade_property_superuser ()); + g_print ("Setting %s property of %s to %s (sumode: %d)\n", + glade_property_class_id (pclass), + glade_widget_get_name (widget), + str, glade_property_superuser ()); - g_free (str); - } + g_free (str); + } #endif /* Packing properties need to be refreshed here since @@ -700,7 +699,7 @@ glade_command_set_property_unifies (GladeCommand *this_cmd, for (list = cmd1->sdata; list; list = list->next) { pdata1 = list->data; - pclass1 = glade_property_get_class (pdata1->property); + pclass1 = glade_property_get_class (pdata1->property); if (glade_property_class_compare (pclass1, pdata1->old_value, @@ -725,14 +724,14 @@ glade_command_set_property_unifies (GladeCommand *this_cmd, for (list = cmd1->sdata; list; list = list->next) { pdata1 = list->data; - pclass1 = glade_property_get_class (pdata1->property); - widget1 = glade_property_get_widget (pdata1->property); + pclass1 = glade_property_get_class (pdata1->property); + widget1 = glade_property_get_widget (pdata1->property); for (l = cmd2->sdata; l; l = l->next) { pdata2 = l->data; - pclass2 = glade_property_get_class (pdata2->property); - widget2 = glade_property_get_widget (pdata2->property); + pclass2 = glade_property_get_class (pdata2->property); + widget2 = glade_property_get_widget (pdata2->property); if (widget1 == widget2 && glade_property_class_match (pclass1, pclass2)) @@ -775,7 +774,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd, for (l = cmd2->sdata; l; l = l->next) { pdata2 = l->data; - pclass2 = glade_property_get_class (pdata2->property); + pclass2 = glade_property_get_class (pdata2->property); if (glade_property_class_match (pclass1, pclass2)) { @@ -795,7 +794,7 @@ glade_command_set_property_collapse (GladeCommand *this_cmd, } -#define MAX_UNDO_MENU_ITEM_VALUE_LEN 10 +#define MAX_UNDO_MENU_ITEM_VALUE_LEN 10 static gchar * glade_command_set_property_description (GladeCommandSetProperty *me) { @@ -815,7 +814,7 @@ glade_command_set_property_description (GladeCommandSetProperty *me) pclass = glade_property_get_class (sdata->property); widget = glade_property_get_widget (sdata->property); value_name = glade_widget_adaptor_string_from_value - (glade_property_class_get_adaptor (pclass), pclass, sdata->new_value); + (glade_property_class_get_adaptor (pclass), pclass, sdata->new_value); if (!value_name || strlen (value_name) > MAX_UNDO_MENU_ITEM_VALUE_LEN || strchr (value_name, '_')) @@ -987,11 +986,11 @@ typedef struct /* standard macros */ GLADE_MAKE_COMMAND (GladeCommandSetName, glade_command_set_name); -#define GLADE_COMMAND_SET_NAME_TYPE (glade_command_set_name_get_type ()) -#define GLADE_COMMAND_SET_NAME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_NAME_TYPE, GladeCommandSetName)) -#define GLADE_COMMAND_SET_NAME_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_NAME_TYPE, GladeCommandSetNameClass)) -#define GLADE_IS_COMMAND_SET_NAME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_NAME_TYPE)) -#define GLADE_IS_COMMAND_SET_NAME_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_NAME_TYPE)) +#define GLADE_COMMAND_SET_NAME_TYPE (glade_command_set_name_get_type ()) +#define GLADE_COMMAND_SET_NAME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_NAME_TYPE, GladeCommandSetName)) +#define GLADE_COMMAND_SET_NAME_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_NAME_TYPE, GladeCommandSetNameClass)) +#define GLADE_IS_COMMAND_SET_NAME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_NAME_TYPE)) +#define GLADE_IS_COMMAND_SET_NAME_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_NAME_TYPE)) /* Undo the last "set name command" */ static gboolean @@ -1050,7 +1049,7 @@ glade_command_set_name_unifies (GladeCommand *this_cmd, GladeCommand *other_cmd) { cmd1 = (GladeCommandSetName *) this_cmd; - return (g_strcmp0 (cmd1->old_name, cmd1->name) == 0); + return (g_strcmp0 (cmd1->old_name, cmd1->name) == 0); } return FALSE; } @@ -1138,11 +1137,11 @@ typedef struct GLADE_MAKE_COMMAND (GladeCommandAddRemove, glade_command_add_remove); -#define GLADE_COMMAND_ADD_REMOVE_TYPE (glade_command_add_remove_get_type ()) -#define GLADE_COMMAND_ADD_REMOVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_ADD_REMOVE_TYPE, GladeCommandAddRemove)) -#define GLADE_COMMAND_ADD_REMOVE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_ADD_REMOVE_TYPE, GladeCommandAddRemoveClass)) -#define GLADE_IS_COMMAND_ADD_REMOVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_ADD_REMOVE_TYPE)) -#define GLADE_IS_COMMAND_ADD_REMOVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_ADD_REMOVE_TYPE)) +#define GLADE_COMMAND_ADD_REMOVE_TYPE (glade_command_add_remove_get_type ()) +#define GLADE_COMMAND_ADD_REMOVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_ADD_REMOVE_TYPE, GladeCommandAddRemove)) +#define GLADE_COMMAND_ADD_REMOVE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_ADD_REMOVE_TYPE, GladeCommandAddRemoveClass)) +#define GLADE_IS_COMMAND_ADD_REMOVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_ADD_REMOVE_TYPE)) +#define GLADE_IS_COMMAND_ADD_REMOVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_ADD_REMOVE_TYPE)) static void glade_command_placeholder_destroyed (GtkWidget *object, CommandData *cdata) @@ -1215,8 +1214,8 @@ void glade_command_add (GList *widgets, GladeWidget *parent, GladePlaceholder *placeholder, - GladeProject *project, - gboolean pasting) + GladeProject *project, + gboolean pasting) { GladeCommandAddRemove *me; GladeCommand *cmd; @@ -1269,11 +1268,11 @@ glade_command_add (GList *widgets, /* Parent */ if (parent == NULL) - cdata->parent = glade_widget_get_parent (widget); + cdata->parent = glade_widget_get_parent (widget); else if (placeholder && GWA_IS_TOPLEVEL (adaptor) == FALSE) - cdata->parent = glade_placeholder_get_parent (placeholder); + cdata->parent = glade_placeholder_get_parent (placeholder); else - cdata->parent = parent; + cdata->parent = parent; /* Placeholder */ if (placeholder != NULL && g_list_length (widgets) == 1) @@ -1402,7 +1401,7 @@ glade_command_remove (GList *widgets) GLADE_UI_WARN, NULL, _("%s is locked by %s, edit %s first."), glade_widget_get_name (widget), - glade_widget_get_name (lock), + glade_widget_get_name (lock), glade_widget_get_name (lock)); return; } @@ -1435,7 +1434,7 @@ glade_command_remove (GList *widgets) /* If we're removing the template widget, then we need to unset it as template */ if (glade_project_get_template (GLADE_COMMAND (me)->priv->project) == widget) - glade_command_set_project_template (GLADE_COMMAND (me)->priv->project, NULL); + glade_command_set_project_template (GLADE_COMMAND (me)->priv->project, NULL); /* Undoably unset any object properties that may point to the removed object */ glade_command_delete_prop_refs (widget); @@ -1454,13 +1453,13 @@ glade_command_remove (GList *widgets) /* Record packing props if not deleted from the clipboard */ if (me->from_clipboard == FALSE) - { - for (l = glade_widget_get_packing_properties (widget); l; l = l->next) - cdata->pack_props = - g_list_prepend (cdata->pack_props, - glade_property_dup (GLADE_PROPERTY (l->data), - cdata->widget)); - } + { + for (l = glade_widget_get_packing_properties (widget); l; l = l->next) + cdata->pack_props = + g_list_prepend (cdata->pack_props, + glade_property_dup (GLADE_PROPERTY (l->data), + cdata->widget)); + } } g_assert (widget); @@ -1510,15 +1509,15 @@ glade_command_add_execute (GladeCommandAddRemove *me) cdata = list->data; saved_props = NULL; - GLADE_NOTE (COMMANDS, - g_print ("Adding widget '%s' to parent '%s' " - "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n", - glade_widget_get_name (cdata->widget), - cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", - me->from_clipboard ? "yes" : "no", - cdata->props_recorded ? "yes" : "no", - cdata->placeholder ? "yes" : "no", - cdata->special_type)); + GLADE_NOTE (COMMANDS, + g_print ("Adding widget '%s' to parent '%s' " + "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n", + glade_widget_get_name (cdata->widget), + cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", + me->from_clipboard ? "yes" : "no", + cdata->props_recorded ? "yes" : "no", + cdata->placeholder ? "yes" : "no", + cdata->special_type)); if (cdata->parent != NULL) { @@ -1531,33 +1530,33 @@ glade_command_add_execute (GladeCommandAddRemove *me) saved_props = glade_widget_dup_properties (cdata->widget, glade_widget_get_packing_properties (cdata->widget), - FALSE, FALSE, FALSE); + FALSE, FALSE, FALSE); glade_widget_set_packing_properties (cdata->widget, cdata->parent); } - /* Clear it the first time around, ensure we record it after adding */ - if (cdata->props_recorded == FALSE) - g_object_set_data (glade_widget_get_object (cdata->widget), - "special-child-type", NULL); - else - g_object_set_data_full (glade_widget_get_object (cdata->widget), - "special-child-type", - g_strdup (cdata->special_type), - g_free); + /* Clear it the first time around, ensure we record it after adding */ + if (cdata->props_recorded == FALSE) + g_object_set_data (glade_widget_get_object (cdata->widget), + "special-child-type", NULL); + else + g_object_set_data_full (glade_widget_get_object (cdata->widget), + "special-child-type", + g_strdup (cdata->special_type), + g_free); /* glade_command_paste ganauntees that if * there we are pasting to a placeholder, * there is only one widget. */ if (cdata->placeholder) - glade_widget_replace (cdata->parent, - G_OBJECT (cdata->placeholder), - glade_widget_get_object (cdata->widget)); + glade_widget_replace (cdata->parent, + G_OBJECT (cdata->placeholder), + glade_widget_get_object (cdata->widget)); else - glade_widget_add_child (cdata->parent, - cdata->widget, - cdata->props_recorded == FALSE); + glade_widget_add_child (cdata->parent, + cdata->widget, + cdata->props_recorded == FALSE); glade_command_transfer_props (cdata->widget, saved_props); @@ -1572,13 +1571,13 @@ glade_command_add_execute (GladeCommandAddRemove *me) { GValue value = { 0, }; GladeProperty *saved_prop = l->data; - GladePropertyClass *pclass = glade_property_get_class (saved_prop); + GladePropertyClass *pclass = glade_property_get_class (saved_prop); GladeProperty *widget_prop = - glade_widget_get_pack_property (cdata->widget, glade_property_class_id (pclass)); + glade_widget_get_pack_property (cdata->widget, glade_property_class_id (pclass)); glade_property_get_value (saved_prop, &value); glade_property_set_value (widget_prop, &value); - glade_property_sync (widget_prop); + glade_property_sync (widget_prop); g_value_unset (&value); } @@ -1594,9 +1593,9 @@ glade_command_add_execute (GladeCommandAddRemove *me) g_assert (cdata->pack_props == NULL); for (l = glade_widget_get_packing_properties (cdata->widget); l; l = l->next) cdata->pack_props = - g_list_prepend (cdata->pack_props, - glade_property_dup (GLADE_PROPERTY (l->data), - cdata->widget)); + g_list_prepend (cdata->pack_props, + glade_property_dup (GLADE_PROPERTY (l->data), + cdata->widget)); /* Record the special-type here after replacing */ if ((special_child_type = @@ -1607,11 +1606,11 @@ glade_command_add_execute (GladeCommandAddRemove *me) cdata->special_type = g_strdup (special_child_type); } - GLADE_NOTE (COMMANDS, - g_print ("Recorded properties for adding widget '%s' to parent '%s' (special child: %s)\n", - glade_widget_get_name (cdata->widget), - cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", - cdata->special_type)); + GLADE_NOTE (COMMANDS, + g_print ("Recorded properties for adding widget '%s' to parent '%s' (special child: %s)\n", + glade_widget_get_name (cdata->widget), + cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", + cdata->special_type)); /* Mark the properties as recorded */ cdata->props_recorded = TRUE; @@ -1619,7 +1618,7 @@ glade_command_add_execute (GladeCommandAddRemove *me) } glade_project_add_object (GLADE_COMMAND (me)->priv->project, - glade_widget_get_object (cdata->widget)); + glade_widget_get_object (cdata->widget)); for (l = cdata->reffed; l; l = l->next) { @@ -1628,8 +1627,8 @@ glade_command_add_execute (GladeCommandAddRemove *me) glade_widget_get_object (reffed)); } - glade_project_selection_add (GLADE_COMMAND (me)->priv->project, - glade_widget_get_object (cdata->widget), FALSE); + glade_project_selection_add (GLADE_COMMAND (me)->priv->project, + glade_widget_get_object (cdata->widget), FALSE); glade_widget_show (cdata->widget); } @@ -1652,37 +1651,37 @@ glade_command_remove_execute (GladeCommandAddRemove *me) cdata = list->data; GLADE_NOTE (COMMANDS, - g_print ("Removing widget '%s' from parent '%s' " - "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n", - glade_widget_get_name (cdata->widget), - cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", - me->from_clipboard ? "yes" : "no", - cdata->props_recorded ? "yes" : "no", - cdata->placeholder ? "yes" : "no", - cdata->special_type)); + g_print ("Removing widget '%s' from parent '%s' " + "(from clipboard: %s, props recorded: %s, have placeholder: %s, child_type: %s)\n", + glade_widget_get_name (cdata->widget), + cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", + me->from_clipboard ? "yes" : "no", + cdata->props_recorded ? "yes" : "no", + cdata->placeholder ? "yes" : "no", + cdata->special_type)); glade_widget_hide (cdata->widget); if (cdata->props_recorded == FALSE) - { - /* Record the special-type here after replacing */ - if ((special_child_type = - g_object_get_data (glade_widget_get_object (cdata->widget), - "special-child-type")) != NULL) - { - g_free (cdata->special_type); - cdata->special_type = g_strdup (special_child_type); - } - - GLADE_NOTE (COMMANDS, - g_print ("Recorded properties for removing widget '%s' from parent '%s' (special child: %s)\n", - glade_widget_get_name (cdata->widget), - cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", - cdata->special_type)); - - /* Mark the properties as recorded */ - cdata->props_recorded = TRUE; - } + { + /* Record the special-type here after replacing */ + if ((special_child_type = + g_object_get_data (glade_widget_get_object (cdata->widget), + "special-child-type")) != NULL) + { + g_free (cdata->special_type); + cdata->special_type = g_strdup (special_child_type); + } + + GLADE_NOTE (COMMANDS, + g_print ("Recorded properties for removing widget '%s' from parent '%s' (special child: %s)\n", + glade_widget_get_name (cdata->widget), + cdata->parent ? glade_widget_get_name (cdata->parent) : "(none)", + cdata->special_type)); + + /* Mark the properties as recorded */ + cdata->props_recorded = TRUE; + } glade_project_remove_object (GLADE_COMMAND (me)->priv->project, glade_widget_get_object (cdata->widget)); @@ -1790,9 +1789,9 @@ glade_command_add_remove_collapse (GladeCommand *this_cmd, /** * glade_command_create: - * @adaptor: A #GladeWidgetAdaptor - * @parent (allow-none): the parent #GladeWidget to add the new widget to. - * @placeholder (allow-none): the placeholder which will be substituted by the widget + * @adaptor: A #GladeWidgetAdaptor + * @parent (allow-none): the parent #GladeWidget to add the new widget to. + * @placeholder (allow-none): the placeholder which will be substituted by the widget * @project: the project his widget belongs to. * * Creates a new widget using @adaptor and put in place of the @placeholder @@ -1857,7 +1856,7 @@ glade_command_delete (GList *widgets) widget = widgets->data; glade_command_push_group (_("Delete %s"), g_list_length (widgets) == 1 ? - glade_widget_get_name (widget) : _("multiple")); + glade_widget_get_name (widget) : _("multiple")); glade_command_remove (widgets); glade_command_pop_group (); } @@ -1883,7 +1882,7 @@ glade_command_cut (GList *widgets) widget = widgets->data; glade_command_push_group (_("Cut %s"), g_list_length (widgets) == 1 ? - glade_widget_get_name (widget) : _("multiple")); + glade_widget_get_name (widget) : _("multiple")); glade_command_remove (widgets); glade_command_pop_group (); @@ -1965,7 +1964,7 @@ void glade_command_paste (GList *widgets, GladeWidget *parent, GladePlaceholder *placeholder, - GladeProject *project) + GladeProject *project) { GList *list, *copied_widgets = NULL; GladeWidget *copied_widget = NULL; @@ -1985,7 +1984,7 @@ glade_command_paste (GList *widgets, glade_command_push_group (_("Paste %s"), g_list_length (widgets) == 1 ? - glade_widget_get_name (copied_widget) : _("multiple")); + glade_widget_get_name (copied_widget) : _("multiple")); glade_command_add (copied_widgets, parent, placeholder, project, TRUE); glade_command_pop_group (); @@ -2027,7 +2026,7 @@ glade_command_dnd (GList *widgets, glade_command_push_group (_("Drag %s and Drop to %s"), g_list_length (widgets) == 1 ? - glade_widget_get_name (widget) : _("multiple"), + glade_widget_get_name (widget) : _("multiple"), parent ? glade_widget_get_name (parent) : _("root")); glade_command_remove (widgets); glade_command_add (widgets, parent, placeholder, project, TRUE); @@ -2061,11 +2060,11 @@ typedef struct /* standard macros */ GLADE_MAKE_COMMAND (GladeCommandAddSignal, glade_command_add_signal); -#define GLADE_COMMAND_ADD_SIGNAL_TYPE (glade_command_add_signal_get_type ()) -#define GLADE_COMMAND_ADD_SIGNAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_ADD_SIGNAL_TYPE, GladeCommandAddSignal)) -#define GLADE_COMMAND_ADD_SIGNAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_ADD_SIGNAL_TYPE, GladeCommandAddSignalClass)) -#define GLADE_IS_COMMAND_ADD_SIGNAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_ADD_SIGNAL_TYPE)) -#define GLADE_IS_COMMAND_ADD_SIGNAL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_ADD_SIGNAL_TYPE)) +#define GLADE_COMMAND_ADD_SIGNAL_TYPE (glade_command_add_signal_get_type ()) +#define GLADE_COMMAND_ADD_SIGNAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_ADD_SIGNAL_TYPE, GladeCommandAddSignal)) +#define GLADE_COMMAND_ADD_SIGNAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_ADD_SIGNAL_TYPE, GladeCommandAddSignalClass)) +#define GLADE_IS_COMMAND_ADD_SIGNAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_ADD_SIGNAL_TYPE)) +#define GLADE_IS_COMMAND_ADD_SIGNAL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_ADD_SIGNAL_TYPE)) static void glade_command_add_signal_finalize (GObject *obj) @@ -2155,7 +2154,7 @@ glade_command_add_remove_change_signal (GladeWidget *glade_widget, g_strdup_printf (type == GLADE_ADD ? _("Add signal handler %s") : type == GLADE_REMOVE ? _("Remove signal handler %s") : _("Change signal handler %s"), - glade_signal_get_handler ((GladeSignal *)signal)); + glade_signal_get_handler ((GladeSignal *)signal)); glade_command_check_group (GLADE_COMMAND (me)); @@ -2233,11 +2232,11 @@ typedef struct GLADE_MAKE_COMMAND (GladeCommandSetI18n, glade_command_set_i18n); -#define GLADE_COMMAND_SET_I18N_TYPE (glade_command_set_i18n_get_type ()) -#define GLADE_COMMAND_SET_I18N(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_I18N_TYPE, GladeCommandSetI18n)) -#define GLADE_COMMAND_SET_I18N_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_I18N_TYPE, GladeCommandSetI18nClass)) -#define GLADE_IS_COMMAND_SET_I18N(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_I18N_TYPE)) -#define GLADE_IS_COMMAND_SET_I18N_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_I18N_TYPE)) +#define GLADE_COMMAND_SET_I18N_TYPE (glade_command_set_i18n_get_type ()) +#define GLADE_COMMAND_SET_I18N(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_SET_I18N_TYPE, GladeCommandSetI18n)) +#define GLADE_COMMAND_SET_I18N_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_SET_I18N_TYPE, GladeCommandSetI18nClass)) +#define GLADE_IS_COMMAND_SET_I18N(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_SET_I18N_TYPE)) +#define GLADE_IS_COMMAND_SET_I18N_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_SET_I18N_TYPE)) static gboolean glade_command_set_i18n_execute (GladeCommand *cmd) @@ -2398,11 +2397,11 @@ typedef struct GLADE_MAKE_COMMAND (GladeCommandLock, glade_command_lock); -#define GLADE_COMMAND_LOCK_TYPE (glade_command_lock_get_type ()) -#define GLADE_COMMAND_LOCK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_LOCK_TYPE, GladeCommandLock)) -#define GLADE_COMMAND_LOCK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_LOCK_TYPE, GladeCommandLockClass)) -#define GLADE_IS_COMMAND_LOCK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_LOCK_TYPE)) -#define GLADE_IS_COMMAND_LOCK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_LOCK_TYPE)) +#define GLADE_COMMAND_LOCK_TYPE (glade_command_lock_get_type ()) +#define GLADE_COMMAND_LOCK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_LOCK_TYPE, GladeCommandLock)) +#define GLADE_COMMAND_LOCK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_LOCK_TYPE, GladeCommandLockClass)) +#define GLADE_IS_COMMAND_LOCK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_LOCK_TYPE)) +#define GLADE_IS_COMMAND_LOCK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_LOCK_TYPE)) static gboolean glade_command_lock_execute (GladeCommand *cmd) @@ -2441,8 +2440,8 @@ glade_command_lock_finalize (GObject *obj) static gboolean glade_command_lock_unifies (GladeCommand *this_cmd, GladeCommand *other_cmd) { -/* GladeCommandLock *cmd1; */ -/* GladeCommandLock *cmd2; */ +/* GladeCommandLock *cmd1; */ +/* GladeCommandLock *cmd2; */ /* No point here, this command undoubtedly always runs in groups */ return FALSE; } @@ -2489,8 +2488,8 @@ glade_command_lock_widget (GladeWidget *widget, GladeWidget *locked) GLADE_COMMAND (me)->priv->project = glade_widget_get_project (widget); GLADE_COMMAND (me)->priv->description = g_strdup_printf (_("Locking %s by widget %s"), - glade_widget_get_name (locked), - glade_widget_get_name (widget)); + glade_widget_get_name (locked), + glade_widget_get_name (widget)); glade_command_check_group (GLADE_COMMAND (me)); @@ -2560,10 +2559,10 @@ typedef struct } GladeCommandTarget; GLADE_MAKE_COMMAND (GladeCommandTarget, glade_command_target); -#define GLADE_COMMAND_TARGET_TYPE (glade_command_target_get_type ()) -#define GLADE_COMMAND_TARGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_TARGET_TYPE, GladeCommandTarget)) -#define GLADE_COMMAND_TARGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_TARGET_TYPE, GladeCommandTargetClass)) -#define GLADE_IS_COMMAND_TARGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_TARGET_TYPE)) +#define GLADE_COMMAND_TARGET_TYPE (glade_command_target_get_type ()) +#define GLADE_COMMAND_TARGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_TARGET_TYPE, GladeCommandTarget)) +#define GLADE_COMMAND_TARGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_TARGET_TYPE, GladeCommandTargetClass)) +#define GLADE_IS_COMMAND_TARGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_TARGET_TYPE)) #define GLADE_IS_COMMAND_TARGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_TARGET_TYPE)) static gboolean @@ -2572,9 +2571,9 @@ glade_command_target_execute (GladeCommand *cmd) GladeCommandTarget *me = (GladeCommandTarget *) cmd; glade_project_set_target_version (cmd->priv->project, - me->catalog, - me->new_major, - me->new_minor); + me->catalog, + me->new_major, + me->new_minor); return TRUE; } @@ -2585,9 +2584,9 @@ glade_command_target_undo (GladeCommand *cmd) GladeCommandTarget *me = (GladeCommandTarget *) cmd; glade_project_set_target_version (cmd->priv->project, - me->catalog, - me->old_major, - me->old_minor); + me->catalog, + me->old_major, + me->old_minor); return TRUE; } @@ -2614,8 +2613,8 @@ glade_command_target_unifies (GladeCommand *this_cmd, GladeCommand *other_cmd) { me = (GladeCommandTarget *) this_cmd; - return (me->old_major == me->new_major && - me->old_minor == me->new_minor); + return (me->old_major == me->new_major && + me->old_minor == me->new_minor); } return FALSE; } @@ -2652,7 +2651,7 @@ glade_command_target_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd) g_free (this_cmd->priv->description); this_cmd->priv->description = g_strdup_printf (_("Setting target version of '%s' to %d.%d"), - this->catalog, this->new_major, this->new_minor); + this->catalog, this->new_major, this->new_minor); } @@ -2667,9 +2666,9 @@ glade_command_target_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd) */ void glade_command_set_project_target (GladeProject *project, - const gchar *catalog, - gint major, - gint minor) + const gchar *catalog, + gint major, + gint minor) { GladeCommandTarget *me; gint old_major = 0; @@ -2695,7 +2694,7 @@ glade_command_set_project_target (GladeProject *project, GLADE_COMMAND (me)->priv->description = g_strdup_printf (_("Setting target version of '%s' to %d.%d"), - me->catalog, me->new_major, me->new_minor); + me->catalog, me->new_major, me->new_minor); glade_command_check_group (GLADE_COMMAND (me)); @@ -2726,10 +2725,10 @@ typedef struct } GladeCommandProperty; GLADE_MAKE_COMMAND (GladeCommandProperty, glade_command_property); -#define GLADE_COMMAND_PROPERTY_TYPE (glade_command_property_get_type ()) -#define GLADE_COMMAND_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_PROPERTY_TYPE, GladeCommandProperty)) -#define GLADE_COMMAND_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_PROPERTY_TYPE, GladeCommandPropertyClass)) -#define GLADE_IS_COMMAND_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_PROPERTY_TYPE)) +#define GLADE_COMMAND_PROPERTY_TYPE (glade_command_property_get_type ()) +#define GLADE_COMMAND_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GLADE_COMMAND_PROPERTY_TYPE, GladeCommandProperty)) +#define GLADE_COMMAND_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GLADE_COMMAND_PROPERTY_TYPE, GladeCommandPropertyClass)) +#define GLADE_IS_COMMAND_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_PROPERTY_TYPE)) #define GLADE_IS_COMMAND_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_PROPERTY_TYPE)) /* Return true if a == b, this could be exported in glade_utils */ @@ -2882,7 +2881,7 @@ glade_command_property_collapse (GladeCommand *this_cmd, GladeCommand *other_cmd static void glade_command_set_project_property (GladeProject *project, DescriptionNewFunc description_new, - const gchar *property_id, + const gchar *property_id, GValue *new_value) { GladeCommandProperty *me; @@ -2994,7 +2993,7 @@ gcp_domain_description_new (GladeCommand *cmd) */ void glade_command_set_project_domain (GladeProject *project, - const gchar *domain) + const gchar *domain) { GValue new_value = G_VALUE_INIT; @@ -3034,7 +3033,7 @@ gcp_template_description_new (GladeCommand *cmd) */ void glade_command_set_project_template (GladeProject *project, - GladeWidget *widget) + GladeWidget *widget) { GValue new_value = G_VALUE_INIT; diff --git a/gladeui/glade-command.h b/gladeui/glade-command.h index 44a5f09a..9242d301 100644 --- a/gladeui/glade-command.h +++ b/gladeui/glade-command.h @@ -66,7 +66,7 @@ struct _GladeCommandClass GType glade_command_get_type (void); void glade_command_push_group (const gchar *fmt, - ...) G_GNUC_PRINTF (1, 2); + ...) G_GNUC_PRINTF (1, 2); void glade_command_pop_group (void); gint glade_command_get_group_depth (void); @@ -75,21 +75,21 @@ gint glade_command_group_id (GladeCommand *com gboolean glade_command_execute (GladeCommand *command); gboolean glade_command_undo (GladeCommand *command); gboolean glade_command_unifies (GladeCommand *command, - GladeCommand *other); + GladeCommand *other); void glade_command_collapse (GladeCommand *command, - GladeCommand *other); + GladeCommand *other); /************************ project ******************************/ void glade_command_set_project_target (GladeProject *project, - const gchar *catalog, - gint major, - gint minor); + const gchar *catalog, + gint major, + gint minor); void glade_command_set_project_domain (GladeProject *project, - const gchar *domain); + const gchar *domain); void glade_command_set_project_template(GladeProject *project, - GladeWidget *widget); + GladeWidget *widget); void glade_command_set_project_license (GladeProject *project, const gchar *license); @@ -100,21 +100,21 @@ void glade_command_set_project_resource_path (GladeProject *project, /************************** properties *********************************/ void glade_command_set_property_enabled(GladeProperty *property, - gboolean enabled); + gboolean enabled); void glade_command_set_property (GladeProperty *property, - ...); + ...); void glade_command_set_property_value (GladeProperty *property, - const GValue *value); + const GValue *value); void glade_command_set_properties (GladeProperty *property, - const GValue *old_value, - const GValue *new_value, - ...); + const GValue *old_value, + const GValue *new_value, + ...); void glade_command_set_properties_list (GladeProject *project, - GList *props); /* list of GCSetPropData */ + GList *props); /* list of GCSetPropData */ /************************** name ******************************/ @@ -124,7 +124,7 @@ void glade_command_set_name (GladeWidget *glade_widget, con /************************ protection ******************************/ void glade_command_lock_widget (GladeWidget *widget, - GladeWidget *lock); + GladeWidget *lock); void glade_command_unlock_widget (GladeWidget *widget); @@ -132,49 +132,49 @@ void glade_command_unlock_widget (GladeWidget *widget); /************************ create/add/delete ******************************/ void glade_command_add (GList *widgets, - GladeWidget *parent, - GladePlaceholder *placeholder, - GladeProject *project, - gboolean pasting); + GladeWidget *parent, + GladePlaceholder *placeholder, + GladeProject *project, + gboolean pasting); void glade_command_delete (GList *widgets); GladeWidget *glade_command_create (GladeWidgetAdaptor *adaptor, - GladeWidget *parent, - GladePlaceholder *placeholder, - GladeProject *project); + GladeWidget *parent, + GladePlaceholder *placeholder, + GladeProject *project); /************************ cut/paste/dnd ******************************/ void glade_command_cut (GList *widgets); void glade_command_paste (GList *widgets, - GladeWidget *parent, - GladePlaceholder *placeholder, - GladeProject *project); + GladeWidget *parent, + GladePlaceholder *placeholder, + GladeProject *project); void glade_command_dnd (GList *widgets, - GladeWidget *parent, - GladePlaceholder *placeholder); + GladeWidget *parent, + GladePlaceholder *placeholder); /************************ signals ******************************/ void glade_command_add_signal (GladeWidget *glade_widget, - const GladeSignal *signal); + const GladeSignal *signal); void glade_command_remove_signal (GladeWidget *glade_widget, - const GladeSignal *signal); + const GladeSignal *signal); void glade_command_change_signal (GladeWidget *glade_widget, - const GladeSignal *old_signal, - const GladeSignal *new_signal); + const GladeSignal *old_signal, + const GladeSignal *new_signal); /************************ set i18n ******************************/ void glade_command_set_i18n (GladeProperty *property, - gboolean translatable, - const gchar *context, - const gchar *comment); + gboolean translatable, + const gchar *context, + const gchar *comment); G_END_DECLS diff --git a/gladeui/glade-cursor.c b/gladeui/glade-cursor.c index 812b56f5..8b73d0dc 100644 --- a/gladeui/glade-cursor.c +++ b/gladeui/glade-cursor.c @@ -57,7 +57,7 @@ set_cursor_recurse (GtkWidget * widget, GdkCursor * gdk_cursor) static void set_cursor (GladeProject *project, - GdkCursor *gdk_cursor) + GdkCursor *gdk_cursor) { GList *list; @@ -67,10 +67,10 @@ set_cursor (GladeProject *project, GObject *object = list->data; if (GTK_IS_WIDGET (object) && - gtk_widget_get_has_window (GTK_WIDGET (object))) - { - set_cursor_recurse (GTK_WIDGET (object), gdk_cursor); - } + gtk_widget_get_has_window (GTK_WIDGET (object))) + { + set_cursor_recurse (GTK_WIDGET (object), gdk_cursor); + } } } @@ -84,8 +84,8 @@ set_cursor (GladeProject *project, */ void glade_cursor_set (GladeProject *project, - GdkWindow *window, - GladeCursorType type) + GdkWindow *window, + GladeCursorType type) { GladeWidgetAdaptor *adaptor; GdkCursor *the_cursor = NULL; diff --git a/gladeui/glade-cursor.h b/gladeui/glade-cursor.h index c7a085ca..e38b5e09 100644 --- a/gladeui/glade-cursor.h +++ b/gladeui/glade-cursor.h @@ -13,42 +13,42 @@ G_BEGIN_DECLS * is called */ typedef struct _GladeCursor { - GdkCursor *selector; - GdkCursor *add_widget; /* fallback cursor if we cannot use widget_class->cursor */ - GdkCursor *resize_top_left; - GdkCursor *resize_top_right; - GdkCursor *resize_bottom_left; - GdkCursor *resize_bottom_right; - GdkCursor *resize_left; - GdkCursor *resize_right; - GdkCursor *resize_top; - GdkCursor *resize_bottom; - GdkCursor *drag; - - GdkPixbuf *add_widget_pixbuf; /* a pixbuf of the generic 'add' cursor */ + GdkCursor *selector; + GdkCursor *add_widget; /* fallback cursor if we cannot use widget_class->cursor */ + GdkCursor *resize_top_left; + GdkCursor *resize_top_right; + GdkCursor *resize_bottom_left; + GdkCursor *resize_bottom_right; + GdkCursor *resize_left; + GdkCursor *resize_right; + GdkCursor *resize_top; + GdkCursor *resize_bottom; + GdkCursor *drag; + + GdkPixbuf *add_widget_pixbuf; /* a pixbuf of the generic 'add' cursor */ } GladeCursor; /* Enumed values for each of the cursors for GladeCursor. For every * GdkCursor above there should be a enum here */ typedef enum { - GLADE_CURSOR_SELECTOR, - GLADE_CURSOR_ADD_WIDGET, - GLADE_CURSOR_RESIZE_TOP_LEFT, - GLADE_CURSOR_RESIZE_TOP_RIGHT, - GLADE_CURSOR_RESIZE_BOTTOM_LEFT, - GLADE_CURSOR_RESIZE_BOTTOM_RIGHT, - GLADE_CURSOR_RESIZE_LEFT, - GLADE_CURSOR_RESIZE_RIGHT, - GLADE_CURSOR_RESIZE_TOP, - GLADE_CURSOR_RESIZE_BOTTOM, - GLADE_CURSOR_DRAG + GLADE_CURSOR_SELECTOR, + GLADE_CURSOR_ADD_WIDGET, + GLADE_CURSOR_RESIZE_TOP_LEFT, + GLADE_CURSOR_RESIZE_TOP_RIGHT, + GLADE_CURSOR_RESIZE_BOTTOM_LEFT, + GLADE_CURSOR_RESIZE_BOTTOM_RIGHT, + GLADE_CURSOR_RESIZE_LEFT, + GLADE_CURSOR_RESIZE_RIGHT, + GLADE_CURSOR_RESIZE_TOP, + GLADE_CURSOR_RESIZE_BOTTOM, + GLADE_CURSOR_DRAG } GladeCursorType; void glade_cursor_init (void); void glade_cursor_set (GladeProject *project, - GdkWindow *window, - GladeCursorType type); + GdkWindow *window, + GladeCursorType type); const GdkPixbuf* glade_cursor_get_add_widget_pixbuf (void); G_END_DECLS diff --git a/gladeui/glade-debug.c b/gladeui/glade-debug.c index e0216de4..aae2f41c 100644 --- a/gladeui/glade-debug.c +++ b/gladeui/glade-debug.c @@ -99,9 +99,9 @@ glade_init_debug_flags (void) env_string = g_getenv ("GLADE_DEBUG"); if (env_string != NULL) - glade_debug_flags = - g_parse_debug_string (env_string, - glade_debug_keys, - G_N_ELEMENTS (glade_debug_keys)); + glade_debug_flags = + g_parse_debug_string (env_string, + glade_debug_keys, + G_N_ELEMENTS (glade_debug_keys)); } } diff --git a/gladeui/glade-debug.h b/gladeui/glade-debug.h index 5b692e2b..c591e2ad 100644 --- a/gladeui/glade-debug.h +++ b/gladeui/glade-debug.h @@ -13,10 +13,10 @@ typedef enum { #ifdef GLADE_ENABLE_DEBUG -#define GLADE_NOTE(type,action) \ - G_STMT_START { \ - if (glade_get_debug_flags () & GLADE_DEBUG_##type) \ - { action; }; \ +#define GLADE_NOTE(type,action) \ + G_STMT_START { \ + if (glade_get_debug_flags () & GLADE_DEBUG_##type) \ + { action; }; \ } G_STMT_END #else /* !GLADE_ENABLE_DEBUG */ diff --git a/gladeui/glade-design-layout.c b/gladeui/glade-design-layout.c index dd885d4f..3b90b483 100644 --- a/gladeui/glade-design-layout.c +++ b/gladeui/glade-design-layout.c @@ -536,7 +536,7 @@ glade_project_is_toplevel_active (GladeProject *project, GtkWidget *toplevel) for (l = glade_project_selection_get (project); l; l = g_list_next (l)) { if (GTK_IS_WIDGET (l->data) && - gtk_widget_is_ancestor (l->data, toplevel)) return TRUE; + gtk_widget_is_ancestor (l->data, toplevel)) return TRUE; } return FALSE; diff --git a/gladeui/glade-design-layout.h b/gladeui/glade-design-layout.h index 6fe37b72..b5e3480e 100644 --- a/gladeui/glade-design-layout.h +++ b/gladeui/glade-design-layout.h @@ -44,7 +44,7 @@ typedef struct _GladeDesignLayoutClass GladeDesignLayoutClass; struct _GladeDesignLayout { GtkBin parent_instance; - + GladeDesignLayoutPrivate *priv; }; diff --git a/gladeui/glade-design-view.c b/gladeui/glade-design-view.c index 524e95d2..a9995387 100644 --- a/gladeui/glade-design-view.c +++ b/gladeui/glade-design-view.c @@ -422,7 +422,7 @@ glade_design_view_init (GladeDesignView *view) gtk_widget_set_no_show_all (GTK_WIDGET (view), TRUE); gtk_orientable_set_orientation (GTK_ORIENTABLE (view), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); view->priv->project = NULL; view->priv->layout_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); diff --git a/gladeui/glade-displayable-values.h b/gladeui/glade-displayable-values.h index 726c6558..9f4e39f1 100644 --- a/gladeui/glade-displayable-values.h +++ b/gladeui/glade-displayable-values.h @@ -7,22 +7,22 @@ G_BEGIN_DECLS void glade_register_displayable_value (GType type, - const gchar *value, - const gchar *domain, - const gchar *string); + const gchar *value, + const gchar *domain, + const gchar *string); void glade_register_translated_value (GType type, - const gchar *value, - const gchar *string); + const gchar *value, + const gchar *string); gboolean glade_type_has_displayable_values (GType type); G_CONST_RETURN gchar *glade_get_displayable_value (GType type, - const gchar *value); + const gchar *value); gboolean glade_displayable_value_is_disabled (GType type, - const gchar *value); + const gchar *value); void glade_displayable_value_set_disabled (GType type, const gchar *value, @@ -30,7 +30,7 @@ void glade_displayable_value_set_disabled (GType type, G_CONST_RETURN gchar *glade_get_value_from_displayable (GType type, - const gchar *displayabe); + const gchar *displayabe); G_END_DECLS diff --git a/gladeui/glade-editable.c b/gladeui/glade-editable.c index 605b1415..ecb603e5 100644 --- a/gladeui/glade-editable.c +++ b/gladeui/glade-editable.c @@ -45,7 +45,7 @@ static void project_changed (GladeProject *project, GladeCommand *command, gboolean execute, - GladeEditable *editable) + GladeEditable *editable) { GladeWidget *widget; @@ -56,7 +56,7 @@ project_changed (GladeProject *project, static void project_closed (GladeProject *project, - GladeEditable *editable) + GladeEditable *editable) { glade_editable_load (editable, NULL); } @@ -69,7 +69,7 @@ editable_destroyed (GladeEditable *editable) static void glade_editable_load_default (GladeEditable *editable, - GladeWidget *widget) + GladeWidget *widget) { GladeWidget *old_widget; GladeProject *old_project; @@ -80,26 +80,26 @@ glade_editable_load_default (GladeEditable *editable, if (old_widget != widget) { if (old_widget) - { - g_signal_handlers_disconnect_by_func (old_project, G_CALLBACK (project_changed), editable); - g_signal_handlers_disconnect_by_func (old_project, G_CALLBACK (project_closed), editable); + { + g_signal_handlers_disconnect_by_func (old_project, G_CALLBACK (project_changed), editable); + g_signal_handlers_disconnect_by_func (old_project, G_CALLBACK (project_closed), editable); - g_object_set_qdata (G_OBJECT (editable), glade_editable_widget_quark, NULL); - g_object_set_qdata (G_OBJECT (editable), glade_editable_project_quark, NULL); - } + g_object_set_qdata (G_OBJECT (editable), glade_editable_widget_quark, NULL); + g_object_set_qdata (G_OBJECT (editable), glade_editable_project_quark, NULL); + } if (widget) - { - GladeProject *project = glade_widget_get_project (widget); + { + GladeProject *project = glade_widget_get_project (widget); - g_object_set_qdata (G_OBJECT (editable), glade_editable_widget_quark, widget); - g_object_set_qdata (G_OBJECT (editable), glade_editable_project_quark, project); + g_object_set_qdata (G_OBJECT (editable), glade_editable_widget_quark, widget); + g_object_set_qdata (G_OBJECT (editable), glade_editable_project_quark, project); - g_signal_connect (project, "changed", - G_CALLBACK (project_changed), editable); - g_signal_connect (project, "close", - G_CALLBACK (project_closed), editable); - } + g_signal_connect (project, "changed", + G_CALLBACK (project_changed), editable); + g_signal_connect (project, "close", + G_CALLBACK (project_closed), editable); + } } } diff --git a/gladeui/glade-editable.h b/gladeui/glade-editable.h index 11758109..f578ebe3 100644 --- a/gladeui/glade-editable.h +++ b/gladeui/glade-editable.h @@ -34,17 +34,17 @@ struct _GladeEditableIface /* virtual table */ void (* load) (GladeEditable *editable, - GladeWidget *widget); + GladeWidget *widget); void (* set_show_name) (GladeEditable *editable, - gboolean show_name); + gboolean show_name); }; GType glade_editable_get_type (void) G_GNUC_CONST; void glade_editable_load (GladeEditable *editable, - GladeWidget *widget); + GladeWidget *widget); void glade_editable_set_show_name (GladeEditable *editable, - gboolean show_name); + gboolean show_name); GladeWidget *glade_editable_loaded_widget (GladeEditable *editable); gboolean glade_editable_loading (GladeEditable *editable); diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index a400078b..2739e514 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -97,15 +97,15 @@ struct _GladeEditorPropertyPrivate gchar *custom_text; /* Custom text to display in the property label */ guint loading : 1; /* True during glade_editor_property_load calls, this - * is used to avoid feedback from input widgets. - */ + * is used to avoid feedback from input widgets. + */ guint committing : 1; /* True while the editor property itself is applying - * the property with glade_editor_property_commit_no_callback (). - */ + * the property with glade_editor_property_commit_no_callback (). + */ guint use_command : 1; /* Whether we should use the glade command interface - * or skip directly to GladeProperty interface. - * (used for query dialogs). - */ + * or skip directly to GladeProperty interface. + * (used for query dialogs). + */ guint changed_blocked : 1; /* Whether the GladeProperty changed signal is currently blocked */ guint disable_check : 1; /* Whether to explicitly disable the optional check button */ @@ -126,7 +126,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeEditorProperty, glade_editor_property, GTK_TYPE_BO *******************************************************************************/ static void glade_editor_property_editable_load (GladeEditable *editable, - GladeWidget *widget) + GladeWidget *widget) { /* Chain up to default implementation */ parent_editable_iface->load (editable, widget); @@ -235,7 +235,7 @@ glade_editor_property_commit_no_callback (GladeEditorProperty *eprop, void glade_editor_property_set_custom_text (GladeEditorProperty *eprop, - const gchar *custom_text) + const gchar *custom_text) { GladeEditorPropertyPrivate *priv; @@ -249,8 +249,8 @@ glade_editor_property_set_custom_text (GladeEditorProperty *eprop, priv->custom_text = g_strdup (custom_text); if (priv->item_label) - glade_property_label_set_custom_text (GLADE_PROPERTY_LABEL (priv->item_label), - custom_text); + glade_property_label_set_custom_text (GLADE_PROPERTY_LABEL (priv->item_label), + custom_text); g_object_notify (G_OBJECT (eprop), "custom-text"); } @@ -302,8 +302,8 @@ glade_editor_property_get_item_label (GladeEditorProperty *eprop) g_object_ref_sink (eprop->priv->item_label); if (eprop->priv->property) - glade_property_label_set_property (GLADE_PROPERTY_LABEL (eprop->priv->item_label), - eprop->priv->property); + glade_property_label_set_property (GLADE_PROPERTY_LABEL (eprop->priv->item_label), + eprop->priv->property); } return eprop->priv->item_label; @@ -383,7 +383,7 @@ glade_editor_property_enabled_toggled_cb (GtkWidget *check, GladeEditorProperty *eprop) { glade_command_set_property_enabled (eprop->priv->property, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))); + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))); } static void @@ -442,7 +442,7 @@ glade_editor_property_constructed (GObject *object) gtk_button_set_focus_on_click (GTK_BUTTON (eprop->priv->check), FALSE); if (!eprop->priv->disable_check) - gtk_widget_show (eprop->priv->check); + gtk_widget_show (eprop->priv->check); gtk_box_pack_start (GTK_BOX (eprop), eprop->priv->check, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (eprop->priv->check), "toggled", @@ -510,8 +510,8 @@ glade_editor_property_set_property (GObject *object, glade_editor_property_set_disable_check (eprop, g_value_get_boolean (value)); break; case PROP_CUSTOM_TEXT: - glade_editor_property_set_custom_text (eprop, g_value_get_string (value)); - break; + glade_editor_property_set_custom_text (eprop, g_value_get_string (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -520,8 +520,8 @@ glade_editor_property_set_property (GObject *object, static void glade_editor_property_real_get_property (GObject *object, - guint prop_id, - GValue *value, + guint prop_id, + GValue *value, GParamSpec *pspec) { GladeEditorProperty *eprop = GLADE_EDITOR_PROPERTY (object); @@ -535,11 +535,11 @@ glade_editor_property_real_get_property (GObject *object, g_value_set_boolean (value, eprop->priv->use_command); break; case PROP_DISABLE_CHECK: - g_value_set_boolean (value, eprop->priv->disable_check); - break; + g_value_set_boolean (value, eprop->priv->disable_check); + break; case PROP_CUSTOM_TEXT: - g_value_set_string (value, eprop->priv->custom_text); - break; + g_value_set_string (value, eprop->priv->custom_text); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -636,9 +636,9 @@ glade_editor_property_load_common (GladeEditorProperty *eprop, /* Load initial tooltips */ glade_editor_property_tooltip_cb - (property, glade_property_class_get_tooltip (pclass), - glade_propert_get_insensitive_tooltip (property), - glade_property_get_support_warning (property), eprop); + (property, glade_property_class_get_tooltip (pclass), + glade_propert_get_insensitive_tooltip (property), + glade_property_get_support_warning (property), eprop); /* Load initial enabled state */ @@ -657,7 +657,7 @@ glade_editor_property_init (GladeEditorProperty *eprop) gtk_box_set_spacing (GTK_BOX (eprop), 4); gtk_orientable_set_orientation (GTK_ORIENTABLE (eprop), - GTK_ORIENTATION_HORIZONTAL); + GTK_ORIENTATION_HORIZONTAL); } static void @@ -870,7 +870,7 @@ glade_eprop_numeric_changed (GtkWidget *spin, GladeEditorProperty *eprop) static void glade_eprop_numeric_force_update (GtkSpinButton *spin, - GladeEditorProperty *eprop) + GladeEditorProperty *eprop) { GladeProperty *prop = glade_editor_property_get_property (eprop); GladePropertyClass *klass = glade_property_get_class (prop); @@ -1104,10 +1104,10 @@ glade_eprop_enum_create_input (GladeEditorProperty *eprop) cell_renderer = gtk_cell_renderer_text_new (); g_object_set (cell_renderer, - "wrap-mode", PANGO_WRAP_WORD, - "wrap-width", 1, - "width-chars", 8, - NULL); + "wrap-mode", PANGO_WRAP_WORD, + "wrap-width", 1, + "width-chars", 8, + NULL); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (eprop_enum->combo_box), cell_renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (eprop_enum->combo_box), @@ -1447,42 +1447,42 @@ glade_eprop_color_load (GladeEditorProperty *eprop, GladeProperty *property) gtk_entry_set_text (GTK_ENTRY (eprop_color->entry), ""); if (pspec->value_type == GDK_TYPE_COLOR) - { - if ((color = g_value_get_boxed (glade_property_inline_value (property))) != NULL) - { - GdkRGBA copy; - - copy.red = color->red / 65535.0; - copy.green = color->green / 65535.0; - copy.blue = color->blue / 65535.0; - copy.alpha = 1.0; - - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), ©); - } - else - { - GdkRGBA black = { 0, }; - - /* Manually fill it with black for an NULL value. - */ - if (gdk_rgba_parse (&black, "Black")) - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), &black); - } - } + { + if ((color = g_value_get_boxed (glade_property_inline_value (property))) != NULL) + { + GdkRGBA copy; + + copy.red = color->red / 65535.0; + copy.green = color->green / 65535.0; + copy.blue = color->blue / 65535.0; + copy.alpha = 1.0; + + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), ©); + } + else + { + GdkRGBA black = { 0, }; + + /* Manually fill it with black for an NULL value. + */ + if (gdk_rgba_parse (&black, "Black")) + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), &black); + } + } else if (pspec->value_type == GDK_TYPE_RGBA) - { - if ((rgba = g_value_get_boxed (glade_property_inline_value (property))) != NULL) - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), rgba); - else - { - GdkRGBA black = { 0, }; + { + if ((rgba = g_value_get_boxed (glade_property_inline_value (property))) != NULL) + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), rgba); + else + { + GdkRGBA black = { 0, }; - /* Manually fill it with black for an NULL value. - */ - if (gdk_rgba_parse (&black, "Black")) - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), &black); - } - } + /* Manually fill it with black for an NULL value. + */ + if (gdk_rgba_parse (&black, "Black")) + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (eprop_color->cbutton), &black); + } + } } } @@ -1863,12 +1863,12 @@ glade_eprop_text_load (GladeEditorProperty *eprop, GladeProperty *property) gtk_text_view_get_buffer (GTK_TEXT_VIEW (eprop_text->text_entry)); if (pspec->value_type == G_TYPE_STRV || - pspec->value_type == value_array_type) + pspec->value_type == value_array_type) { - GladePropertyClass *pclass = glade_property_get_class (property); + GladePropertyClass *pclass = glade_property_get_class (property); gchar *text = glade_widget_adaptor_string_from_value - (glade_property_class_get_adaptor (pclass), - pclass, glade_property_inline_value (property)); + (glade_property_class_get_adaptor (pclass), + pclass, glade_property_inline_value (property)); gchar *old_text = text_buffer_get_text (buffer); /* Only update it if necessary, see notes bellow */ @@ -2092,8 +2092,8 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent, gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0); gtk_widget_set_tooltip_text (alignment, _("For short and ambiguous strings: type a word here to differentiate " - "the meaning of this string from the meaning of other occurrences of " - "the same string")); + "the meaning of this string from the meaning of other occurrences of " + "the same string")); sw = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (sw); @@ -2346,11 +2346,11 @@ get_text_view_height (void) { GtkWidget *label = gtk_label_new (NULL); PangoLayout *layout = - gtk_widget_create_pango_layout (label, - "The quick\n" - "brown fox\n" - "jumped over\n" - "the lazy dog"); + gtk_widget_create_pango_layout (label, + "The quick\n" + "brown fox\n" + "jumped over\n" + "the lazy dog"); pango_layout_get_pixel_size (layout, NULL, &height); @@ -2395,7 +2395,7 @@ glade_eprop_text_create_input (GladeEditorProperty *eprop) eprop_text->store = (GtkTreeModel *) glade_eprop_text_create_store (glade_property_class_stock (klass) ? - GLADE_TYPE_STOCK : GLADE_TYPE_STOCK_IMAGE); + GLADE_TYPE_STOCK : GLADE_TYPE_STOCK_IMAGE); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (eprop_text->store)); @@ -2621,8 +2621,8 @@ glade_eprop_check_load (GladeEditorProperty *eprop, GladeProperty *property) static void glade_eprop_check_active_notify (GObject *gobject, - GParamSpec *pspec, - GladeEditorProperty *eprop) + GParamSpec *pspec, + GladeEditorProperty *eprop) { GValue val = { 0, }; @@ -2650,12 +2650,12 @@ glade_eprop_check_create_input (GladeEditorProperty *eprop) label = glade_editor_property_get_item_label (eprop); glade_property_label_set_property_name (GLADE_PROPERTY_LABEL (label), - glade_property_class_id (pclass)); + glade_property_class_id (pclass)); glade_property_label_set_packing (GLADE_PROPERTY_LABEL (label), - glade_property_class_get_is_packing (pclass)); + glade_property_class_get_is_packing (pclass)); glade_property_label_set_append_colon (GLADE_PROPERTY_LABEL (label), FALSE); glade_property_label_set_custom_text (GLADE_PROPERTY_LABEL (label), - eprop->priv->custom_text); + eprop->priv->custom_text); gtk_widget_show (label); eprop_check->button = gtk_check_button_new (); @@ -2895,15 +2895,15 @@ glade_eprop_object_populate_view_real (GtkTreeStore *model, const gchar *widget_name; if ((widget = glade_widget_get_from_gobject (list->data)) != NULL) { - adaptor = glade_widget_get_adaptor (widget); + adaptor = glade_widget_get_adaptor (widget); has_decendant = - !parentless && glade_widget_has_decendant (widget, object_type); + !parentless && glade_widget_has_decendant (widget, object_type); good_type = (glade_widget_adaptor_get_object_type (adaptor) == object_type || g_type_is_a (glade_widget_adaptor_get_object_type (adaptor), object_type)); - widget_name = glade_widget_get_display_name (widget); + widget_name = glade_widget_get_display_name (widget); if (parentless) good_type = good_type && !GWA_IS_TOPLEVEL (adaptor); @@ -3370,25 +3370,25 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop) if (selected) { GValue *value; - GObject *new_object, *old_object = NULL; - GladeWidget *new_widget; - const gchar *current_name; + GObject *new_object, *old_object = NULL; + GladeWidget *new_widget; + const gchar *current_name; glade_project_selection_set (project, - glade_widget_get_object (widget), + glade_widget_get_object (widget), TRUE); value = glade_property_class_make_gvalue_from_string - (eprop->priv->klass, glade_widget_get_name (selected), project); + (eprop->priv->klass, glade_widget_get_name (selected), project); - glade_property_get (eprop->priv->property, &old_object); - new_object = g_value_get_object (value); - new_widget = glade_widget_get_from_gobject (new_object); + glade_property_get (eprop->priv->property, &old_object); + new_object = g_value_get_object (value); + new_widget = glade_widget_get_from_gobject (new_object); - glade_command_push_group (_("Setting %s of %s to %s"), - glade_property_class_get_name (eprop->priv->klass), - glade_widget_get_name (widget), - glade_widget_get_name (new_widget)); + glade_command_push_group (_("Setting %s of %s to %s"), + glade_property_class_get_name (eprop->priv->klass), + glade_widget_get_name (widget), + glade_widget_get_name (new_widget)); /* Unparent the widget so we can reuse it for this property */ if (glade_property_class_parentless_widget (eprop->priv->klass)) @@ -3398,27 +3398,27 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop) if (!G_IS_PARAM_SPEC_OBJECT (pspec)) g_warning ("Parentless widget property should be of object type"); else if (new_object && old_object != new_object) - { - /* Steal parentless reference widget references, basically some references - * can only be referenced by one property, here we clear it if such a reference - * exists for the target object - */ - if ((old_ref = glade_widget_get_parentless_widget_ref (new_widget))) - glade_command_set_property (old_ref, NULL); - } - } - - /* Ensure that the object we will now refer to has an ID, the NULL - * check is just paranoia, it *always* has a name. - * - * To refer to a widget, it needs to have a name. - */ - glade_widget_ensure_name (new_widget, project, TRUE); - - glade_editor_property_commit (eprop, value); - glade_command_pop_group (); - - g_value_unset (value); + { + /* Steal parentless reference widget references, basically some references + * can only be referenced by one property, here we clear it if such a reference + * exists for the target object + */ + if ((old_ref = glade_widget_get_parentless_widget_ref (new_widget))) + glade_command_set_property (old_ref, NULL); + } + } + + /* Ensure that the object we will now refer to has an ID, the NULL + * check is just paranoia, it *always* has a name. + * + * To refer to a widget, it needs to have a name. + */ + glade_widget_ensure_name (new_widget, project, TRUE); + + glade_editor_property_commit (eprop, value); + glade_command_pop_group (); + + g_value_unset (value); g_free (value); } } @@ -3437,16 +3437,16 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop) if ((new_widget = glade_command_create (create_adaptor, NULL, NULL, project)) != NULL) { - GValue *value; + GValue *value; glade_project_selection_set (project, glade_widget_get_object (widget), TRUE); - /* Give the newly created object a name */ - glade_widget_ensure_name (new_widget, project, TRUE); + /* Give the newly created object a name */ + glade_widget_ensure_name (new_widget, project, TRUE); - value = g_new0 (GValue, 1); - g_value_init (value, pspec->value_type); - g_value_set_object (value, glade_widget_get_object (new_widget)); + value = g_new0 (GValue, 1); + g_value_init (value, pspec->value_type); + g_value_set_object (value, glade_widget_get_object (new_widget)); glade_editor_property_commit (eprop, value); @@ -3459,7 +3459,7 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop) else if (res == GLADE_RESPONSE_CLEAR) { GValue *value = - glade_property_class_make_gvalue_from_string (eprop->priv->klass, NULL, project); + glade_property_class_make_gvalue_from_string (eprop->priv->klass, NULL, project); glade_editor_property_commit (eprop, value); @@ -3679,27 +3679,27 @@ glade_eprop_objects_show_dialog (GladeEditorProperty *eprop) glade_eprop_objects_selected_widget, &selected); if (selected) - { - glade_command_push_group (_("Setting %s of %s"), - glade_property_class_get_name (eprop->priv->klass), - glade_widget_get_name (widget)); - - /* Make sure the selected widgets have names now - */ - for (l = selected; l; l = l->next) - { - GObject *object = l->data; - GladeWidget *selected_widget = glade_widget_get_from_gobject (object); - - glade_widget_ensure_name (selected_widget, project, TRUE); - } - } + { + glade_command_push_group (_("Setting %s of %s"), + glade_property_class_get_name (eprop->priv->klass), + glade_widget_get_name (widget)); + + /* Make sure the selected widgets have names now + */ + for (l = selected; l; l = l->next) + { + GObject *object = l->data; + GladeWidget *selected_widget = glade_widget_get_from_gobject (object); + + glade_widget_ensure_name (selected_widget, project, TRUE); + } + } value = glade_property_class_make_gvalue (eprop->priv->klass, selected); glade_editor_property_commit (eprop, value); if (selected) - glade_command_pop_group (); + glade_command_pop_group (); g_value_unset (value); g_free (value); @@ -3804,7 +3804,7 @@ glade_editor_property_load_by_widget (GladeEditorProperty *eprop, glade_editor_property_load (eprop, property); if (eprop->priv->item_label) - glade_property_label_set_property (GLADE_PROPERTY_LABEL (eprop->priv->item_label), property); + glade_property_label_set_property (GLADE_PROPERTY_LABEL (eprop->priv->item_label), property); if (property) { @@ -3812,15 +3812,15 @@ glade_editor_property_load_by_widget (GladeEditorProperty *eprop, gtk_widget_show (GTK_WIDGET (eprop)); - if (eprop->priv->item_label) - gtk_widget_show (eprop->priv->item_label); + if (eprop->priv->item_label) + gtk_widget_show (eprop->priv->item_label); } else { gtk_widget_hide (GTK_WIDGET (eprop)); - if (eprop->priv->item_label) - gtk_widget_hide (eprop->priv->item_label); + if (eprop->priv->item_label) + gtk_widget_hide (eprop->priv->item_label); } } else diff --git a/gladeui/glade-editor-property.h b/gladeui/glade-editor-property.h index 8f7c8e4f..1f8f2b3b 100644 --- a/gladeui/glade-editor-property.h +++ b/gladeui/glade-editor-property.h @@ -10,54 +10,53 @@ G_BEGIN_DECLS *******************************************************************************/ /* XXX document me ! */ -#define GLADE_MAKE_EPROP_TYPE(func, type, parent) \ -GType \ -func ## _get_type (void) \ -{ \ - static GType cmd_type = 0; \ - \ - if (!cmd_type) \ - { \ - static const GTypeInfo info = \ - { \ - sizeof (type ## Class), \ - (GBaseInitFunc) NULL, \ - (GBaseFinalizeFunc) NULL, \ - (GClassInitFunc) func ## _class_init, \ - (GClassFinalizeFunc) NULL, \ - NULL, \ - sizeof (type), \ - 0, \ - (GInstanceInitFunc) NULL \ - }; \ - \ - cmd_type = g_type_register_static (parent, #type, &info, 0); \ - } \ - \ - return cmd_type; \ -} \ - - -#define GLADE_MAKE_EPROP(type, func) \ -static void \ -func ## _finalize (GObject *object); \ -static void \ -func ## _load (GladeEditorProperty *me, GladeProperty *property); \ -static GtkWidget * \ -func ## _create_input (GladeEditorProperty *me); \ -static void \ -func ## _class_init (gpointer parent_tmp, gpointer notused) \ -{ \ - GladeEditorPropertyClass *parent = parent_tmp; \ - GObjectClass* object_class; \ - object_class = G_OBJECT_CLASS (parent); \ - parent->load = func ## _load; \ - parent->create_input = func ## _create_input; \ - object_class->finalize = func ## _finalize; \ -} \ -typedef struct { \ - GladeEditorPropertyClass cmd; \ -} type ## Class; \ +#define GLADE_MAKE_EPROP_TYPE(func, type, parent) \ +GType \ +func ## _get_type (void) \ +{ \ + static GType cmd_type = 0; \ + \ + if (!cmd_type) \ + { \ + static const GTypeInfo info = { \ + sizeof (type ## Class), \ + (GBaseInitFunc) NULL, \ + (GBaseFinalizeFunc) NULL, \ + (GClassInitFunc) func ## _class_init, \ + (GClassFinalizeFunc) NULL, \ + NULL, \ + sizeof (type), \ + 0, \ + (GInstanceInitFunc) NULL \ + }; \ + \ + cmd_type = g_type_register_static (parent, #type, &info, 0); \ + } \ + \ + return cmd_type; \ +} + + +#define GLADE_MAKE_EPROP(type, func) \ +static void \ +func ## _finalize (GObject *object); \ +static void \ +func ## _load (GladeEditorProperty *me, GladeProperty *property); \ +static GtkWidget * \ +func ## _create_input (GladeEditorProperty *me); \ +static void \ +func ## _class_init (gpointer parent_tmp, gpointer notused) \ +{ \ + GladeEditorPropertyClass *parent = parent_tmp; \ + GObjectClass* object_class; \ + object_class = G_OBJECT_CLASS (parent); \ + parent->load = func ## _load; \ + parent->create_input = func ## _create_input; \ + object_class->finalize = func ## _finalize; \ +} \ +typedef struct { \ + GladeEditorPropertyClass cmd; \ +} type ## Class; \ GLADE_MAKE_EPROP_TYPE(func, type, GLADE_TYPE_EDITOR_PROPERTY) @@ -100,15 +99,15 @@ struct _GladeEditorPropertyClass { GType glade_editor_property_get_type (void) G_GNUC_CONST; void glade_editor_property_load (GladeEditorProperty *eprop, - GladeProperty *property); + GladeProperty *property); void glade_editor_property_load_by_widget (GladeEditorProperty *eprop, - GladeWidget *widget); + GladeWidget *widget); void glade_editor_property_commit (GladeEditorProperty *eprop, - GValue *value); + GValue *value); void glade_editor_property_commit_no_callback (GladeEditorProperty *eprop, - GValue *value); + GValue *value); void glade_editor_property_set_custom_text (GladeEditorProperty *eprop, const gchar *custom_text); const gchar *glade_editor_property_get_custom_text (GladeEditorProperty *eprop); @@ -127,8 +126,8 @@ gboolean glade_editor_property_show_i18n_dialog (GtkWidget gchar **comment, gboolean *translatable); gboolean glade_editor_property_show_resource_dialog (GladeProject *project, - GtkWidget *parent, - gchar **filename); + GtkWidget *parent, + gchar **filename); gboolean glade_editor_property_show_object_dialog (GladeProject *project, const gchar *title, diff --git a/gladeui/glade-editor-skeleton.c b/gladeui/glade-editor-skeleton.c index 2f05c0f8..6d4e68de 100644 --- a/gladeui/glade-editor-skeleton.c +++ b/gladeui/glade-editor-skeleton.c @@ -50,10 +50,10 @@ static GtkBuildableIface *parent_buildable_iface; G_DEFINE_TYPE_WITH_CODE (GladeEditorSkeleton, glade_editor_skeleton, GTK_TYPE_BOX, G_ADD_PRIVATE (GladeEditorSkeleton) - G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, + G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, glade_editor_skeleton_editable_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, - glade_editor_skeleton_buildable_init)); + G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, + glade_editor_skeleton_buildable_init)); static void glade_editor_skeleton_init (GladeEditorSkeleton *skeleton) @@ -91,8 +91,8 @@ glade_editor_skeleton_dispose (GObject *object) * GladeEditableIface * *******************************************************************************/ static void -glade_editor_skeleton_load (GladeEditable *editable, - GladeWidget *widget) +glade_editor_skeleton_load (GladeEditable *editable, + GladeWidget *widget) { GladeEditorSkeleton *skeleton = GLADE_EDITOR_SKELETON (editable); GladeEditorSkeletonPrivate *priv = skeleton->priv; @@ -143,11 +143,11 @@ typedef struct static void editor_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, - gpointer user_data, - GError **error) + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) { EditorParserData *editor_data = (EditorParserData *)user_data; gchar *id; @@ -177,11 +177,11 @@ static const GMarkupParser editor_parser = static gboolean glade_editor_skeleton_custom_tag_start (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *tagname, - GMarkupParser *parser, - gpointer *data) + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GMarkupParser *parser, + gpointer *data) { if (strcmp (tagname, "child-editors") == 0) { @@ -194,15 +194,15 @@ glade_editor_skeleton_custom_tag_start (GtkBuildable *buildable, } return parent_buildable_iface->custom_tag_start (buildable, builder, child, - tagname, parser, data); + tagname, parser, data); } static void glade_editor_skeleton_custom_finished (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *tagname, - gpointer user_data) + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer user_data) { EditorParserData *editor_data = (EditorParserData *)user_data; GSList *l; @@ -210,7 +210,7 @@ glade_editor_skeleton_custom_finished (GtkBuildable *buildable, if (strcmp (tagname, "child-editors") != 0) { parent_buildable_iface->custom_finished (buildable, builder, child, - tagname, user_data); + tagname, user_data); return; } @@ -222,11 +222,11 @@ glade_editor_skeleton_custom_finished (GtkBuildable *buildable, object = gtk_builder_get_object (builder, id); if (!GLADE_EDITABLE (object)) - g_warning ("Object '%s' is not a GladeEditable\n", - object ? G_OBJECT_TYPE_NAME (object) : "(null)"); + g_warning ("Object '%s' is not a GladeEditable\n", + object ? G_OBJECT_TYPE_NAME (object) : "(null)"); else - glade_editor_skeleton_add_editor (GLADE_EDITOR_SKELETON (buildable), - GLADE_EDITABLE (object)); + glade_editor_skeleton_add_editor (GLADE_EDITOR_SKELETON (buildable), + GLADE_EDITABLE (object)); } g_slist_free_full (editor_data->editors, g_free); @@ -252,7 +252,7 @@ glade_editor_skeleton_new (void) void glade_editor_skeleton_add_editor (GladeEditorSkeleton *skeleton, - GladeEditable *editor) + GladeEditable *editor) { GladeEditorSkeletonPrivate *priv; diff --git a/gladeui/glade-editor-skeleton.h b/gladeui/glade-editor-skeleton.h index 7ab1ef7d..dd4dbc8f 100644 --- a/gladeui/glade-editor-skeleton.h +++ b/gladeui/glade-editor-skeleton.h @@ -55,7 +55,7 @@ GType glade_editor_skeleton_get_type (void) G_GNUC_CONST; GtkWidget *glade_editor_skeleton_new (void); void glade_editor_skeleton_add_editor (GladeEditorSkeleton *skeleton, - GladeEditable *editor); + GladeEditable *editor); G_END_DECLS diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c index 0256d884..034a2231 100644 --- a/gladeui/glade-editor-table.c +++ b/gladeui/glade-editor-table.c @@ -28,67 +28,67 @@ #include "glade-editor-table.h" -#define BLOCK_NAME_ENTRY_CB(table) \ - do { if (table->priv->name_entry) \ - g_signal_handlers_block_by_func (G_OBJECT (table->priv->name_entry), \ - G_CALLBACK (widget_name_edited), table); \ - } while (0); +#define BLOCK_NAME_ENTRY_CB(table) \ + do { if (table->priv->name_entry) \ + g_signal_handlers_block_by_func (G_OBJECT (table->priv->name_entry), \ + G_CALLBACK (widget_name_edited), table); \ + } while (0); -#define UNBLOCK_NAME_ENTRY_CB(table) \ - do { if (table->priv->name_entry) \ - g_signal_handlers_unblock_by_func (G_OBJECT (table->priv->name_entry), \ - G_CALLBACK (widget_name_edited), table); \ - } while (0); +#define UNBLOCK_NAME_ENTRY_CB(table) \ + do { if (table->priv->name_entry) \ + g_signal_handlers_unblock_by_func (G_OBJECT (table->priv->name_entry), \ + G_CALLBACK (widget_name_edited), table); \ + } while (0); -static void glade_editor_table_init (GladeEditorTable * self); -static void glade_editor_table_class_init (GladeEditorTableClass * klass); +static void glade_editor_table_init (GladeEditorTable *self); +static void glade_editor_table_class_init (GladeEditorTableClass *klass); -static void glade_editor_table_dispose (GObject *object); -static void glade_editor_table_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); +static void glade_editor_table_dispose (GObject *object); +static void glade_editor_table_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); -static void glade_editor_table_editable_init (GladeEditableIface * iface); -static void glade_editor_table_realize (GtkWidget * widget); -static void glade_editor_table_grab_focus (GtkWidget * widget); +static void glade_editor_table_editable_init (GladeEditableIface *iface); +static void glade_editor_table_realize (GtkWidget *widget); +static void glade_editor_table_grab_focus (GtkWidget *widget); static void append_name_field (GladeEditorTable *table); static void append_items (GladeEditorTable *table, - GladeWidgetAdaptor *adaptor, - GladeEditorPageType type); + GladeWidgetAdaptor *adaptor, + GladeEditorPageType type); struct _GladeEditorTablePrivate { GladeWidgetAdaptor *adaptor; /* The GladeWidgetAdaptor this - * table was created for. - */ + * table was created for. + */ GladeWidget *loaded_widget; /* A pointer to the currently loaded GladeWidget - */ - + */ + GtkWidget *name_label; /* A pointer to the "Name:" label (for show/hide) */ GtkWidget *name_entry; /* A pointer to the gtk_entry that holds - * the name of the widget. This is the - * first item _pack'ed to the table_widget. - * We have a pointer here because it is an - * entry which will not be created from a - * GladeProperty but rather from code. - */ + * the name of the widget. This is the + * first item _pack'ed to the table_widget. + * We have a pointer here because it is an + * entry which will not be created from a + * GladeProperty but rather from code. + */ GtkWidget *composite_check; /* A pointer to the composite check button */ GtkWidget *name_field; /* A box containing the name entry and composite check */ GList *properties; /* A list of GladeEditorPropery items. - * For each row in the gtk_table, there is a - * corrsponding GladeEditorProperty struct. - */ + * For each row in the gtk_table, there is a + * corrsponding GladeEditorProperty struct. + */ GladeEditorPageType type; /* Is this table to be used in the common tab, ? - * the general tab, a packing tab or the query popup ? - */ + * the general tab, a packing tab or the query popup ? + */ gint rows; @@ -120,9 +120,9 @@ glade_editor_table_class_init (GladeEditorTableClass *klass) g_object_class_install_property (object_class, PROP_PAGE_TYPE, g_param_spec_enum ("page-type", _("Page Type"), - _("The editor page type to create this GladeEditorTable for"), - GLADE_TYPE_EDITOR_PAGE_TYPE, GLADE_PAGE_GENERAL, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + _("The editor page type to create this GladeEditorTable for"), + GLADE_TYPE_EDITOR_PAGE_TYPE, GLADE_PAGE_GENERAL, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); } static void @@ -157,10 +157,10 @@ glade_editor_table_dispose (GObject *object) } static void -glade_editor_table_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +glade_editor_table_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GladeEditorTable *table = GLADE_EDITOR_TABLE (object); @@ -234,14 +234,14 @@ widget_name_edited (GtkWidget *editable, GladeEditorTable *table) * Otherwise, we need to allocate a new unnamed prefix name for the widget */ if (!glade_widget_has_prop_refs (widget)) - { - gchar *unnamed_name = glade_project_new_widget_name (glade_widget_get_project (widget), NULL, GLADE_UNNAMED_PREFIX); - glade_command_set_name (widget, unnamed_name); - g_free (unnamed_name); - } + { + gchar *unnamed_name = glade_project_new_widget_name (glade_widget_get_project (widget), NULL, GLADE_UNNAMED_PREFIX); + glade_command_set_name (widget, unnamed_name); + g_free (unnamed_name); + } } else if (glade_project_available_widget_name (glade_widget_get_project (widget), - widget, new_name)) + widget, new_name)) glade_command_set_name (widget, new_name); g_free (new_name); @@ -249,7 +249,7 @@ widget_name_edited (GtkWidget *editable, GladeEditorTable *table) static void widget_composite_toggled (GtkToggleButton *composite_check, - GladeEditorTable *table) + GladeEditorTable *table) { GladeProject *project; @@ -265,16 +265,16 @@ widget_composite_toggled (GtkToggleButton *composite_check, if (project) { if (gtk_toggle_button_get_active (composite_check)) - glade_command_set_project_template (project, table->priv->loaded_widget); + glade_command_set_project_template (project, table->priv->loaded_widget); else - glade_command_set_project_template (project, NULL); + glade_command_set_project_template (project, NULL); } } static void widget_name_changed (GladeWidget *widget, GParamSpec *pspec, - GladeEditorTable *table) + GladeEditorTable *table) { if (!gtk_widget_get_mapped (GTK_WIDGET (table))) return; @@ -284,9 +284,9 @@ widget_name_changed (GladeWidget *widget, BLOCK_NAME_ENTRY_CB (table); if (glade_widget_has_name (table->priv->loaded_widget)) - gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), glade_widget_get_name (table->priv->loaded_widget)); + gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), glade_widget_get_name (table->priv->loaded_widget)); else - gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), ""); + gtk_entry_set_text (GTK_ENTRY (table->priv->name_entry), ""); UNBLOCK_NAME_ENTRY_CB (table); } @@ -294,25 +294,25 @@ widget_name_changed (GladeWidget *widget, static void widget_composite_changed (GladeWidget *widget, - GParamSpec *pspec, - GladeEditorTable *table) + GParamSpec *pspec, + GladeEditorTable *table) { if (!gtk_widget_get_mapped (GTK_WIDGET (table))) return; if (table->priv->name_label) gtk_label_set_text (GTK_LABEL (table->priv->name_label), - glade_widget_get_is_composite (table->priv->loaded_widget) ? - _("Class Name:") : _("ID:")); + glade_widget_get_is_composite (table->priv->loaded_widget) ? + _("Class Name:") : _("ID:")); if (table->priv->composite_check) { g_signal_handlers_block_by_func (G_OBJECT (table->priv->composite_check), - G_CALLBACK (widget_composite_toggled), table); + G_CALLBACK (widget_composite_toggled), table); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (table->priv->composite_check), - glade_widget_get_is_composite (table->priv->loaded_widget)); + glade_widget_get_is_composite (table->priv->loaded_widget)); g_signal_handlers_unblock_by_func (G_OBJECT (table->priv->composite_check), - G_CALLBACK (widget_composite_toggled), table); + G_CALLBACK (widget_composite_toggled), table); } } @@ -427,10 +427,10 @@ glade_editor_table_set_show_name (GladeEditable *editable, gboolean show_name) table->priv->show_name = show_name; if (table->priv->name_label) - { - gtk_widget_set_visible (table->priv->name_label, show_name); - gtk_widget_set_visible (table->priv->name_field, show_name); - } + { + gtk_widget_set_visible (table->priv->name_label, show_name); + gtk_widget_set_visible (table->priv->name_field, show_name); + } } } @@ -511,9 +511,9 @@ get_sorted_properties (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) * out properties from the GladeEditorTable using the "custom-layout" attribute. */ if (GLADE_PROPERTY_CLASS_IS_TYPE (klass, type) && - (type == GLADE_PAGE_QUERY || - (!glade_property_class_custom_layout (klass) && - glade_property_class_is_visible (klass)))) + (type == GLADE_PAGE_QUERY || + (!glade_property_class_custom_layout (klass) && + glade_property_class_is_visible (klass)))) { list = g_list_prepend (list, klass); } @@ -535,7 +535,7 @@ append_item (GladeEditorTable *table, { g_critical ("Unable to create editor for property '%s' of class '%s'", glade_property_class_id (klass), - glade_widget_adaptor_get_name (glade_property_class_get_adaptor (klass))); + glade_widget_adaptor_get_name (glade_property_class_get_adaptor (klass))); return NULL; } diff --git a/gladeui/glade-editor-table.h b/gladeui/glade-editor-table.h index 6fdcbdf8..45703c93 100644 --- a/gladeui/glade-editor-table.h +++ b/gladeui/glade-editor-table.h @@ -27,10 +27,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_EDITOR_TABLE (glade_editor_table_get_type ()) -#define GLADE_EDITOR_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EDITOR_TABLE, GladeEditorTable)) -#define GLADE_EDITOR_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_EDITOR_TABLE, GladeEditorTableClass)) -#define GLADE_IS_EDITOR_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EDITOR_TABLE)) +#define GLADE_TYPE_EDITOR_TABLE (glade_editor_table_get_type ()) +#define GLADE_EDITOR_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EDITOR_TABLE, GladeEditorTable)) +#define GLADE_EDITOR_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_EDITOR_TABLE, GladeEditorTableClass)) +#define GLADE_IS_EDITOR_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EDITOR_TABLE)) #define GLADE_IS_EDITOR_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_EDITOR_TABLE)) #define GLADE_EDITOR_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_EDITOR_TABLE, GladeEditorEditorClass)) @@ -57,7 +57,7 @@ struct _GladeEditorTableClass GType glade_editor_table_get_type (void); GtkWidget *glade_editor_table_new (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type); + GladeEditorPageType type); G_END_DECLS diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c index e081cb8c..8906af5e 100644 --- a/gladeui/glade-editor.c +++ b/gladeui/glade-editor.c @@ -53,9 +53,9 @@ #include "glade-editor-property.h" static void glade_editor_switch_page (GtkNotebook *notebook, - GtkWidget *page, - guint page_num, - GladeEditor *editor); + GtkWidget *page, + guint page_num, + GladeEditor *editor); enum { @@ -76,24 +76,24 @@ struct _GladeEditorPrivate GtkWidget *notebook; /* The notebook widget */ GladeWidget *loaded_widget; /* A handy pointer to the GladeWidget - * that is loaded in the editor. NULL - * if no widgets are selected - */ + * that is loaded in the editor. NULL + * if no widgets are selected + */ GladeWidgetAdaptor *loaded_adaptor; /* A pointer to the loaded - * GladeWidgetAdaptor. Note that we can - * have a class loaded without a - * loaded_widget. For this reason we - * can't use loaded_widget->adaptor. - * When a widget is selected we load - * this class in the editor first and - * then fill the values of the inputs - * with the GladeProperty items. - * This is usefull for not having - * to redraw/container_add the widgets - * when we switch from widgets of the - * same class - */ + * GladeWidgetAdaptor. Note that we can + * have a class loaded without a + * loaded_widget. For this reason we + * can't use loaded_widget->adaptor. + * When a widget is selected we load + * this class in the editor first and + * then fill the values of the inputs + * with the GladeProperty items. + * This is usefull for not having + * to redraw/container_add the widgets + * when we switch from widgets of the + * same class + */ GtkWidget *page_widget; GtkWidget *page_packing; @@ -101,24 +101,24 @@ struct _GladeEditorPrivate GtkWidget *page_atk; GladeSignalEditor *signal_editor; /* The signal editor packed into vbox_signals - */ + */ GList *editables; /* A list of GladeEditables. We have a widget - * for each GladeWidgetAdaptor and we only load - * them on demand - */ - + * for each GladeWidgetAdaptor and we only load + * them on demand + */ + GtkWidget *packing_page; /* Packing pages are dynamicly created each - * selection, this pointer is only to free - * the last packing page. - */ + * selection, this pointer is only to free + * the last packing page. + */ gboolean loading; /* Use when loading a GladeWidget into the editor - * we set this flag so that we can ignore the - * "changed" signal of the name entry text since - * the name has not really changed, just a new name - * was loaded. - */ + * we set this flag so that we can ignore the + * "changed" signal of the name entry text since + * the name has not really changed, just a new name + * was loaded. + */ gulong project_closed_signal_id; /* Unload widget when widget's project closes */ gulong project_removed_signal_id; /* Unload widget when its removed from the project. */ @@ -128,9 +128,9 @@ struct _GladeEditorPrivate GtkWidget *class_field; /* The class header */ GtkWidget *warning; /* A pointer to an icon we can show in the class - * field to publish tooltips for class related - * versioning errors. - */ + * field to publish tooltips for class related + * versioning errors. + */ GtkWidget *class_icon; /* An image with the current widget's class icon. */ GtkWidget *class_label; /* A label with the current class label. */ @@ -325,7 +325,7 @@ glade_editor_update_class_field (GladeEditor *editor) text = g_strdup_printf (_("%s Properties - %s [%s]"), glade_widget_adaptor_get_title (priv->loaded_adaptor), glade_widget_adaptor_get_display_name (priv->loaded_adaptor), - glade_widget_get_display_name (widget)); + glade_widget_get_display_name (widget)); } else { @@ -335,8 +335,8 @@ glade_editor_update_class_field (GladeEditor *editor) text = g_strdup_printf (_("%s Properties - %s"), glade_widget_adaptor_get_title (priv->loaded_adaptor), glade_widget_adaptor_get_display_name (priv->loaded_adaptor)); - } - + } + gtk_label_set_text (GTK_LABEL (priv->class_label), text); g_free (text); @@ -361,10 +361,10 @@ glade_editor_update_widget_name_cb (GladeWidget *widget, } static void -glade_editor_switch_page (GtkNotebook *notebook, - GtkWidget *page, - guint page_num, - GladeEditor *editor) +glade_editor_switch_page (GtkNotebook *notebook, + GtkWidget *page, + guint page_num, + GladeEditor *editor) { GladeEditorPrivate *priv = GLADE_EDITOR_PRIVATE (editor); @@ -458,14 +458,14 @@ hide_or_remove_visible_child (GtkContainer *container, gboolean remove) widget = l->data; if (gtk_widget_get_visible (widget)) - { - gtk_widget_hide (widget); + { + gtk_widget_hide (widget); - if (remove) - gtk_container_remove (container, widget); + if (remove) + gtk_container_remove (container, widget); - break; - } + break; + } } g_list_free (children); } @@ -518,7 +518,7 @@ glade_editor_load_editable_in_page (GladeEditor *editor, if ((scrolled_window = gtk_widget_get_ancestor (GTK_WIDGET (container), - GTK_TYPE_SCROLLED_WINDOW)) != NULL) + GTK_TYPE_SCROLLED_WINDOW)) != NULL) { adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)); gtk_container_set_focus_vadjustment (GTK_CONTAINER (editable), adj); @@ -582,18 +582,18 @@ glade_editor_load_editable (GladeEditor *editor, GladeWidgetAdaptor *adaptor; if (!parent) - return; + return; adaptor = glade_widget_get_adaptor (parent); editable = - glade_editor_load_editable_in_page (editor, adaptor, - GLADE_PAGE_PACKING); + glade_editor_load_editable_in_page (editor, adaptor, + GLADE_PAGE_PACKING); } else editable = glade_editor_get_editable_by_adaptor (editor, - glade_widget_get_adaptor (widget), - type); + glade_widget_get_adaptor (widget), + type); g_assert (editable); @@ -751,8 +751,8 @@ query_dialog_style_set_cb (GtkWidget *dialog, static gboolean query_dialog_delete_event_cb (GtkDialog *dialog, - GdkEvent *event, - gpointer user_data) + GdkEvent *event, + gpointer user_data) { gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL); return TRUE; @@ -1003,7 +1003,7 @@ glade_editor_reset_selection_changed_cb (GtkTreeSelection *selection, gtk_tree_model_get (model, &iter, COLUMN_PROPERTY, &property, -1); if (property) - pclass = glade_property_get_class (property); + pclass = glade_property_get_class (property); gtk_text_buffer_set_text (text_buffer, pclass ? glade_property_class_get_tooltip (pclass) : message, @@ -1287,8 +1287,8 @@ glade_editor_hide_class_field (GladeEditor *editor) static void editor_widget_name_changed (GladeWidget *widget, - GParamSpec *pspec, - GtkWindow *window) + GParamSpec *pspec, + GtkWindow *window) { gchar *title, *prj_name; @@ -1324,7 +1324,7 @@ glade_editor_dialog_for_widget (GladeWidget *widget) /* Keep the title up to date */ editor_widget_name_changed (widget, NULL, GTK_WINDOW (window)); g_signal_connect_object (G_OBJECT (widget), "notify::name", - G_CALLBACK (editor_widget_name_changed), window, 0); + G_CALLBACK (editor_widget_name_changed), window, 0); if (glade_app_get_accel_group ()) { diff --git a/gladeui/glade-editor.h b/gladeui/glade-editor.h index 1a39b3d2..eb1a6b74 100644 --- a/gladeui/glade-editor.h +++ b/gladeui/glade-editor.h @@ -25,7 +25,7 @@ typedef struct _GladeEditorPrivate GladeEditorPrivate; struct _GladeEditor { GtkBox vbox; /* The editor is a vbox */ - + GladeEditorPrivate *priv; }; @@ -44,7 +44,7 @@ GType glade_editor_get_type (void); GladeEditor *glade_editor_new (void); void glade_editor_load_widget (GladeEditor *editor, - GladeWidget *widget); + GladeWidget *widget); G_DEPRECATED void glade_editor_show_info (GladeEditor *editor); G_DEPRECATED diff --git a/gladeui/glade-id-allocator.c b/gladeui/glade-id-allocator.c index b2df4d96..44e363b1 100644 --- a/gladeui/glade-id-allocator.c +++ b/gladeui/glade-id-allocator.c @@ -165,7 +165,7 @@ glade_id_allocator_release (GladeIDAllocator *allocator, guint id) * that loaded unallocated ids are out of range */ if (word_idx < allocator->n_words) - allocator->data[word_idx] |= 1 << (id & 31); + allocator->data[word_idx] |= 1 << (id & 31); } } diff --git a/gladeui/glade-id-allocator.h b/gladeui/glade-id-allocator.h index 3326f5db..cab39132 100644 --- a/gladeui/glade-id-allocator.h +++ b/gladeui/glade-id-allocator.h @@ -35,10 +35,10 @@ GladeIDAllocator *glade_id_allocator_new (void); void glade_id_allocator_destroy (GladeIDAllocator *allocator); -guint glade_id_allocator_allocate (GladeIDAllocator *allocator); +guint glade_id_allocator_allocate (GladeIDAllocator *allocator); void glade_id_allocator_release (GladeIDAllocator *allocator, - guint id); + guint id); G_END_DECLS diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c index 134f8958..f640c19e 100644 --- a/gladeui/glade-inspector.c +++ b/gladeui/glade-inspector.c @@ -54,19 +54,19 @@ #endif #define GLADE_INSPECTOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ - GLADE_TYPE_INSPECTOR, \ - GladeInspectorPrivate)) + GLADE_TYPE_INSPECTOR, \ + GladeInspectorPrivate)) static void search_entry_text_inserted_cb (GtkEntry *entry, - const gchar *text, - gint length, - gint *position, - GladeInspector *inspector); + const gchar *text, + gint length, + gint *position, + GladeInspector *inspector); static void search_entry_text_deleted_cb (GtkEditable *editable, - gint start_pos, - gint end_pos, - GladeInspector *inspector); + gint start_pos, + gint end_pos, + GladeInspector *inspector); enum { @@ -117,8 +117,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (GladeInspector, glade_inspector, GTK_TYPE_BOX) static void glade_inspector_set_property (GObject *object, - guint property_id, - const GValue *value, + guint property_id, + const GValue *value, GParamSpec *pspec) { GladeInspector *inspector = GLADE_INSPECTOR (object); @@ -270,7 +270,7 @@ typedef struct { static void reduce_string (gchar *str1, - const gchar *str2) + const gchar *str2) { gint str1len = strlen (str1); gint i; @@ -279,10 +279,10 @@ reduce_string (gchar *str1, { if (str1[i] != str2[i] || i >= str1len) - { - str1[i] = '\0'; - break; - } + { + str1[i] = '\0'; + break; + } } if (str2[i] == '\0') @@ -291,9 +291,9 @@ reduce_string (gchar *str1, static gboolean search_common_matches (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - CommonMatchData *data) + GtkTreePath *path, + GtkTreeIter *iter, + CommonMatchData *data) { GladeWidget *gwidget; const gchar *name; @@ -315,12 +315,12 @@ search_common_matches (GtkTreeModel *model, if (match) { if (!data->first_match) - data->first_match = g_strdup (name); + data->first_match = g_strdup (name); if (data->common_text) reduce_string (data->common_text, name); else - data->common_text = g_strdup (name); + data->common_text = g_strdup (name); } g_object_unref (obj); @@ -335,8 +335,8 @@ search_common_matches (GtkTreeModel *model, */ static gchar * get_partial_match (GladeInspector *inspector, - const gchar *search, - gchar **first_match) + const gchar *search, + gchar **first_match) { GtkTreeModel *model = GTK_TREE_MODEL (inspector->priv->project); CommonMatchData data; @@ -420,9 +420,9 @@ search_entry_text_inserted_cb (GtkEntry *entry, static void search_entry_text_deleted_cb (GtkEditable *editable, - gint start_pos, - gint end_pos, - GladeInspector *inspector) + gint start_pos, + gint end_pos, + GladeInspector *inspector) { GladeInspectorPrivate *priv = inspector->priv; @@ -457,7 +457,7 @@ search_entry_key_press_event_cb (GtkEntry *entry, gtk_editable_set_position (GTK_EDITABLE (entry), -1); gtk_editable_select_region (GTK_EDITABLE (entry), -1, -1); - glade_inspector_refilter (inspector); + glade_inspector_refilter (inspector); } return TRUE; } @@ -469,27 +469,27 @@ search_entry_key_press_event_cb (GtkEntry *entry, if (str && (name = get_partial_match (inspector, str, &full_match))) { - GladeWidget *widget; + GladeWidget *widget; inspector_set_completion_text (inspector, full_match); - g_free (name); + g_free (name); - g_signal_handlers_block_by_func (priv->entry, search_entry_text_inserted_cb, inspector); - g_signal_handlers_block_by_func (priv->entry, search_entry_text_deleted_cb, inspector); + g_signal_handlers_block_by_func (priv->entry, search_entry_text_inserted_cb, inspector); + g_signal_handlers_block_by_func (priv->entry, search_entry_text_deleted_cb, inspector); gtk_entry_set_text (GTK_ENTRY (entry), priv->completion_text); - g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_inserted_cb, inspector); - g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_deleted_cb, inspector); + g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_inserted_cb, inspector); + g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_deleted_cb, inspector); gtk_editable_set_position (GTK_EDITABLE (entry), -1); gtk_editable_select_region (GTK_EDITABLE (entry), -1, -1); - glade_inspector_refilter (inspector); + glade_inspector_refilter (inspector); - widget = glade_project_get_widget_by_name (priv->project, priv->completion_text); - if (widget) - glade_project_selection_set (priv->project, glade_widget_get_object (widget), TRUE); + widget = glade_project_get_widget_by_name (priv->project, priv->completion_text); + if (widget) + glade_project_selection_set (priv->project, glade_widget_get_object (widget), TRUE); } return TRUE; } @@ -498,31 +498,31 @@ search_entry_key_press_event_cb (GtkEntry *entry, if (event->keyval == GDK_KEY_BackSpace) { if (!priv->search_disabled && !priv->idle_complete && str && str[0]) - { - /* Now, set the text to the current completion text -1 char, and recomplete */ - if (priv->completion_text && priv->completion_text[0]) - { - /* If we're not at the position of the length of the completion text, just carry on */ - if (!gtk_editable_get_selection_bounds (GTK_EDITABLE (priv->entry), NULL, NULL)) - return FALSE; + { + /* Now, set the text to the current completion text -1 char, and recomplete */ + if (priv->completion_text && priv->completion_text[0]) + { + /* If we're not at the position of the length of the completion text, just carry on */ + if (!gtk_editable_get_selection_bounds (GTK_EDITABLE (priv->entry), NULL, NULL)) + return FALSE; - priv->completion_text[strlen (priv->completion_text) -1] = '\0'; + priv->completion_text[strlen (priv->completion_text) -1] = '\0'; - g_signal_handlers_block_by_func (priv->entry, search_entry_text_inserted_cb, inspector); - g_signal_handlers_block_by_func (priv->entry, search_entry_text_deleted_cb, inspector); + g_signal_handlers_block_by_func (priv->entry, search_entry_text_inserted_cb, inspector); + g_signal_handlers_block_by_func (priv->entry, search_entry_text_deleted_cb, inspector); - gtk_entry_set_text (GTK_ENTRY (priv->entry), priv->completion_text); - gtk_editable_set_position (GTK_EDITABLE (priv->entry), -1); + gtk_entry_set_text (GTK_ENTRY (priv->entry), priv->completion_text); + gtk_editable_set_position (GTK_EDITABLE (priv->entry), -1); - g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_inserted_cb, inspector); - g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_deleted_cb, inspector); + g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_inserted_cb, inspector); + g_signal_handlers_unblock_by_func (priv->entry, search_entry_text_deleted_cb, inspector); - priv->idle_complete = - g_idle_add ((GSourceFunc) search_complete_idle, inspector); + priv->idle_complete = + g_idle_add ((GSourceFunc) search_complete_idle, inspector); - return TRUE; - } - } + return TRUE; + } + } } return FALSE; @@ -569,7 +569,7 @@ glade_inspector_init (GladeInspector *inspector) inspector->priv = priv = glade_inspector_get_instance_private (inspector); gtk_orientable_set_orientation (GTK_ORIENTABLE (inspector), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); priv->project = NULL; @@ -842,16 +842,16 @@ button_press_cb (GtkWidget *widget, static void glade_inspector_warning_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { gchar *warning = NULL; gtk_tree_model_get (model, iter, - GLADE_PROJECT_MODEL_COLUMN_WARNING, &warning, - -1); + GLADE_PROJECT_MODEL_COLUMN_WARNING, &warning, + -1); g_object_set (renderer, "visible", warning != NULL, NULL); @@ -860,24 +860,24 @@ glade_inspector_warning_cell_data_func (GtkTreeViewColumn *column, static void glade_inspector_name_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { GladeWidget *gwidget; GObject *obj; gtk_tree_model_get (model, iter, - GLADE_PROJECT_MODEL_COLUMN_OBJECT, &obj, - -1); + GLADE_PROJECT_MODEL_COLUMN_OBJECT, &obj, + -1); gwidget = glade_widget_get_from_gobject (obj); g_object_set (renderer, "text", - (glade_widget_has_name (gwidget)) ? - glade_widget_get_display_name (gwidget) : NULL, - NULL); + (glade_widget_has_name (gwidget)) ? + glade_widget_get_display_name (gwidget) : NULL, + NULL); g_object_unref (obj); } @@ -885,17 +885,17 @@ glade_inspector_name_cell_data_func (GtkTreeViewColumn *column, static void glade_inspector_detail_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { gchar *type_name = NULL, *detail = NULL; gtk_tree_model_get (model, iter, - GLADE_PROJECT_MODEL_COLUMN_TYPE_NAME, &type_name, - GLADE_PROJECT_MODEL_COLUMN_MISC, &detail, - -1); + GLADE_PROJECT_MODEL_COLUMN_TYPE_NAME, &type_name, + GLADE_PROJECT_MODEL_COLUMN_MISC, &detail, + -1); if (detail) { @@ -939,19 +939,19 @@ add_columns (GtkTreeView *view) /* Warning cell */ renderer = gtk_cell_renderer_pixbuf_new (); g_object_set (renderer, - "stock-id", "gtk-dialog-warning", - "xpad", 2, - NULL); + "stock-id", "gtk-dialog-warning", + "xpad", 2, + NULL); gtk_cell_area_box_pack_start (box, renderer, FALSE, FALSE, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer, - glade_inspector_warning_cell_data_func, - NULL, NULL); + glade_inspector_warning_cell_data_func, + NULL, NULL); /* Class Icon */ renderer = gtk_cell_renderer_pixbuf_new (); g_object_set (renderer, - "xpad", 2, - NULL); + "xpad", 2, + NULL); gtk_cell_area_box_pack_start (box, renderer, FALSE, FALSE, FALSE); gtk_tree_view_column_set_attributes (column, renderer, @@ -967,8 +967,8 @@ add_columns (GtkTreeView *view) "text", GLADE_PROJECT_MODEL_COLUMN_NAME, NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, - glade_inspector_name_cell_data_func, - NULL, NULL); + glade_inspector_name_cell_data_func, + NULL, NULL); /* Padding */ renderer = gtk_cell_renderer_text_new (); @@ -979,14 +979,14 @@ add_columns (GtkTreeView *view) renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "style", PANGO_STYLE_ITALIC, - "foreground", "Gray", - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); + "foreground", "Gray", + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); gtk_cell_area_box_pack_start (box, renderer, FALSE, FALSE, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer, - glade_inspector_detail_cell_data_func, - NULL, NULL); + glade_inspector_detail_cell_data_func, + NULL, NULL); gtk_tree_view_append_column (view, column); gtk_tree_view_set_headers_visible (view, FALSE); diff --git a/gladeui/glade-inspector.h b/gladeui/glade-inspector.h index a438c23c..b665aa1a 100644 --- a/gladeui/glade-inspector.h +++ b/gladeui/glade-inspector.h @@ -76,7 +76,7 @@ GType glade_inspector_get_type (void) G_GNUC_CONST; GtkWidget *glade_inspector_new (void); GtkWidget *glade_inspector_new_with_project (GladeProject *project); void glade_inspector_set_project (GladeInspector *inspector, - GladeProject *project); + GladeProject *project); GladeProject *glade_inspector_get_project (GladeInspector *inspector); GList *glade_inspector_get_selected_items (GladeInspector *inspector); diff --git a/gladeui/glade-name-context.c b/gladeui/glade-name-context.c index c9361b68..06cb5e79 100644 --- a/gladeui/glade-name-context.c +++ b/gladeui/glade-name-context.c @@ -182,7 +182,7 @@ glade_name_context_release_name (GladeNameContext *context, const gchar *name) { id = (int) strtol (first_number, &end_number, 10); if (*end_number == 0) - glade_id_allocator_release (id_allocator, id); + glade_id_allocator_release (id_allocator, id); } g_free (base_name); diff --git a/gladeui/glade-name-context.h b/gladeui/glade-name-context.h index 29480459..ddc360f6 100644 --- a/gladeui/glade-name-context.h +++ b/gladeui/glade-name-context.h @@ -11,18 +11,18 @@ GladeNameContext *glade_name_context_new (void); void glade_name_context_destroy (GladeNameContext *context); gchar *glade_name_context_new_name (GladeNameContext *context, - const gchar *base_name); + const gchar *base_name); guint glade_name_context_n_names (GladeNameContext *context); gboolean glade_name_context_has_name (GladeNameContext *context, - const gchar *name); + const gchar *name); gboolean glade_name_context_add_name (GladeNameContext *context, - const gchar *name); + const gchar *name); void glade_name_context_release_name (GladeNameContext *context, - const gchar *name); + const gchar *name); G_END_DECLS diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c index 5cfc279c..f95e9326 100644 --- a/gladeui/glade-named-icon-chooser-dialog.c +++ b/gladeui/glade-named-icon-chooser-dialog.c @@ -835,12 +835,12 @@ centre_selected_row (GladeNamedIconChooserDialog *dialog) (GtkTreePath *) l->data, NULL, TRUE, 0.5, 0.0); -/* gtk_tree_view_set_cursor (GTK_TREE_VIEW (dialog->priv->icons_view), - (GtkTreePath *) l->data, - 0, - FALSE); - - gtk_widget_grab_focus (dialog->priv->icons_view); +/* gtk_tree_view_set_cursor (GTK_TREE_VIEW (dialog->priv->icons_view), + (GtkTreePath *) l->data, + 0, + FALSE); + + gtk_widget_grab_focus (dialog->priv->icons_view); */ g_list_foreach (l, (GFunc) gtk_tree_path_free, NULL); g_list_free (l); @@ -1524,15 +1524,15 @@ glade_named_icon_chooser_dialog_class_init (GladeNamedIconChooserDialogClass *kl window_class->set_focus = glade_named_icon_chooser_dialog_set_focus; - /** - * GladeNamedIconChooserDialog::icon-activated - * @chooser: the object which received the signal - * - * This signal is emitted when the user "activates" an icon - * in the named icon chooser. This can happen by double-clicking on an item - * in the recently used resources list, or by pressing - * <keycap>Enter</keycap>. - */ + /** + * GladeNamedIconChooserDialog::icon-activated + * @chooser: the object which received the signal + * + * This signal is emitted when the user "activates" an icon + * in the named icon chooser. This can happen by double-clicking on an item + * in the recently used resources list, or by pressing + * <keycap>Enter</keycap>. + */ dialog_signals[ICON_ACTIVATED] = g_signal_new ("icon-activated", G_TYPE_FROM_CLASS (object_class), @@ -1541,15 +1541,15 @@ glade_named_icon_chooser_dialog_class_init (GladeNamedIconChooserDialogClass *kl icon_activated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - /** - * GladeNamedIconChooserDialog::selection-changed - * @chooser: the object which received the signal - * - * This signal is emitted when there is a change in the set of - * selected icon names. This can happen when a user - * modifies the selection with the mouse or the keyboard, or when - * explicitely calling functions to change the selection. - */ + /** + * GladeNamedIconChooserDialog::selection-changed + * @chooser: the object which received the signal + * + * This signal is emitted when there is a change in the set of + * selected icon names. This can happen when a user + * modifies the selection with the mouse or the keyboard, or when + * explicitely calling functions to change the selection. + */ dialog_signals[SELECTION_CHANGED] = g_signal_new ("selection-changed", G_TYPE_FROM_CLASS (object_class), diff --git a/gladeui/glade-named-icon-chooser-dialog.h b/gladeui/glade-named-icon-chooser-dialog.h index 97c97369..295e5d07 100644 --- a/gladeui/glade-named-icon-chooser-dialog.h +++ b/gladeui/glade-named-icon-chooser-dialog.h @@ -27,10 +27,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG (glade_named_icon_chooser_dialog_get_type ()) -#define GLADE_NAMED_ICON_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, GladeNamedIconChooserDialog)) -#define GLADE_IS_NAMED_ICON_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG)) -#define GLADE_NAMED_ICON_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, GladeNamedIconChooserDialogClass)) +#define GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG (glade_named_icon_chooser_dialog_get_type ()) +#define GLADE_NAMED_ICON_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, GladeNamedIconChooserDialog)) +#define GLADE_IS_NAMED_ICON_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG)) +#define GLADE_NAMED_ICON_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, GladeNamedIconChooserDialogClass)) #define GLADE_IS_NAMED_ICON_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG)) #define GLADE_NAMED_ICON_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_NAMED_ICON_CHOOSER_DIALOG, GladeNamedIconChooserDialogClass)) @@ -48,9 +48,9 @@ struct _GladeNamedIconChooserDialog struct _GladeNamedIconChooserDialogClass { GtkDialogClass parent_class; - + void (* icon_activated) (GladeNamedIconChooserDialog *dialog); - + void (* selection_changed) (GladeNamedIconChooserDialog *dialog); void (* glade_reserved1) (void); @@ -62,17 +62,17 @@ struct _GladeNamedIconChooserDialogClass GType glade_named_icon_chooser_dialog_get_type (void) G_GNUC_CONST; GtkWidget *glade_named_icon_chooser_dialog_new (const gchar *title, - GtkWindow *parent, - const gchar *first_button_text, - ...) G_GNUC_NULL_TERMINATED; + GtkWindow *parent, + const gchar *first_button_text, + ...) G_GNUC_NULL_TERMINATED; gchar *glade_named_icon_chooser_dialog_get_icon_name (GladeNamedIconChooserDialog *chooser); void glade_named_icon_chooser_dialog_set_icon_name (GladeNamedIconChooserDialog *chooser, - const gchar *icon_name); + const gchar *icon_name); gboolean glade_named_icon_chooser_dialog_set_context (GladeNamedIconChooserDialog *chooser, - const gchar *context); + const gchar *context); gchar *glade_named_icon_chooser_dialog_get_context (GladeNamedIconChooserDialog *chooser); diff --git a/gladeui/glade-palette.c b/gladeui/glade-palette.c index 1530d4d9..db41b2f3 100644 --- a/gladeui/glade-palette.c +++ b/gladeui/glade-palette.c @@ -92,7 +92,7 @@ static guint glade_palette_signals[LAST_SIGNAL] = { 0 }; static void glade_palette_append_item_group (GladePalette *palette, GladeWidgetGroup *group); static void palette_item_toggled_cb (GtkToggleToolButton *button, - GladePalette *palette); + GladePalette *palette); G_DEFINE_TYPE_WITH_PRIVATE (GladePalette, glade_palette, GTK_TYPE_BOX) @@ -102,7 +102,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GladePalette, glade_palette, GTK_TYPE_BOX) *******************************************************/ static void palette_item_refresh_cb (GladePalette *palette, - GtkWidget *item) + GtkWidget *item) { GladeProject *project; GladeSupportMask support; @@ -114,14 +114,14 @@ palette_item_refresh_cb (GladePalette *palette, if ((project = palette->priv->project) && (warning = glade_project_verify_widget_adaptor (project, adaptor, - &support)) != NULL) + &support)) != NULL) { /* set sensitivity */ gtk_widget_set_sensitive (GTK_WIDGET (item), !(support & GLADE_SUPPORT_MISMATCH)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), - glade_widget_adaptor_get_icon_name (adaptor)); + glade_widget_adaptor_get_icon_name (adaptor)); /* prepend widget title */ text = g_strdup_printf ("%s: %s", glade_widget_adaptor_get_title (adaptor), warning); @@ -132,7 +132,7 @@ palette_item_refresh_cb (GladePalette *palette, else { gtk_widget_set_tooltip_text (GTK_WIDGET (item), - glade_widget_adaptor_get_title (adaptor)); + glade_widget_adaptor_get_title (adaptor)); gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), glade_widget_adaptor_get_icon_name (adaptor)); @@ -149,8 +149,8 @@ glade_palette_refresh (GladePalette *palette) static void project_add_item_changed_cb (GladeProject *project, - GParamSpec *pspec, - GladePalette *palette) + GParamSpec *pspec, + GladePalette *palette) { GtkToggleToolButton *selection = NULL; GladePalettePrivate *priv = palette->priv; @@ -158,7 +158,7 @@ project_add_item_changed_cb (GladeProject *project, if (priv->local_selection) { selection = g_hash_table_lookup (priv->button_table, - glade_widget_adaptor_get_name (priv->local_selection)); + glade_widget_adaptor_get_name (priv->local_selection)); g_signal_handlers_block_by_func (selection, palette_item_toggled_cb, palette); gtk_toggle_tool_button_set_active (selection, FALSE); @@ -172,7 +172,7 @@ project_add_item_changed_cb (GladeProject *project, if (priv->local_selection) { selection = g_hash_table_lookup (priv->button_table, - glade_widget_adaptor_get_name (priv->local_selection)); + glade_widget_adaptor_get_name (priv->local_selection)); g_signal_handlers_block_by_func (selection, palette_item_toggled_cb, palette); gtk_toggle_tool_button_set_active (selection, TRUE); @@ -187,7 +187,7 @@ project_add_item_changed_cb (GladeProject *project, *******************************************************/ static void selector_button_toggled_cb (GtkToggleButton *button, - GladePalette *palette) + GladePalette *palette) { GladePalettePrivate *priv = palette->priv; @@ -222,7 +222,7 @@ palette_item_toggled_cb (GtkToggleToolButton *button, GladePalette *palette) if (priv->local_selection) { selection = g_hash_table_lookup (priv->button_table, - glade_widget_adaptor_get_name (priv->local_selection)); + glade_widget_adaptor_get_name (priv->local_selection)); g_signal_handlers_block_by_func (selection, palette_item_toggled_cb, palette); gtk_toggle_tool_button_set_active (selection, FALSE); @@ -288,8 +288,8 @@ glade_palette_drag_data_get (GtkWidget *widget, static gint palette_item_button_press_cb (GtkWidget *button, - GdkEventButton *event, - GtkToolItem *item) + GdkEventButton *event, + GtkToolItem *item) { GladePalette *palette = g_object_get_data (G_OBJECT (item), "glade-palette"); GladeWidgetAdaptor *adaptor = g_object_get_data (G_OBJECT (item), "glade-widget-adaptor"); @@ -334,7 +334,7 @@ glade_palette_new_item (GladePalette *palette, GladeWidgetAdaptor *adaptor) /* Update palette item when active project state changes */ g_signal_connect (G_OBJECT (palette), "refresh", - G_CALLBACK (palette_item_refresh_cb), item); + G_CALLBACK (palette_item_refresh_cb), item); /* Fire Glade palette popup menus */ g_signal_connect (G_OBJECT (button), "button-press-event", @@ -349,8 +349,8 @@ glade_palette_new_item (GladePalette *palette, GladeWidgetAdaptor *adaptor) gtk_widget_show (item); g_hash_table_insert (palette->priv->button_table, - (gchar *)glade_widget_adaptor_get_name (adaptor), - item); + (gchar *)glade_widget_adaptor_get_name (adaptor), + item); return item; } @@ -484,14 +484,14 @@ glade_palette_set_property (GObject *object, break; case PROP_USE_SMALL_ITEM_ICONS: glade_palette_set_use_small_item_icons (palette, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case PROP_ITEM_APPEARANCE: glade_palette_set_item_appearance (palette, g_value_get_enum (value)); break; case PROP_SHOW_SELECTOR_BUTTON: glade_palette_set_show_selector_button (palette, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -518,7 +518,7 @@ glade_palette_get_property (GObject *object, break; case PROP_SHOW_SELECTOR_BUTTON: g_value_set_boolean (value, - gtk_widget_get_visible (priv->selector_button)); + gtk_widget_get_visible (priv->selector_button)); break; case PROP_ITEM_APPEARANCE: g_value_set_enum (value, priv->item_appearance); @@ -618,7 +618,7 @@ glade_palette_init (GladePalette *palette) GtkWidget *sw; gtk_orientable_set_orientation (GTK_ORIENTABLE (palette), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); priv = palette->priv = glade_palette_get_instance_private (palette); @@ -703,34 +703,34 @@ glade_palette_set_project (GladePalette *palette, GladeProject *project) if (palette->priv->project != project) { if (palette->priv->project) - { - g_signal_handlers_disconnect_by_func (G_OBJECT (palette->priv->project), - G_CALLBACK (glade_palette_refresh), - palette); + { + g_signal_handlers_disconnect_by_func (G_OBJECT (palette->priv->project), + G_CALLBACK (glade_palette_refresh), + palette); - g_signal_handlers_disconnect_by_func (G_OBJECT (palette->priv->project), - G_CALLBACK (project_add_item_changed_cb), - palette); + g_signal_handlers_disconnect_by_func (G_OBJECT (palette->priv->project), + G_CALLBACK (project_add_item_changed_cb), + palette); - g_object_unref (palette->priv->project); - } + g_object_unref (palette->priv->project); + } palette->priv->project = project; if (palette->priv->project) - { - g_signal_connect_swapped (G_OBJECT (palette->priv->project), "targets-changed", - G_CALLBACK (glade_palette_refresh), palette); - g_signal_connect_swapped (G_OBJECT (palette->priv->project), "parse-finished", - G_CALLBACK (glade_palette_refresh), palette); + { + g_signal_connect_swapped (G_OBJECT (palette->priv->project), "targets-changed", + G_CALLBACK (glade_palette_refresh), palette); + g_signal_connect_swapped (G_OBJECT (palette->priv->project), "parse-finished", + G_CALLBACK (glade_palette_refresh), palette); - g_signal_connect (G_OBJECT (palette->priv->project), "notify::add-item", - G_CALLBACK (project_add_item_changed_cb), palette); + g_signal_connect (G_OBJECT (palette->priv->project), "notify::add-item", + G_CALLBACK (project_add_item_changed_cb), palette); - g_object_ref (palette->priv->project); + g_object_ref (palette->priv->project); - project_add_item_changed_cb (project, NULL, palette); - } + project_add_item_changed_cb (project, NULL, palette); + } glade_palette_refresh (palette); diff --git a/gladeui/glade-palette.h b/gladeui/glade-palette.h index 586b714e..37d38c63 100644 --- a/gladeui/glade-palette.h +++ b/gladeui/glade-palette.h @@ -78,21 +78,21 @@ GtkWidget *glade_palette_new (void); GladeProject *glade_palette_get_project (GladePalette *palette); void glade_palette_set_project (GladePalette *palette, - GladeProject *project); + GladeProject *project); GladeItemAppearance glade_palette_get_item_appearance (GladePalette *palette); void glade_palette_set_item_appearance (GladePalette *palette, - GladeItemAppearance item_appearance); - + GladeItemAppearance item_appearance); + gboolean glade_palette_get_use_small_item_icons (GladePalette *palette); -void glade_palette_set_use_small_item_icons (GladePalette *palette, - gboolean use_small_item_icons); - -void glade_palette_set_show_selector_button (GladePalette *palette, - gboolean show_selector_button); - +void glade_palette_set_use_small_item_icons (GladePalette *palette, + gboolean use_small_item_icons); + +void glade_palette_set_show_selector_button (GladePalette *palette, + gboolean show_selector_button); + gboolean glade_palette_get_show_selector_button (GladePalette *palette); GtkToolPalette *glade_palette_get_tool_palette (GladePalette *palette); diff --git a/gladeui/glade-path.h b/gladeui/glade-path.h index b4270a5d..64185873 100644 --- a/gladeui/glade-path.h +++ b/gladeui/glade-path.h @@ -5,403 +5,403 @@ #define glade_path_HEIGHT 398.937500 cairo_path_data_t glade_path_data[] = { - {.header.type = 0, .header.length = 2}, - {.point.x = 90.343750, .point.y = 0.000000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 89.687500, .point.y = 2.250000}, - {.point.x = 89.421875, .point.y = 10.992188}, - {.point.x = 89.812500, .point.y = 19.406250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 90.441406, .point.y = 32.828125}, - {.point.x = 91.304688, .point.y = 35.968750}, - {.point.x = 96.500000, .point.y = 45.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 100.148438, .point.y = 51.394531}, - {.point.x = 105.625000, .point.y = 57.781250}, - {.point.x = 110.750000, .point.y = 61.656250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 120.437500, .point.y = 68.976562}, - {.point.x = 144.214844, .point.y = 79.347656}, - {.point.x = 171.375000, .point.y = 88.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 196.046875, .point.y = 95.921875}, - {.point.x = 204.484375, .point.y = 99.640625}, - {.point.x = 211.781250, .point.y = 106.000000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 215.050781, .point.y = 108.847656}, - {.point.x = 217.988281, .point.y = 110.636719}, - {.point.x = 218.312500, .point.y = 109.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 218.640625, .point.y = 109.242188}, - {.point.x = 218.062500, .point.y = 102.550781}, - {.point.x = 217.000000, .point.y = 95.093750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 214.566406, .point.y = 78.011719}, - {.point.x = 207.527344, .point.y = 64.671875}, - {.point.x = 194.875000, .point.y = 53.187500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 182.554688, .point.y = 42.000000}, - {.point.x = 172.675781, .point.y = 36.773438}, - {.point.x = 149.531250, .point.y = 29.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 113.113281, .point.y = 16.847656}, - {.point.x = 106.210938, .point.y = 13.308594}, - {.point.x = 96.906250, .point.y = 2.281250}, - {.header.type = 3, .header.length = 1}, - {.header.type = 0, .header.length = 2}, - {.point.x = 238.031250, .point.y = 58.656250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 237.492188, .point.y = 58.968750}, - {.point.x = 239.261719, .point.y = 61.609375}, - {.point.x = 242.156250, .point.y = 64.750000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 245.250000, .point.y = 68.101562}, - {.point.x = 250.398438, .point.y = 75.605469}, - {.point.x = 253.593750, .point.y = 81.468750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 258.394531, .point.y = 90.273438}, - {.point.x = 259.523438, .point.y = 94.562500}, - {.point.x = 260.156250, .point.y = 105.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 261.109375, .point.y = 123.046875}, - {.point.x = 258.335938, .point.y = 134.652344}, - {.point.x = 249.781250, .point.y = 149.468750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 244.441406, .point.y = 158.726562}, - {.point.x = 242.363281, .point.y = 160.906250}, - {.point.x = 238.968750, .point.y = 160.906250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 235.425781, .point.y = 160.906250}, - {.point.x = 234.160156, .point.y = 159.308594}, - {.point.x = 230.718750, .point.y = 150.531250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 221.054688, .point.y = 125.871094}, - {.point.x = 203.195312, .point.y = 113.500000}, - {.point.x = 167.750000, .point.y = 107.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 145.222656, .point.y = 102.921875}, - {.point.x = 134.351562, .point.y = 99.855469}, - {.point.x = 123.000000, .point.y = 94.375000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 113.082031, .point.y = 89.589844}, - {.point.x = 98.183594, .point.y = 76.960938}, - {.point.x = 94.687500, .point.y = 70.375000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 91.265625, .point.y = 63.921875}, - {.point.x = 89.593750, .point.y = 68.769531}, - {.point.x = 89.562500, .point.y = 85.343750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 89.519531, .point.y = 110.410156}, - {.point.x = 99.582031, .point.y = 135.527344}, - {.point.x = 116.437500, .point.y = 152.437500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 123.062500, .point.y = 159.062500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 114.343750, .point.y = 158.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 109.535156, .point.y = 157.464844}, - {.point.x = 102.035156, .point.y = 155.664062}, - {.point.x = 97.656250, .point.y = 154.000000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 87.226562, .point.y = 150.039062}, - {.point.x = 72.132812, .point.y = 137.804688}, - {.point.x = 66.750000, .point.y = 128.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 64.394531, .point.y = 125.054688}, - {.point.x = 61.109375, .point.y = 113.023438}, - {.point.x = 61.062500, .point.y = 114.500000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 60.906250, .point.y = 119.500000}, - {.point.x = 67.855469, .point.y = 159.640625}, - {.point.x = 71.281250, .point.y = 172.000000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 73.156250, .point.y = 178.757812}, - {.point.x = 74.492188, .point.y = 184.515625}, - {.point.x = 74.218750, .point.y = 184.750000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 73.949219, .point.y = 184.984375}, - {.point.x = 68.496094, .point.y = 183.968750}, - {.point.x = 62.093750, .point.y = 182.500000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 47.703125, .point.y = 179.199219}, - {.point.x = 20.855469, .point.y = 178.828125}, - {.point.x = 8.875000, .point.y = 181.812500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 0.000000, .point.y = 184.031250}, - {.header.type = 1, .header.length = 2}, - {.point.x = 6.218750, .point.y = 186.750000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 15.660156, .point.y = 190.910156}, - {.point.x = 29.242188, .point.y = 204.425781}, - {.point.x = 34.906250, .point.y = 215.218750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 42.023438, .point.y = 228.773438}, - {.point.x = 47.375000, .point.y = 247.988281}, - {.point.x = 50.562500, .point.y = 271.718750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 54.019531, .point.y = 297.421875}, - {.point.x = 54.898438, .point.y = 301.527344}, - {.point.x = 58.312500, .point.y = 309.187500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 62.550781, .point.y = 318.691406}, - {.point.x = 74.937500, .point.y = 334.589844}, - {.point.x = 86.937500, .point.y = 345.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 96.863281, .point.y = 355.152344}, - {.point.x = 97.121094, .point.y = 355.523438}, - {.point.x = 90.031250, .point.y = 350.781250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 85.796875, .point.y = 347.949219}, - {.point.x = 81.859375, .point.y = 345.039062}, - {.point.x = 81.312500, .point.y = 344.281250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 80.769531, .point.y = 343.527344}, - {.point.x = 77.796875, .point.y = 341.339844}, - {.point.x = 74.687500, .point.y = 339.437500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 69.062500, .point.y = 336.000000}, - {.header.type = 1, .header.length = 2}, - {.point.x = 70.343750, .point.y = 343.656250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 71.976562, .point.y = 353.304688}, - {.point.x = 81.210938, .point.y = 377.386719}, - {.point.x = 85.375000, .point.y = 382.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 89.117188, .point.y = 387.804688}, - {.point.x = 92.617188, .point.y = 393.371094}, - {.point.x = 96.406250, .point.y = 398.937500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 140.062500, .point.y = 398.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 125.261719, .point.y = 391.414062}, - {.point.x = 111.375000, .point.y = 383.683594}, - {.point.x = 111.375000, .point.y = 382.625000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 111.375000, .point.y = 382.187500}, - {.point.x = 116.660156, .point.y = 384.617188}, - {.point.x = 123.156250, .point.y = 388.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 130.234375, .point.y = 391.750000}, - {.point.x = 137.937500, .point.y = 395.398438}, - {.point.x = 146.062500, .point.y = 398.937500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 247.531250, .point.y = 398.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 212.316406, .point.y = 389.019531}, - {.point.x = 176.621094, .point.y = 375.136719}, - {.point.x = 146.812500, .point.y = 359.125000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 124.667969, .point.y = 347.230469}, - {.point.x = 121.132812, .point.y = 343.796875}, - {.point.x = 141.375000, .point.y = 353.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 181.539062, .point.y = 373.777344}, - {.point.x = 230.722656, .point.y = 390.035156}, - {.point.x = 277.125000, .point.y = 398.937500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 387.281250, .point.y = 398.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 389.449219, .point.y = 398.289062}, - {.point.x = 391.582031, .point.y = 397.632812}, - {.point.x = 393.406250, .point.y = 397.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 402.406250, .point.y = 394.074219}, - {.point.x = 403.734375, .point.y = 393.250000}, - {.point.x = 408.781250, .point.y = 384.656250}, - {.header.type = 1, .header.length = 2}, - {.point.x = 408.781250, .point.y = 369.218750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 354.609375, .point.y = 380.550781}, - {.point.x = 261.796875, .point.y = 362.976562}, - {.point.x = 186.843750, .point.y = 326.812500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 170.699219, .point.y = 319.023438}, - {.point.x = 149.531250, .point.y = 307.312500}, - {.point.x = 149.531250, .point.y = 306.156250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 149.531250, .point.y = 305.832031}, - {.point.x = 156.691406, .point.y = 309.121094}, - {.point.x = 165.437500, .point.y = 313.468750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 208.855469, .point.y = 335.046875}, - {.point.x = 265.519531, .point.y = 352.527344}, - {.point.x = 313.187500, .point.y = 359.093750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 333.339844, .point.y = 361.871094}, - {.point.x = 369.632812, .point.y = 362.246094}, - {.point.x = 385.093750, .point.y = 359.812500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 391.878906, .point.y = 358.746094}, - {.point.x = 401.050781, .point.y = 356.160156}, - {.point.x = 408.781250, .point.y = 353.437500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 408.781250, .point.y = 327.812500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 357.781250, .point.y = 339.546875}, - {.point.x = 260.570312, .point.y = 318.058594}, - {.point.x = 187.781250, .point.y = 278.000000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 172.882812, .point.y = 269.800781}, - {.point.x = 170.656250, .point.y = 267.132812}, - {.point.x = 184.531250, .point.y = 274.093750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 225.066406, .point.y = 294.429688}, - {.point.x = 273.574219, .point.y = 309.937500}, - {.point.x = 316.531250, .point.y = 316.281250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 339.093750, .point.y = 319.613281}, - {.point.x = 375.757812, .point.y = 320.351562}, - {.point.x = 389.531250, .point.y = 317.718750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 395.226562, .point.y = 316.632812}, - {.point.x = 402.355469, .point.y = 314.566406}, - {.point.x = 408.781250, .point.y = 312.343750}, - {.header.type = 1, .header.length = 2}, - {.point.x = 408.781250, .point.y = 286.781250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 392.652344, .point.y = 290.996094}, - {.point.x = 359.242188, .point.y = 291.675781}, - {.point.x = 331.593750, .point.y = 286.687500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 293.644531, .point.y = 279.839844}, - {.point.x = 248.632812, .point.y = 264.089844}, - {.point.x = 217.218750, .point.y = 246.687500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 202.500000, .point.y = 238.531250}, - {.point.x = 200.261719, .point.y = 235.210938}, - {.point.x = 214.593750, .point.y = 242.781250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 228.839844, .point.y = 250.308594}, - {.point.x = 256.128906, .point.y = 260.804688}, - {.point.x = 277.156250, .point.y = 266.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 323.738281, .point.y = 280.226562}, - {.point.x = 366.109375, .point.y = 283.082031}, - {.point.x = 394.843750, .point.y = 274.781250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 399.859375, .point.y = 273.332031}, - {.point.x = 404.953125, .point.y = 271.539062}, - {.point.x = 408.781250, .point.y = 269.937500}, - {.header.type = 1, .header.length = 2}, - {.point.x = 408.781250, .point.y = 246.375000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 405.968750, .point.y = 241.371094}, - {.point.x = 403.597656, .point.y = 237.246094}, - {.point.x = 403.343750, .point.y = 237.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 403.019531, .point.y = 236.753906}, - {.point.x = 398.386719, .point.y = 238.460938}, - {.point.x = 393.031250, .point.y = 240.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 383.820312, .point.y = 244.945312}, - {.point.x = 382.070312, .point.y = 245.160156}, - {.point.x = 359.625000, .point.y = 245.093750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 340.851562, .point.y = 245.039062}, - {.point.x = 332.679688, .point.y = 244.292969}, - {.point.x = 320.437500, .point.y = 241.468750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 293.203125, .point.y = 235.187500}, - {.point.x = 255.355469, .point.y = 220.000000}, - {.point.x = 242.218750, .point.y = 210.062500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 238.386719, .point.y = 207.164062}, - {.point.x = 238.996094, .point.y = 207.246094}, - {.point.x = 246.812500, .point.y = 210.812500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 279.453125, .point.y = 225.703125}, - {.point.x = 308.761719, .point.y = 233.277344}, - {.point.x = 338.656250, .point.y = 234.531250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 357.054688, .point.y = 235.304688}, - {.point.x = 360.980469, .point.y = 234.976562}, - {.point.x = 371.375000, .point.y = 231.968750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 389.828125, .point.y = 226.628906}, - {.point.x = 390.781250, .point.y = 225.835938}, - {.point.x = 391.156250, .point.y = 215.093750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 391.449219, .point.y = 206.785156}, - {.point.x = 390.515625, .point.y = 204.261719}, - {.point.x = 382.312500, .point.y = 190.468750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 377.289062, .point.y = 182.019531}, - {.point.x = 373.121094, .point.y = 173.703125}, - {.point.x = 373.031250, .point.y = 171.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 372.945312, .point.y = 170.171875}, - {.point.x = 371.769531, .point.y = 171.984375}, - {.point.x = 370.468750, .point.y = 176.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 363.761719, .point.y = 196.949219}, - {.point.x = 349.835938, .point.y = 203.890625}, - {.point.x = 323.812500, .point.y = 199.250000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 309.765625, .point.y = 196.746094}, - {.point.x = 278.191406, .point.y = 183.371094}, - {.point.x = 280.875000, .point.y = 181.062500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 281.234375, .point.y = 180.757812}, - {.point.x = 286.589844, .point.y = 182.289062}, - {.point.x = 292.781250, .point.y = 184.437500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 313.656250, .point.y = 191.675781}, - {.point.x = 335.207031, .point.y = 191.050781}, - {.point.x = 345.625000, .point.y = 182.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 353.035156, .point.y = 177.167969}, - {.point.x = 355.558594, .point.y = 171.070312}, - {.point.x = 355.437500, .point.y = 159.343750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 355.097656, .point.y = 126.226562}, - {.point.x = 321.609375, .point.y = 89.011719}, - {.point.x = 275.187500, .point.y = 70.156250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 265.082031, .point.y = 66.050781}, - {.point.x = 241.316406, .point.y = 58.656250}, - {.point.x = 238.187500, .point.y = 58.656250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 238.132812, .point.y = 58.656250}, - {.point.x = 238.070312, .point.y = 58.636719}, - {.point.x = 238.031250, .point.y = 58.656250}, - {.header.type = 3, .header.length = 1}, - {.header.type = 0, .header.length = 2}, - {.point.x = 388.437500, .point.y = 132.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 387.890625, .point.y = 132.968750}, - {.point.x = 386.785156, .point.y = 133.718750}, - {.point.x = 385.156250, .point.y = 135.031250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 374.984375, .point.y = 143.238281}, - {.point.x = 375.207031, .point.y = 153.203125}, - {.point.x = 385.968750, .point.y = 167.937500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 388.792969, .point.y = 171.800781}, - {.point.x = 392.011719, .point.y = 177.000000}, - {.point.x = 393.125000, .point.y = 179.531250}, - {.header.type = 1, .header.length = 2}, - {.point.x = 395.156250, .point.y = 184.156250}, - {.header.type = 1, .header.length = 2}, - {.point.x = 398.718750, .point.y = 179.531250}, - {.header.type = 2, .header.length = 4}, - {.point.x = 403.707031, .point.y = 173.039062}, - {.point.x = 403.257812, .point.y = 162.636719}, - {.point.x = 397.656250, .point.y = 153.875000}, - {.header.type = 2, .header.length = 4}, - {.point.x = 389.765625, .point.y = 141.527344}, - {.point.x = 387.507812, .point.y = 136.390625}, - {.point.x = 388.656250, .point.y = 133.812500}, - {.header.type = 2, .header.length = 4}, - {.point.x = 388.929688, .point.y = 133.203125}, - {.point.x = 388.921875, .point.y = 132.882812}, - {.point.x = 388.656250, .point.y = 132.843750}, - {.header.type = 2, .header.length = 4}, - {.point.x = 388.601562, .point.y = 132.835938}, - {.point.x = 388.519531, .point.y = 132.828125}, - {.point.x = 388.437500, .point.y = 132.843750}, - {.header.type = 3, .header.length = 1}, - {.header.type = 0, .header.length = 2}, - {.point.x = 388.437500, .point.y = 132.843750} + {.header.type = 0, .header.length = 2}, + {.point.x = 90.343750, .point.y = 0.000000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 89.687500, .point.y = 2.250000}, + {.point.x = 89.421875, .point.y = 10.992188}, + {.point.x = 89.812500, .point.y = 19.406250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 90.441406, .point.y = 32.828125}, + {.point.x = 91.304688, .point.y = 35.968750}, + {.point.x = 96.500000, .point.y = 45.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 100.148438, .point.y = 51.394531}, + {.point.x = 105.625000, .point.y = 57.781250}, + {.point.x = 110.750000, .point.y = 61.656250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 120.437500, .point.y = 68.976562}, + {.point.x = 144.214844, .point.y = 79.347656}, + {.point.x = 171.375000, .point.y = 88.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 196.046875, .point.y = 95.921875}, + {.point.x = 204.484375, .point.y = 99.640625}, + {.point.x = 211.781250, .point.y = 106.000000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 215.050781, .point.y = 108.847656}, + {.point.x = 217.988281, .point.y = 110.636719}, + {.point.x = 218.312500, .point.y = 109.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 218.640625, .point.y = 109.242188}, + {.point.x = 218.062500, .point.y = 102.550781}, + {.point.x = 217.000000, .point.y = 95.093750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 214.566406, .point.y = 78.011719}, + {.point.x = 207.527344, .point.y = 64.671875}, + {.point.x = 194.875000, .point.y = 53.187500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 182.554688, .point.y = 42.000000}, + {.point.x = 172.675781, .point.y = 36.773438}, + {.point.x = 149.531250, .point.y = 29.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 113.113281, .point.y = 16.847656}, + {.point.x = 106.210938, .point.y = 13.308594}, + {.point.x = 96.906250, .point.y = 2.281250}, + {.header.type = 3, .header.length = 1}, + {.header.type = 0, .header.length = 2}, + {.point.x = 238.031250, .point.y = 58.656250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 237.492188, .point.y = 58.968750}, + {.point.x = 239.261719, .point.y = 61.609375}, + {.point.x = 242.156250, .point.y = 64.750000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 245.250000, .point.y = 68.101562}, + {.point.x = 250.398438, .point.y = 75.605469}, + {.point.x = 253.593750, .point.y = 81.468750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 258.394531, .point.y = 90.273438}, + {.point.x = 259.523438, .point.y = 94.562500}, + {.point.x = 260.156250, .point.y = 105.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 261.109375, .point.y = 123.046875}, + {.point.x = 258.335938, .point.y = 134.652344}, + {.point.x = 249.781250, .point.y = 149.468750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 244.441406, .point.y = 158.726562}, + {.point.x = 242.363281, .point.y = 160.906250}, + {.point.x = 238.968750, .point.y = 160.906250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 235.425781, .point.y = 160.906250}, + {.point.x = 234.160156, .point.y = 159.308594}, + {.point.x = 230.718750, .point.y = 150.531250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 221.054688, .point.y = 125.871094}, + {.point.x = 203.195312, .point.y = 113.500000}, + {.point.x = 167.750000, .point.y = 107.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 145.222656, .point.y = 102.921875}, + {.point.x = 134.351562, .point.y = 99.855469}, + {.point.x = 123.000000, .point.y = 94.375000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 113.082031, .point.y = 89.589844}, + {.point.x = 98.183594, .point.y = 76.960938}, + {.point.x = 94.687500, .point.y = 70.375000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 91.265625, .point.y = 63.921875}, + {.point.x = 89.593750, .point.y = 68.769531}, + {.point.x = 89.562500, .point.y = 85.343750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 89.519531, .point.y = 110.410156}, + {.point.x = 99.582031, .point.y = 135.527344}, + {.point.x = 116.437500, .point.y = 152.437500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 123.062500, .point.y = 159.062500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 114.343750, .point.y = 158.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 109.535156, .point.y = 157.464844}, + {.point.x = 102.035156, .point.y = 155.664062}, + {.point.x = 97.656250, .point.y = 154.000000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 87.226562, .point.y = 150.039062}, + {.point.x = 72.132812, .point.y = 137.804688}, + {.point.x = 66.750000, .point.y = 128.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 64.394531, .point.y = 125.054688}, + {.point.x = 61.109375, .point.y = 113.023438}, + {.point.x = 61.062500, .point.y = 114.500000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 60.906250, .point.y = 119.500000}, + {.point.x = 67.855469, .point.y = 159.640625}, + {.point.x = 71.281250, .point.y = 172.000000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 73.156250, .point.y = 178.757812}, + {.point.x = 74.492188, .point.y = 184.515625}, + {.point.x = 74.218750, .point.y = 184.750000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 73.949219, .point.y = 184.984375}, + {.point.x = 68.496094, .point.y = 183.968750}, + {.point.x = 62.093750, .point.y = 182.500000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 47.703125, .point.y = 179.199219}, + {.point.x = 20.855469, .point.y = 178.828125}, + {.point.x = 8.875000, .point.y = 181.812500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 0.000000, .point.y = 184.031250}, + {.header.type = 1, .header.length = 2}, + {.point.x = 6.218750, .point.y = 186.750000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 15.660156, .point.y = 190.910156}, + {.point.x = 29.242188, .point.y = 204.425781}, + {.point.x = 34.906250, .point.y = 215.218750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 42.023438, .point.y = 228.773438}, + {.point.x = 47.375000, .point.y = 247.988281}, + {.point.x = 50.562500, .point.y = 271.718750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 54.019531, .point.y = 297.421875}, + {.point.x = 54.898438, .point.y = 301.527344}, + {.point.x = 58.312500, .point.y = 309.187500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 62.550781, .point.y = 318.691406}, + {.point.x = 74.937500, .point.y = 334.589844}, + {.point.x = 86.937500, .point.y = 345.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 96.863281, .point.y = 355.152344}, + {.point.x = 97.121094, .point.y = 355.523438}, + {.point.x = 90.031250, .point.y = 350.781250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 85.796875, .point.y = 347.949219}, + {.point.x = 81.859375, .point.y = 345.039062}, + {.point.x = 81.312500, .point.y = 344.281250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 80.769531, .point.y = 343.527344}, + {.point.x = 77.796875, .point.y = 341.339844}, + {.point.x = 74.687500, .point.y = 339.437500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 69.062500, .point.y = 336.000000}, + {.header.type = 1, .header.length = 2}, + {.point.x = 70.343750, .point.y = 343.656250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 71.976562, .point.y = 353.304688}, + {.point.x = 81.210938, .point.y = 377.386719}, + {.point.x = 85.375000, .point.y = 382.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 89.117188, .point.y = 387.804688}, + {.point.x = 92.617188, .point.y = 393.371094}, + {.point.x = 96.406250, .point.y = 398.937500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 140.062500, .point.y = 398.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 125.261719, .point.y = 391.414062}, + {.point.x = 111.375000, .point.y = 383.683594}, + {.point.x = 111.375000, .point.y = 382.625000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 111.375000, .point.y = 382.187500}, + {.point.x = 116.660156, .point.y = 384.617188}, + {.point.x = 123.156250, .point.y = 388.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 130.234375, .point.y = 391.750000}, + {.point.x = 137.937500, .point.y = 395.398438}, + {.point.x = 146.062500, .point.y = 398.937500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 247.531250, .point.y = 398.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 212.316406, .point.y = 389.019531}, + {.point.x = 176.621094, .point.y = 375.136719}, + {.point.x = 146.812500, .point.y = 359.125000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 124.667969, .point.y = 347.230469}, + {.point.x = 121.132812, .point.y = 343.796875}, + {.point.x = 141.375000, .point.y = 353.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 181.539062, .point.y = 373.777344}, + {.point.x = 230.722656, .point.y = 390.035156}, + {.point.x = 277.125000, .point.y = 398.937500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 387.281250, .point.y = 398.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 389.449219, .point.y = 398.289062}, + {.point.x = 391.582031, .point.y = 397.632812}, + {.point.x = 393.406250, .point.y = 397.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 402.406250, .point.y = 394.074219}, + {.point.x = 403.734375, .point.y = 393.250000}, + {.point.x = 408.781250, .point.y = 384.656250}, + {.header.type = 1, .header.length = 2}, + {.point.x = 408.781250, .point.y = 369.218750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 354.609375, .point.y = 380.550781}, + {.point.x = 261.796875, .point.y = 362.976562}, + {.point.x = 186.843750, .point.y = 326.812500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 170.699219, .point.y = 319.023438}, + {.point.x = 149.531250, .point.y = 307.312500}, + {.point.x = 149.531250, .point.y = 306.156250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 149.531250, .point.y = 305.832031}, + {.point.x = 156.691406, .point.y = 309.121094}, + {.point.x = 165.437500, .point.y = 313.468750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 208.855469, .point.y = 335.046875}, + {.point.x = 265.519531, .point.y = 352.527344}, + {.point.x = 313.187500, .point.y = 359.093750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 333.339844, .point.y = 361.871094}, + {.point.x = 369.632812, .point.y = 362.246094}, + {.point.x = 385.093750, .point.y = 359.812500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 391.878906, .point.y = 358.746094}, + {.point.x = 401.050781, .point.y = 356.160156}, + {.point.x = 408.781250, .point.y = 353.437500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 408.781250, .point.y = 327.812500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 357.781250, .point.y = 339.546875}, + {.point.x = 260.570312, .point.y = 318.058594}, + {.point.x = 187.781250, .point.y = 278.000000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 172.882812, .point.y = 269.800781}, + {.point.x = 170.656250, .point.y = 267.132812}, + {.point.x = 184.531250, .point.y = 274.093750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 225.066406, .point.y = 294.429688}, + {.point.x = 273.574219, .point.y = 309.937500}, + {.point.x = 316.531250, .point.y = 316.281250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 339.093750, .point.y = 319.613281}, + {.point.x = 375.757812, .point.y = 320.351562}, + {.point.x = 389.531250, .point.y = 317.718750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 395.226562, .point.y = 316.632812}, + {.point.x = 402.355469, .point.y = 314.566406}, + {.point.x = 408.781250, .point.y = 312.343750}, + {.header.type = 1, .header.length = 2}, + {.point.x = 408.781250, .point.y = 286.781250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 392.652344, .point.y = 290.996094}, + {.point.x = 359.242188, .point.y = 291.675781}, + {.point.x = 331.593750, .point.y = 286.687500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 293.644531, .point.y = 279.839844}, + {.point.x = 248.632812, .point.y = 264.089844}, + {.point.x = 217.218750, .point.y = 246.687500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 202.500000, .point.y = 238.531250}, + {.point.x = 200.261719, .point.y = 235.210938}, + {.point.x = 214.593750, .point.y = 242.781250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 228.839844, .point.y = 250.308594}, + {.point.x = 256.128906, .point.y = 260.804688}, + {.point.x = 277.156250, .point.y = 266.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 323.738281, .point.y = 280.226562}, + {.point.x = 366.109375, .point.y = 283.082031}, + {.point.x = 394.843750, .point.y = 274.781250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 399.859375, .point.y = 273.332031}, + {.point.x = 404.953125, .point.y = 271.539062}, + {.point.x = 408.781250, .point.y = 269.937500}, + {.header.type = 1, .header.length = 2}, + {.point.x = 408.781250, .point.y = 246.375000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 405.968750, .point.y = 241.371094}, + {.point.x = 403.597656, .point.y = 237.246094}, + {.point.x = 403.343750, .point.y = 237.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 403.019531, .point.y = 236.753906}, + {.point.x = 398.386719, .point.y = 238.460938}, + {.point.x = 393.031250, .point.y = 240.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 383.820312, .point.y = 244.945312}, + {.point.x = 382.070312, .point.y = 245.160156}, + {.point.x = 359.625000, .point.y = 245.093750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 340.851562, .point.y = 245.039062}, + {.point.x = 332.679688, .point.y = 244.292969}, + {.point.x = 320.437500, .point.y = 241.468750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 293.203125, .point.y = 235.187500}, + {.point.x = 255.355469, .point.y = 220.000000}, + {.point.x = 242.218750, .point.y = 210.062500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 238.386719, .point.y = 207.164062}, + {.point.x = 238.996094, .point.y = 207.246094}, + {.point.x = 246.812500, .point.y = 210.812500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 279.453125, .point.y = 225.703125}, + {.point.x = 308.761719, .point.y = 233.277344}, + {.point.x = 338.656250, .point.y = 234.531250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 357.054688, .point.y = 235.304688}, + {.point.x = 360.980469, .point.y = 234.976562}, + {.point.x = 371.375000, .point.y = 231.968750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 389.828125, .point.y = 226.628906}, + {.point.x = 390.781250, .point.y = 225.835938}, + {.point.x = 391.156250, .point.y = 215.093750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 391.449219, .point.y = 206.785156}, + {.point.x = 390.515625, .point.y = 204.261719}, + {.point.x = 382.312500, .point.y = 190.468750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 377.289062, .point.y = 182.019531}, + {.point.x = 373.121094, .point.y = 173.703125}, + {.point.x = 373.031250, .point.y = 171.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 372.945312, .point.y = 170.171875}, + {.point.x = 371.769531, .point.y = 171.984375}, + {.point.x = 370.468750, .point.y = 176.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 363.761719, .point.y = 196.949219}, + {.point.x = 349.835938, .point.y = 203.890625}, + {.point.x = 323.812500, .point.y = 199.250000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 309.765625, .point.y = 196.746094}, + {.point.x = 278.191406, .point.y = 183.371094}, + {.point.x = 280.875000, .point.y = 181.062500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 281.234375, .point.y = 180.757812}, + {.point.x = 286.589844, .point.y = 182.289062}, + {.point.x = 292.781250, .point.y = 184.437500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 313.656250, .point.y = 191.675781}, + {.point.x = 335.207031, .point.y = 191.050781}, + {.point.x = 345.625000, .point.y = 182.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 353.035156, .point.y = 177.167969}, + {.point.x = 355.558594, .point.y = 171.070312}, + {.point.x = 355.437500, .point.y = 159.343750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 355.097656, .point.y = 126.226562}, + {.point.x = 321.609375, .point.y = 89.011719}, + {.point.x = 275.187500, .point.y = 70.156250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 265.082031, .point.y = 66.050781}, + {.point.x = 241.316406, .point.y = 58.656250}, + {.point.x = 238.187500, .point.y = 58.656250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 238.132812, .point.y = 58.656250}, + {.point.x = 238.070312, .point.y = 58.636719}, + {.point.x = 238.031250, .point.y = 58.656250}, + {.header.type = 3, .header.length = 1}, + {.header.type = 0, .header.length = 2}, + {.point.x = 388.437500, .point.y = 132.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 387.890625, .point.y = 132.968750}, + {.point.x = 386.785156, .point.y = 133.718750}, + {.point.x = 385.156250, .point.y = 135.031250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 374.984375, .point.y = 143.238281}, + {.point.x = 375.207031, .point.y = 153.203125}, + {.point.x = 385.968750, .point.y = 167.937500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 388.792969, .point.y = 171.800781}, + {.point.x = 392.011719, .point.y = 177.000000}, + {.point.x = 393.125000, .point.y = 179.531250}, + {.header.type = 1, .header.length = 2}, + {.point.x = 395.156250, .point.y = 184.156250}, + {.header.type = 1, .header.length = 2}, + {.point.x = 398.718750, .point.y = 179.531250}, + {.header.type = 2, .header.length = 4}, + {.point.x = 403.707031, .point.y = 173.039062}, + {.point.x = 403.257812, .point.y = 162.636719}, + {.point.x = 397.656250, .point.y = 153.875000}, + {.header.type = 2, .header.length = 4}, + {.point.x = 389.765625, .point.y = 141.527344}, + {.point.x = 387.507812, .point.y = 136.390625}, + {.point.x = 388.656250, .point.y = 133.812500}, + {.header.type = 2, .header.length = 4}, + {.point.x = 388.929688, .point.y = 133.203125}, + {.point.x = 388.921875, .point.y = 132.882812}, + {.point.x = 388.656250, .point.y = 132.843750}, + {.header.type = 2, .header.length = 4}, + {.point.x = 388.601562, .point.y = 132.835938}, + {.point.x = 388.519531, .point.y = 132.828125}, + {.point.x = 388.437500, .point.y = 132.843750}, + {.header.type = 3, .header.length = 1}, + {.header.type = 0, .header.length = 2}, + {.point.x = 388.437500, .point.y = 132.843750} }; cairo_path_t glade_path = {0, glade_path_data, 397}; diff --git a/gladeui/glade-placeholder.h b/gladeui/glade-placeholder.h index 37bb4052..9cb29bd1 100644 --- a/gladeui/glade-placeholder.h +++ b/gladeui/glade-placeholder.h @@ -43,7 +43,7 @@ typedef struct _GladePlaceholderPrivate GladePlaceholderPrivate; struct _GladePlaceholder { GtkWidget widget; - + GladePlaceholderPrivate *priv; }; diff --git a/gladeui/glade-popup.c b/gladeui/glade-popup.c index 56b46f4e..ecab7125 100644 --- a/gladeui/glade-popup.c +++ b/gladeui/glade-popup.c @@ -53,7 +53,7 @@ static void glade_popup_select_cb (GtkMenuItem *item, GladeWidget *widget) { glade_project_selection_set (glade_widget_get_project (widget), - glade_widget_get_object (widget), TRUE); + glade_widget_get_object (widget), TRUE); } typedef struct { @@ -203,8 +203,8 @@ glade_popup_menuitem_packing_activated (GtkMenuItem *item, { parent = glade_widget_get_parent (widget); glade_widget_adaptor_child_action_activate (glade_widget_get_adaptor (parent), - glade_widget_get_object (parent), - glade_widget_get_object (widget), action_path); + glade_widget_get_object (parent), + glade_widget_get_object (widget), action_path); } } @@ -243,7 +243,7 @@ glade_popup_action_populate_menu_real (GtkWidget *menu, GtkWidget *submenu = NULL; if (!glade_widget_action_get_visible (action)) - continue; + continue; if (children) { @@ -306,7 +306,7 @@ glade_popup_action_populate_menu (GtkWidget *menu, GList *children = glade_widget_action_get_children (action); if (glade_widget_get_action (widget, aclass->path) && - glade_widget_action_get_visible (action)) + glade_widget_action_get_visible (action)) return glade_popup_action_populate_menu_real (menu, widget, children, @@ -315,7 +315,7 @@ glade_popup_action_populate_menu (GtkWidget *menu, widget); if (glade_widget_get_pack_action (widget, aclass->path) && - glade_widget_action_get_visible (action)) + glade_widget_action_get_visible (action)) return glade_popup_action_populate_menu_real (menu, glade_widget_get_parent (widget), children, @@ -343,9 +343,9 @@ glade_popup_action_populate_menu (GtkWidget *menu, } n += glade_popup_action_populate_menu_real - (menu, glade_widget_get_parent (widget), - glade_widget_get_pack_actions (widget), - G_CALLBACK (glade_popup_menuitem_packing_activated), widget); + (menu, glade_widget_get_parent (widget), + glade_widget_get_pack_actions (widget), + G_CALLBACK (glade_popup_menuitem_packing_activated), widget); } return n; @@ -354,8 +354,8 @@ glade_popup_action_populate_menu (GtkWidget *menu, static GtkWidget * glade_popup_create_menu (GladeWidget *widget, GladePlaceholder *placeholder, - GladeProject *project, - gboolean packing) + GladeProject *project, + gboolean packing) { GtkWidget *popup_menu; GtkWidget *separator; @@ -376,12 +376,12 @@ glade_popup_create_menu (GladeWidget *widget, data->placeholder = placeholder; g_object_set_data_full (G_OBJECT (popup_menu), "root-data-destroy-me", - data, (GDestroyNotify)g_free); + data, (GDestroyNotify)g_free); glade_popup_append_item (popup_menu, _("_Add widget here"), data->parent != NULL, - glade_popup_widget_add_cb, - data); + glade_popup_widget_add_cb, + data); glade_popup_append_item (popup_menu, _("Add widget as _toplevel"), TRUE, glade_popup_root_add_cb, data); @@ -449,7 +449,7 @@ glade_popup_create_menu (GladeWidget *widget, } } else if (widget && (glade_widget_get_actions (widget) || - (packing && glade_widget_get_pack_actions (widget)))) + (packing && glade_widget_get_pack_actions (widget)))) { GtkWidget *separator = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), separator); @@ -502,7 +502,7 @@ glade_popup_placeholder_pop (GladePlaceholder *placeholder, widget = glade_placeholder_get_parent (placeholder); popup_menu = glade_popup_create_menu (widget, placeholder, - glade_widget_get_project (widget), TRUE); + glade_widget_get_project (widget), TRUE); if (event) { @@ -521,8 +521,8 @@ glade_popup_placeholder_pop (GladePlaceholder *placeholder, void glade_popup_palette_pop (GladePalette *palette, - GladeWidgetAdaptor *adaptor, - GdkEventButton *event) + GladeWidgetAdaptor *adaptor, + GdkEventButton *event) { GladeProject *project; GtkWidget *popup_menu; @@ -540,7 +540,7 @@ glade_popup_palette_pop (GladePalette *palette, data->adaptor = adaptor; data->project = project; g_object_set_data_full (G_OBJECT (popup_menu), "root-data-destroy-me", - data, (GDestroyNotify)g_free); + data, (GDestroyNotify)g_free); glade_popup_append_item (popup_menu, _("Add widget as _toplevel"), TRUE, glade_popup_root_add_cb, data); diff --git a/gladeui/glade-popup.h b/gladeui/glade-popup.h index 78b1c674..8306af43 100644 --- a/gladeui/glade-popup.h +++ b/gladeui/glade-popup.h @@ -4,29 +4,29 @@ G_BEGIN_DECLS void glade_popup_widget_pop (GladeWidget *widget, - GdkEventButton *event, - gboolean packing); + GdkEventButton *event, + gboolean packing); void glade_popup_placeholder_pop (GladePlaceholder *placeholder, - GdkEventButton *event); + GdkEventButton *event); void glade_popup_clipboard_pop (GladeWidget *widget, - GdkEventButton *event); + GdkEventButton *event); void glade_popup_palette_pop (GladePalette *palette, - GladeWidgetAdaptor *adaptor, - GdkEventButton *event); + GladeWidgetAdaptor *adaptor, + GdkEventButton *event); gint glade_popup_action_populate_menu (GtkWidget *menu, - GladeWidget *widget, - GladeWidgetAction *action, - gboolean packing); + GladeWidget *widget, + GladeWidgetAction *action, + gboolean packing); void glade_popup_simple_pop (GladeProject *project, - GdkEventButton *event); + GdkEventButton *event); void glade_popup_property_pop (GladeProperty *property, - GdkEventButton *event); + GdkEventButton *event); gboolean glade_popup_is_popup_event (GdkEventButton *event); diff --git a/gladeui/glade-preview.c b/gladeui/glade-preview.c index cbac6ec7..05897ff0 100644 --- a/gladeui/glade-preview.c +++ b/gladeui/glade-preview.c @@ -283,8 +283,8 @@ glade_preview_launch (GladeWidget *widget, const gchar *buffer) preview->priv->watch = g_child_watch_add (preview->priv->pid, - glade_preview_internal_watch, - preview); + glade_preview_internal_watch, + preview); g_free (executable); g_free (name); diff --git a/gladeui/glade-preview.h b/gladeui/glade-preview.h index fae01958..86563350 100644 --- a/gladeui/glade-preview.h +++ b/gladeui/glade-preview.h @@ -51,9 +51,9 @@ struct _GladePreviewClass GType glade_preview_get_type (void) G_GNUC_CONST; GladePreview *glade_preview_launch (GladeWidget *widget, - const gchar *buffer); + const gchar *buffer); void glade_preview_update (GladePreview *preview, - const gchar *buffer); + const gchar *buffer); GladeWidget *glade_preview_get_widget (GladePreview *preview); GPid glade_preview_get_pid (GladePreview *preview); diff --git a/gladeui/glade-project-properties.c b/gladeui/glade-project-properties.c index f517591f..cf6e33e5 100644 --- a/gladeui/glade-project-properties.c +++ b/gladeui/glade-project-properties.c @@ -32,36 +32,36 @@ /* GObjectClass */ static void glade_project_properties_finalize (GObject *object); static void glade_project_properties_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); /* UI Callbacks */ static void on_template_combo_box_changed (GtkComboBox *combo, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void on_template_checkbutton_toggled (GtkToggleButton *togglebutton, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void resource_default_toggled (GtkWidget *widget, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void resource_relative_toggled (GtkWidget *widget, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void resource_fullpath_toggled (GtkWidget *widget, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void on_relative_path_entry_insert_text (GtkEditable *editable, gchar *new_text, gint new_text_length, gint *position, GladeProjectProperties *properties); static void on_relative_path_entry_changed (GtkEntry *entry, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void resource_full_path_set (GtkFileChooserButton *button, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void verify_clicked (GtkWidget *button, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void on_domain_entry_changed (GtkWidget *entry, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void target_button_clicked (GtkWidget *widget, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void on_glade_project_properties_hide (GtkWidget *widget, GladeProjectProperties *properties); static void on_css_filechooser_file_set (GtkFileChooserButton *widget, @@ -75,19 +75,19 @@ static void on_license_data_changed (GladeProjectProperties *p /* Project callbacks */ static void project_resource_path_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties); + GParamSpec *pspec, + GladeProjectProperties *properties); static void project_template_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties); + GParamSpec *pspec, + GladeProjectProperties *properties); static void project_domain_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties); + GParamSpec *pspec, + GladeProjectProperties *properties); static void project_targets_changed (GladeProject *project, - GladeProjectProperties *properties); + GladeProjectProperties *properties); static void project_license_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties); + GParamSpec *pspec, + GladeProjectProperties *properties); static void project_css_provider_path_changed (GladeProject *project, GParamSpec *pspec, GladeProjectProperties *properties); @@ -166,9 +166,9 @@ glade_project_properties_class_init (GladeProjectPropertiesClass *klass) g_object_class_install_property (gobject_class, PROP_PROJECT, g_param_spec_object ("project", _("Project"), - _("The project this properties dialog was created for"), - GLADE_TYPE_PROJECT, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + _("The project this properties dialog was created for"), + GLADE_TYPE_PROJECT, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); /* Setup the template GtkBuilder xml for this class */ @@ -357,7 +357,7 @@ update_prefs_for_resource_path (GladeProjectProperties *properties) static void glade_project_properties_set_project (GladeProjectProperties *properties, - GladeProject *project) + GladeProject *project) { GladeProjectPropertiesPrivate *priv = properties->priv; @@ -366,17 +366,17 @@ glade_project_properties_set_project (GladeProjectProperties *properties, priv->project = project; g_signal_connect (priv->project, "notify::resource-path", - G_CALLBACK (project_resource_path_changed), properties); + G_CALLBACK (project_resource_path_changed), properties); g_signal_connect (priv->project, "notify::template", - G_CALLBACK (project_template_changed), properties); + G_CALLBACK (project_template_changed), properties); g_signal_connect (priv->project, "notify::translation-domain", - G_CALLBACK (project_domain_changed), properties); + G_CALLBACK (project_domain_changed), properties); g_signal_connect (priv->project, "notify::css-provider-path", - G_CALLBACK (project_css_provider_path_changed), properties); + G_CALLBACK (project_css_provider_path_changed), properties); g_signal_connect (priv->project, "targets-changed", - G_CALLBACK (project_targets_changed), properties); + G_CALLBACK (project_targets_changed), properties); g_signal_connect (priv->project, "notify::license", - G_CALLBACK (project_license_changed), properties); + G_CALLBACK (project_license_changed), properties); target_version_box_fill (properties); update_prefs_for_resource_path (properties); @@ -388,15 +388,15 @@ glade_project_properties_set_project (GladeProjectProperties *properties, static void glade_project_properties_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { switch (prop_id) { case PROP_PROJECT: glade_project_properties_set_project (GLADE_PROJECT_PROPERTIES (object), - g_value_get_object (value)); + g_value_get_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -409,7 +409,7 @@ glade_project_properties_set_property (GObject *object, ********************************************************/ static void target_button_clicked (GtkWidget *widget, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GladeTargetableVersion *version; @@ -425,7 +425,7 @@ target_button_clicked (GtkWidget *widget, static void resource_default_toggled (GtkWidget *widget, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; @@ -438,7 +438,7 @@ resource_default_toggled (GtkWidget *widget, static void resource_relative_toggled (GtkWidget *widget, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GtkToggleButton *toggle = GTK_TOGGLE_BUTTON (widget); @@ -454,7 +454,7 @@ resource_relative_toggled (GtkWidget *widget, static void resource_fullpath_toggled (GtkWidget *widget, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GtkToggleButton *toggle = GTK_TOGGLE_BUTTON (widget); @@ -512,7 +512,7 @@ resource_full_path_set (GtkFileChooserButton *button, GladeProjectProperties *pr static void on_template_combo_box_changed (GtkComboBox *combo, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GtkTreeIter iter; @@ -549,22 +549,22 @@ on_template_checkbutton_toggled (GtkToggleButton *togglebutton, GList *l; for (l = glade_project_toplevels (priv->project); l; l = l->next) - { - GObject *object = l->data; - GladeWidget *gwidget; + { + GObject *object = l->data; + GladeWidget *gwidget; - gwidget = glade_widget_get_from_gobject (object); + gwidget = glade_widget_get_from_gobject (object); - if (GTK_IS_WIDGET (object)) - { - glade_command_set_project_template (priv->project, gwidget); - composite = TRUE; - break; - } - } + if (GTK_IS_WIDGET (object)) + { + glade_command_set_project_template (priv->project, gwidget); + composite = TRUE; + break; + } + } if (!composite) - gtk_toggle_button_set_active (togglebutton, FALSE); + gtk_toggle_button_set_active (togglebutton, FALSE); } else glade_command_set_project_template (priv->project, NULL); @@ -582,8 +582,8 @@ template_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) if (visible) { gtk_tree_model_get (model, iter, - GLADE_PROJECT_MODEL_COLUMN_OBJECT, &object, - -1); + GLADE_PROJECT_MODEL_COLUMN_OBJECT, &object, + -1); visible = GTK_IS_WIDGET (object); g_object_unref (object); @@ -610,9 +610,9 @@ verify_clicked (GtkWidget *button, GladeProjectProperties *properties) GladeProjectPropertiesPrivate *priv = properties->priv; if (glade_project_verify (priv->project, FALSE, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED)) + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED)) { gchar *name = glade_project_get_name (priv->project); glade_util_ui_message (glade_app_get_window (), @@ -969,7 +969,7 @@ on_css_filechooser_file_set (GtkFileChooserButton *widget, ******************************************************/ static void project_targets_changed (GladeProject *project, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GList *list; @@ -995,29 +995,29 @@ project_targets_changed (GladeProject *project, /* Fetch the radios for this catalog */ if (priv->target_radios && - (radios = g_hash_table_lookup (priv->target_radios, glade_catalog_get_name (catalog))) != NULL) - { - for (l = radios; l; l = l->next) - { - GtkWidget *radio = l->data; - - /* Activate the appropriate button for the project/catalog */ - version = g_object_get_data (G_OBJECT (radio), "version"); - if (version->major == major && version->minor == minor) - { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - break; - } - } - } + (radios = g_hash_table_lookup (priv->target_radios, glade_catalog_get_name (catalog))) != NULL) + { + for (l = radios; l; l = l->next) + { + GtkWidget *radio = l->data; + + /* Activate the appropriate button for the project/catalog */ + version = g_object_get_data (G_OBJECT (radio), "version"); + if (version->major == major && version->minor == minor) + { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); + break; + } + } + } } priv->ignore_ui_cb = FALSE; } static void project_domain_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties) + GParamSpec *pspec, + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; const gchar *domain; @@ -1032,8 +1032,8 @@ project_domain_changed (GladeProject *project, static void project_resource_path_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties) + GParamSpec *pspec, + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; priv->ignore_ui_cb = TRUE; @@ -1043,8 +1043,8 @@ project_resource_path_changed (GladeProject *project, static void project_template_changed (GladeProject *project, - GParamSpec *pspec, - GladeProjectProperties *properties) + GParamSpec *pspec, + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; GtkTreeModel *model; @@ -1077,11 +1077,11 @@ project_template_changed (GladeProject *project, g_object_unref (obj); if (gwidget == glade_project_get_template (priv->project)) - { + { gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->template_combobox), &iter); - template_found = TRUE; - break; + template_found = TRUE; + break; } valid = gtk_tree_model_iter_next (model, &iter); @@ -1099,7 +1099,7 @@ project_template_changed (GladeProject *project, static void project_license_changed (GladeProject *project, GParamSpec *pspec, - GladeProjectProperties *properties) + GladeProjectProperties *properties) { GladeProjectPropertiesPrivate *priv = properties->priv; diff --git a/gladeui/glade-project-properties.h b/gladeui/glade-project-properties.h index e9684f80..e63f5c77 100644 --- a/gladeui/glade-project-properties.h +++ b/gladeui/glade-project-properties.h @@ -29,13 +29,13 @@ G_BEGIN_DECLS #define GLADE_TYPE_PROJECT_PROPERTIES (glade_project_properties_get_type ()) #define GLADE_PROJECT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectProperties)) + ((obj), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectProperties)) #define GLADE_PROJECT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \ - ((klass), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectPropertiesClass)) + ((klass), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectPropertiesClass)) #define GLADE_IS_PROJECT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_PROJECT_PROPERTIES)) #define GLADE_IS_PROJECT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_PROJECT_PROPERTIES)) #define GLADE_PROJECT_PROPERTIES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectPropertiesClass)) + ((obj), GLADE_TYPE_PROJECT_PROPERTIES, GladeProjectPropertiesClass)) typedef struct _GladeProjectProperties GladeProjectProperties; typedef struct _GladeProjectPropertiesClass GladeProjectPropertiesClass; diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c index b86be762..1c40c865 100644 --- a/gladeui/glade-project.c +++ b/gladeui/glade-project.c @@ -59,22 +59,22 @@ static void glade_project_target_version_for_adaptor (GladeProject *project, - GladeWidgetAdaptor *adaptor, - gint *major, - gint *minor); + GladeWidgetAdaptor *adaptor, + gint *major, + gint *minor); static void glade_project_verify_properties (GladeWidget *widget); static void glade_project_verify_project_for_ui (GladeProject *project); static void glade_project_verify_adaptor (GladeProject *project, - GladeWidgetAdaptor *adaptor, - const gchar *path_name, - GString *string, - GladeVerifyFlags flags, - gboolean forwidget, - GladeSupportMask *mask); + GladeWidgetAdaptor *adaptor, + const gchar *path_name, + GString *string, + GladeVerifyFlags flags, + gboolean forwidget, + GladeSupportMask *mask); static void glade_project_set_readonly (GladeProject *project, - gboolean readonly); + gboolean readonly); static void glade_project_set_modified (GladeProject *project, - gboolean modified); + gboolean modified); static void glade_project_model_iface_init (GtkTreeModelIface *iface); @@ -425,11 +425,11 @@ glade_project_set_property (GObject *object, break; case PROP_TEMPLATE: glade_project_set_template (GLADE_PROJECT (object), - g_value_get_object (value)); + g_value_get_object (value)); break; case PROP_RESOURCE_PATH: glade_project_set_resource_path (GLADE_PROJECT (object), - g_value_get_string (value)); + g_value_get_string (value)); break; case PROP_LICENSE: glade_project_set_license (GLADE_PROJECT (object), @@ -1148,7 +1148,7 @@ glade_project_model_get_value (GtkTreeModel *model, break; case GLADE_PROJECT_MODEL_COLUMN_WARNING: g_value_set_string (value, glade_widget_support_warning (widget)); - break; + break; default: g_assert_not_reached (); @@ -1354,8 +1354,8 @@ glade_project_fix_template (GladeProject *project) if (composite) { - glade_project_set_template (project, gwidget); - break; + glade_project_set_template (project, gwidget); + break; } } } @@ -1834,7 +1834,7 @@ glade_project_count_xml_objects (GladeProject *project, node; node = glade_xml_node_next (node)) { if (glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)) count = glade_project_count_xml_objects (project, node, ++count); else if (glade_xml_node_verify_silent (node, GLADE_XML_TAG_CHILD)) count = glade_project_count_xml_objects (project, node, count); @@ -2000,14 +2000,14 @@ glade_project_load_internal (GladeProject *project) display_name = glade_project_get_name (project); if (glade_util_ui_message (glade_app_get_window (), - GLADE_UI_YES_OR_NO, NULL, - _("An automatically saved version of `%s' is more recent.\n\n" - "Would you like to load the autosave version instead?"), - display_name)) - { - mtime = autosave_mtime; - load_path = g_strdup (autosave_path); - } + GLADE_UI_YES_OR_NO, NULL, + _("An automatically saved version of `%s' is more recent.\n\n" + "Would you like to load the autosave version instead?"), + display_name)) + { + mtime = autosave_mtime; + load_path = g_strdup (autosave_path); + } g_free (display_name); } @@ -2082,7 +2082,7 @@ glade_project_load_internal (GladeProject *project) { /* Skip "requires" tags */ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) continue; if ((widget = glade_widget_read (project, NULL, node, NULL)) != NULL) @@ -2829,9 +2829,9 @@ sync_project_resource_path (GladeProject *project) */ gboolean glade_project_save_verify (GladeProject *project, - const gchar *path, - GladeVerifyFlags flags, - GError **error) + const gchar *path, + GladeVerifyFlags flags, + GError **error) { GladeXmlContext *context; GladeXmlDoc *doc; @@ -2921,9 +2921,9 @@ gboolean glade_project_save (GladeProject *project, const gchar *path, GError **error) { return glade_project_save_verify (project, path, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_UNRECOGNIZED, - error); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_UNRECOGNIZED, + error); } /** @@ -3059,7 +3059,7 @@ glade_project_verify_property_internal (GladeProject *project, const gchar *path_name, GString *string, gboolean forwidget, - GladeVerifyFlags flags) + GladeVerifyFlags flags) { GladeWidgetAdaptor *adaptor, *prop_adaptor; GladePropertyClass *pclass; @@ -3088,9 +3088,9 @@ glade_project_verify_property_internal (GladeProject *project, !GPC_VERSION_CHECK (pclass, target_major, target_minor)) { GLADE_NOTE (VERIFY, g_print ("VERIFY: Property '%s' of adaptor %s not available in version %d.%d\n", - glade_property_class_id (pclass), - glade_widget_adaptor_get_name (adaptor), - target_major, target_minor)); + glade_property_class_id (pclass), + glade_widget_adaptor_get_name (adaptor), + target_major, target_minor)); if (forwidget) { @@ -3116,19 +3116,19 @@ glade_project_verify_property_internal (GladeProject *project, glade_property_class_since_minor (pclass)); } else if ((flags & GLADE_VERIFY_DEPRECATIONS) != 0 && - glade_property_class_deprecated (pclass)) + glade_property_class_deprecated (pclass)) { GLADE_NOTE (VERIFY, g_print ("VERIFY: Property '%s' of adaptor %s is deprecated\n", - glade_property_class_id (pclass), - glade_widget_adaptor_get_name (adaptor))); + glade_property_class_id (pclass), + glade_widget_adaptor_get_name (adaptor))); if (forwidget) - glade_property_set_support_warning (property, FALSE, PROP_DEPRECATED_MSG); + glade_property_set_support_warning (property, FALSE, PROP_DEPRECATED_MSG); else g_string_append_printf (string, PROP_DEPRECATED_FMT, path_name, - glade_property_class_get_name (pclass), + glade_property_class_get_name (pclass), glade_widget_adaptor_get_title (adaptor)); } else if (forwidget) @@ -3142,7 +3142,7 @@ glade_project_verify_properties_internal (GladeWidget *widget, const gchar *path_name, GString *string, gboolean forwidget, - GladeVerifyFlags flags) + GladeVerifyFlags flags) { GList *list; GladeProperty *property; @@ -3173,7 +3173,7 @@ glade_project_verify_signal_internal (GladeWidget *widget, const gchar *path_name, GString *string, gboolean forwidget, - GladeVerifyFlags flags) + GladeVerifyFlags flags) { GladeSignalClass *signal_class; GladeWidgetAdaptor *adaptor; @@ -3202,9 +3202,9 @@ glade_project_verify_signal_internal (GladeWidget *widget, !GSC_VERSION_CHECK (signal_class, target_major, target_minor)) { GLADE_NOTE (VERIFY, g_print ("VERIFY: Signal '%s' of adaptor %s not avalable in version %d.%d\n", - glade_signal_get_name (signal), - glade_widget_adaptor_get_name (adaptor), - target_major, target_minor)); + glade_signal_get_name (signal), + glade_widget_adaptor_get_name (adaptor), + target_major, target_minor)); if (forwidget) { @@ -3229,14 +3229,14 @@ glade_project_verify_signal_internal (GladeWidget *widget, glade_signal_class_since_minor (signal_class)); } else if ((flags & GLADE_VERIFY_DEPRECATIONS) != 0 && - glade_signal_class_deprecated (signal_class)) + glade_signal_class_deprecated (signal_class)) { GLADE_NOTE (VERIFY, g_print ("VERIFY: Signal '%s' of adaptor %s is deprecated\n", - glade_signal_get_name (signal), - glade_widget_adaptor_get_name (adaptor))); + glade_signal_get_name (signal), + glade_widget_adaptor_get_name (adaptor))); if (forwidget) - glade_signal_set_support_warning (signal, SIGNAL_DEPRECATED_MSG); + glade_signal_set_support_warning (signal, SIGNAL_DEPRECATED_MSG); else g_string_append_printf (string, SIGNAL_DEPRECATED_FMT, @@ -3263,18 +3263,18 @@ glade_project_verify_property (GladeProperty *property) if (project) glade_project_verify_property_internal (project, property, NULL, NULL, TRUE, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED); } void glade_project_verify_signal (GladeWidget *widget, GladeSignal *signal) { glade_project_verify_signal_internal (widget, signal, NULL, NULL, TRUE, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED); } static void @@ -3282,7 +3282,7 @@ glade_project_verify_signals (GladeWidget *widget, const gchar *path_name, GString *string, gboolean forwidget, - GladeVerifyFlags flags) + GladeVerifyFlags flags) { GladeSignal *signal; GList *signals, *list; @@ -3320,13 +3320,13 @@ glade_project_verify_properties (GladeWidget *widget) return; glade_project_verify_properties_internal (widget, NULL, NULL, TRUE, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED); glade_project_verify_signals (widget, NULL, NULL, TRUE, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED); glade_widget_support_changed (widget); } @@ -3334,7 +3334,7 @@ glade_project_verify_properties (GladeWidget *widget) static gboolean glade_project_verify_dialog (GladeProject *project, GString *string, - gboolean saving) + gboolean saving) { GtkWidget *swindow; GtkWidget *textview; @@ -3400,7 +3400,7 @@ glade_project_verify (GladeProject *project, GladeWidget *widget = glade_widget_get_from_gobject (list->data); if ((flags & GLADE_VERIFY_UNRECOGNIZED) != 0 && - GLADE_IS_OBJECT_STUB (list->data)) + GLADE_IS_OBJECT_STUB (list->data)) { gchar *type; g_object_get (list->data, "object-type", &type, NULL); @@ -3475,11 +3475,11 @@ glade_project_verify_adaptor (GladeProject *project, /* Only one versioning message (builder or otherwise)... */ if ((flags & GLADE_VERIFY_VERSIONS) != 0 && - !GWA_VERSION_CHECK (adaptor_iter, target_major, target_minor)) + !GWA_VERSION_CHECK (adaptor_iter, target_major, target_minor)) { - GLADE_NOTE (VERIFY, g_print ("VERIFY: Adaptor '%s' not available in version %d.%d\n", - glade_widget_adaptor_get_name (adaptor_iter), - target_major, target_minor)); + GLADE_NOTE (VERIFY, g_print ("VERIFY: Adaptor '%s' not available in version %d.%d\n", + glade_widget_adaptor_get_name (adaptor_iter), + target_major, target_minor)); if (forwidget) g_string_append_printf (string, @@ -3550,10 +3550,10 @@ glade_project_verify_widget_adaptor (GladeProject *project, glade_project_verify_adaptor (project, adaptor, NULL, string, - GLADE_VERIFY_VERSIONS | - GLADE_VERIFY_DEPRECATIONS | - GLADE_VERIFY_UNRECOGNIZED, - TRUE, mask); + GLADE_VERIFY_VERSIONS | + GLADE_VERIFY_DEPRECATIONS | + GLADE_VERIFY_UNRECOGNIZED, + TRUE, mask); /* there was a '\0' byte... */ if (string->len > 0) @@ -4172,12 +4172,12 @@ glade_project_set_template (GladeProject *project, GladeWidget *widget) if (project->priv->template != widget) { if (project->priv->template) - glade_widget_set_is_composite (project->priv->template, FALSE); + glade_widget_set_is_composite (project->priv->template, FALSE); project->priv->template = widget; if (project->priv->template) - glade_widget_set_is_composite (project->priv->template, TRUE); + glade_widget_set_is_composite (project->priv->template, TRUE); glade_project_verify_project_for_ui (project); @@ -5181,7 +5181,7 @@ glade_project_copy_selection (GladeProject *project) if (widget_contains_unknown_type (widget)) has_unknown = TRUE; else - widgets = g_list_prepend (widgets, glade_widget_dup (widget, FALSE)); + widgets = g_list_prepend (widgets, glade_widget_dup (widget, FALSE)); } if (has_unknown) @@ -5211,7 +5211,7 @@ glade_project_command_cut (GladeProject *project) if (widget_contains_unknown_type (widget)) has_unknown = TRUE; else - widgets = g_list_prepend (widgets, widget); + widgets = g_list_prepend (widgets, widget); } if (failed == FALSE && widgets != NULL) diff --git a/gladeui/glade-project.h b/gladeui/glade-project.h index 5e6e6923..9ec350a4 100644 --- a/gladeui/glade-project.h +++ b/gladeui/glade-project.h @@ -138,7 +138,7 @@ gboolean glade_project_save (GladeProject *proj GError **error); gboolean glade_project_save_verify (GladeProject *project, const gchar *path, - GladeVerifyFlags flags, + GladeVerifyFlags flags, GError **error); gboolean glade_project_autosave (GladeProject *project, GError **error); @@ -166,7 +166,7 @@ void glade_project_check_reordered (GladeProject *proj GList *old_order); void glade_project_set_template (GladeProject *project, - GladeWidget *widget); + GladeWidget *widget); GladeWidget *glade_project_get_template (GladeProject *project); void glade_project_set_license (GladeProject *project, @@ -200,7 +200,7 @@ GladeWidget *glade_project_get_widget_by_name (GladeProject *proj const gchar *name); void glade_project_set_widget_name (GladeProject *project, GladeWidget *widget, - const gchar *name); + const gchar *name); gchar *glade_project_new_widget_name (GladeProject *project, GladeWidget *widget, const gchar *base_name); @@ -242,9 +242,9 @@ void glade_project_set_add_item (GladeProject *proj GladeWidgetAdaptor *adaptor); GladeWidgetAdaptor *glade_project_get_add_item (GladeProject *project); void glade_project_set_target_version (GladeProject *project, - const gchar *catalog, - gint major, - gint minor); + const gchar *catalog, + gint major, + gint minor); void glade_project_get_target_version (GladeProject *project, const gchar *catalog, gint *major, @@ -265,8 +265,8 @@ const gchar *glade_project_get_css_provider_path (GladeProject *project) /* Verifications */ gboolean glade_project_verify (GladeProject *project, - gboolean saving, - GladeVerifyFlags flags); + gboolean saving, + GladeVerifyFlags flags); gchar *glade_project_verify_widget_adaptor(GladeProject *project, GladeWidgetAdaptor *adaptor, GladeSupportMask *mask); diff --git a/gladeui/glade-property-class.c b/gladeui/glade-property-class.c index aed3960f..2de6b980 100644 --- a/gladeui/glade-property-class.c +++ b/gladeui/glade-property-class.c @@ -59,133 +59,133 @@ struct _GladePropertyClass { GladeWidgetAdaptor *adaptor; /* The GladeWidgetAdaptor that this property class - * was created for. - */ + * was created for. + */ guint16 version_since_major; /* Version in which this property was */ guint16 version_since_minor; /* introduced. */ GParamSpec *pspec; /* The Parameter Specification for this property. - */ + */ gchar *id; /* The id of the property. Like "label" or "xpad" - * this is a non-translatable string - */ + * this is a non-translatable string + */ gchar *name; /* The name of the property. Like "Label" or "X Pad" - * this is a translatable string - */ + * this is a translatable string + */ gchar *tooltip; /* The default tooltip for the property editor rows. - */ + */ GValue *def; /* The default value for this property (this will exist - * as a copy of orig_def if not specified by the catalog) - */ + * as a copy of orig_def if not specified by the catalog) + */ GValue *orig_def; /* The real default value obtained through introspection. - * (used to decide whether we should write to the - * glade file or not, or to restore the loaded property - * correctly); all property classes have and orig_def. - */ + * (used to decide whether we should write to the + * glade file or not, or to restore the loaded property + * correctly); all property classes have and orig_def. + */ guint multiline : 1; /* Whether to use multiple lines to edit this text property. - */ + */ guint virt : 1; /* Whether this is a virtual property with its pspec supplied - * via the catalog (or hard code-paths); or FALSE if its a real - * GObject introspected property - */ + * via the catalog (or hard code-paths); or FALSE if its a real + * GObject introspected property + */ guint optional : 1; /* Some properties are optional by nature like - * default width. It can be set or not set. A - * default property has a check box in the - * left that enables/disables the input - */ + * default width. It can be set or not set. A + * default property has a check box in the + * left that enables/disables the input + */ guint optional_default : 1; /* For optional values, what the default is */ guint construct_only : 1; /* Whether this property is G_PARAM_CONSTRUCT_ONLY or not */ - + guint common : 1; /* Common properties go in the common tab */ guint atk : 1; /* Atk properties go in the atk tab */ guint packing : 1; /* Packing properties go in the packing tab */ guint query : 1; /* Whether we should explicitly ask the user about this property - * when instantiating a widget with this property (through a popup - * dialog). - */ - + * when instantiating a widget with this property (through a popup + * dialog). + */ + guint translatable : 1; /* The property should be translatable, which - * means that it needs extra parameters in the - * UI. - */ + * means that it needs extra parameters in the + * UI. + */ /* These three are the master switches for the glade-file output, * property editor availability & live object updates in the glade environment. */ guint save : 1; /* Whether we should save to the glade file or not - * (mostly just for virtual internal glade properties, - * also used for properties with generic pspecs that - * are saved in custom ways by the plugin) - */ + * (mostly just for virtual internal glade properties, + * also used for properties with generic pspecs that + * are saved in custom ways by the plugin) + */ guint save_always : 1; /* Used to make a special case exception and always - * save this property regardless of what the default - * value is (used for some special cases like properties - * that are assigned initial values in composite widgets - * or derived widget code). - */ + * save this property regardless of what the default + * value is (used for some special cases like properties + * that are assigned initial values in composite widgets + * or derived widget code). + */ guint visible : 1; /* Whether or not to show this property in the editor & - * reset dialog. - */ + * reset dialog. + */ guint custom_layout : 1; /* Properties marked as custom_layout will not be included - * in a base #GladeEditorTable implementation (use this - * for properties you want to layout in custom ways in - * a #GladeEditable widget - */ - + * in a base #GladeEditorTable implementation (use this + * for properties you want to layout in custom ways in + * a #GladeEditable widget + */ + guint ignore : 1; /* When true, we will not sync the object when the property - * changes, or load values from the object. - */ + * changes, or load values from the object. + */ guint needs_sync : 1; /* Virtual properties need to be synchronized after object - * creation, some properties that are not virtual also need - * handling from the backend, if "needs-sync" is true then - * this property will by synced with virtual properties. - */ + * creation, some properties that are not virtual also need + * handling from the backend, if "needs-sync" is true then + * this property will by synced with virtual properties. + */ guint is_modified : 1; /* If true, this property_class has been "modified" from the - * the standard property by a xml file. */ + * the standard property by a xml file. */ guint themed_icon : 1; /* Some GParamSpecString properties reffer to icon names - * in the icon theme... these need to be specified in the - * property class definition if proper editing tools are to - * be used. - */ + * in the icon theme... these need to be specified in the + * property class definition if proper editing tools are to + * be used. + */ guint stock_icon : 1; /* String properties can also denote stock icons, including - * icons from icon factories... - */ + * icons from icon factories... + */ guint stock : 1; /* ... or a narrower list of "items" from gtk builtin stock items. - */ - + */ + guint transfer_on_paste : 1; /* If this is a packing prop, - * wether we should transfer it on paste. - */ - + * wether we should transfer it on paste. + */ + guint parentless_widget : 1; /* True if this property should point to a parentless widget - * in the project - */ + * in the project + */ guint deprecated : 1; /* True if this property is deprecated */ - gdouble weight; /* This will determine the position of this property in - * the editor. - */ - + gdouble weight; /* This will determine the position of this property in + * the editor. + */ + gchar *create_type; /* If this is an object property and you want the option to create - * one from the object selection dialog, then set the name of the - * concrete type here. - */ + * one from the object selection dialog, then set the name of the + * concrete type here. + */ }; /** @@ -197,7 +197,7 @@ struct _GladePropertyClass */ GladePropertyClass * glade_property_class_new (GladeWidgetAdaptor *adaptor, - const gchar *id) + const gchar *id) { GladePropertyClass *property_class; @@ -248,7 +248,7 @@ glade_property_class_new (GladeWidgetAdaptor *adaptor, */ GladePropertyClass * glade_property_class_clone (GladePropertyClass *property_class, - gboolean reset_version) + gboolean reset_version) { GladePropertyClass *clone; @@ -536,7 +536,7 @@ glade_property_class_make_string_from_gvalue (GladePropertyClass * { rgba = g_value_get_boxed (value); if (rgba) - string = gdk_rgba_to_string (rgba); + string = gdk_rgba_to_string (rgba); } else if (property_class->pspec->value_type == G_TYPE_STRV) { @@ -795,9 +795,9 @@ glade_property_class_make_objects_from_string (GladePropertyClass * for (i = 0; split[i]; i++) { if ((object = - glade_property_class_make_object_from_string (property_class, - split[i], - project)) != NULL) + glade_property_class_make_object_from_string (property_class, + split[i], + project)) != NULL) objects = g_list_prepend (objects, object); } g_strfreev (split); @@ -856,9 +856,9 @@ glade_property_class_make_gvalue_from_string (GladePropertyClass *property_class { g_value_set_static_string (&str_value, strv[i]); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; value_array = g_value_array_append (value_array, &str_value); - G_GNUC_END_IGNORE_DEPRECATIONS; + G_GNUC_END_IGNORE_DEPRECATIONS; } g_value_take_boxed (value, value_array); g_strfreev (strv); @@ -923,13 +923,13 @@ glade_property_class_make_gvalue_from_string (GladePropertyClass *property_class else if (G_IS_PARAM_SPEC_OBJECT (property_class->pspec)) { GObject *object = - glade_property_class_make_object_from_string (property_class, string, project); + glade_property_class_make_object_from_string (property_class, string, project); g_value_set_object (value, object); } else if (GLADE_IS_PARAM_SPEC_OBJECTS (property_class->pspec)) { GList *objects = - glade_property_class_make_objects_from_string (property_class, string, project); + glade_property_class_make_objects_from_string (property_class, string, project); g_value_take_boxed (value, objects); } else @@ -1093,8 +1093,9 @@ glade_property_class_set_vl_from_gvalue (GladePropertyClass * klass, * Assignes the provided return location to @value */ void -glade_property_class_get_from_gvalue (GladePropertyClass * klass, - GValue * value, ...) +glade_property_class_get_from_gvalue (GladePropertyClass *klass, + GValue *value, + ...) { va_list vl; @@ -1184,7 +1185,7 @@ failed: * or %NULL if its unsupported. */ GladePropertyClass * -glade_property_class_new_from_spec (GladeWidgetAdaptor *adaptor, GParamSpec * spec) +glade_property_class_new_from_spec (GladeWidgetAdaptor *adaptor, GParamSpec *spec) { return glade_property_class_new_from_spec_full (adaptor, spec, TRUE); } @@ -1197,7 +1198,7 @@ glade_property_class_new_from_spec (GladeWidgetAdaptor *adaptor, GParamSpec * sp * Returns: whether or not to show this property in the editor */ gboolean -glade_property_class_is_visible (GladePropertyClass * klass) +glade_property_class_is_visible (GladePropertyClass *klass) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), FALSE); @@ -1205,8 +1206,8 @@ glade_property_class_is_visible (GladePropertyClass * klass) } void -glade_property_class_set_adaptor (GladePropertyClass *property_class, - GladeWidgetAdaptor *adaptor) +glade_property_class_set_adaptor (GladePropertyClass *property_class, + GladeWidgetAdaptor *adaptor) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1214,7 +1215,7 @@ glade_property_class_set_adaptor (GladePropertyClass *property_class, } GladeWidgetAdaptor * -glade_property_class_get_adaptor (GladePropertyClass *property_class) +glade_property_class_get_adaptor (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1222,7 +1223,7 @@ glade_property_class_get_adaptor (GladePropertyClass *property_class) } GParamSpec * -glade_property_class_get_pspec (GladePropertyClass *property_class) +glade_property_class_get_pspec (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1230,8 +1231,8 @@ glade_property_class_get_pspec (GladePropertyClass *property_class) } void -glade_property_class_set_pspec (GladePropertyClass *property_class, - GParamSpec *pspec) +glade_property_class_set_pspec (GladePropertyClass *property_class, + GParamSpec *pspec) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1239,8 +1240,8 @@ glade_property_class_set_pspec (GladePropertyClass *property_class, } void -glade_property_class_set_is_packing (GladePropertyClass *property_class, - gboolean is_packing) +glade_property_class_set_is_packing (GladePropertyClass *property_class, + gboolean is_packing) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1248,7 +1249,7 @@ glade_property_class_set_is_packing (GladePropertyClass *property_class, } gboolean -glade_property_class_get_is_packing (GladePropertyClass *property_class) +glade_property_class_get_is_packing (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1256,7 +1257,7 @@ glade_property_class_get_is_packing (GladePropertyClass *property_class) } gboolean -glade_property_class_save (GladePropertyClass *property_class) +glade_property_class_save (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1264,7 +1265,7 @@ glade_property_class_save (GladePropertyClass *property_class) } gboolean -glade_property_class_save_always (GladePropertyClass *property_class) +glade_property_class_save_always (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1272,8 +1273,8 @@ glade_property_class_save_always (GladePropertyClass *property_class) } void -glade_property_class_set_virtual (GladePropertyClass *property_class, - gboolean value) +glade_property_class_set_virtual (GladePropertyClass *property_class, + gboolean value) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1281,7 +1282,7 @@ glade_property_class_set_virtual (GladePropertyClass *property_class, } gboolean -glade_property_class_get_virtual (GladePropertyClass *property_class) +glade_property_class_get_virtual (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1289,8 +1290,8 @@ glade_property_class_get_virtual (GladePropertyClass *property_class) } void -glade_property_class_set_ignore (GladePropertyClass *property_class, - gboolean ignore) +glade_property_class_set_ignore (GladePropertyClass *property_class, + gboolean ignore) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1298,7 +1299,7 @@ glade_property_class_set_ignore (GladePropertyClass *property_class, } gboolean -glade_property_class_get_ignore (GladePropertyClass *property_class) +glade_property_class_get_ignore (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1313,7 +1314,7 @@ glade_property_class_get_ignore (GladePropertyClass *property_class) * that refers to another object in this project. */ gboolean -glade_property_class_is_object (GladePropertyClass * klass) +glade_property_class_is_object (GladePropertyClass *klass) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), FALSE); @@ -1325,7 +1326,7 @@ glade_property_class_is_object (GladePropertyClass * klass) void glade_property_class_set_name (GladePropertyClass *property_class, - const gchar *name) + const gchar *name) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1334,7 +1335,7 @@ glade_property_class_set_name (GladePropertyClass *property_class, } G_CONST_RETURN gchar * -glade_property_class_get_name (GladePropertyClass *property_class) +glade_property_class_get_name (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1342,8 +1343,8 @@ glade_property_class_get_name (GladePropertyClass *property_class) } void -glade_property_class_set_tooltip (GladePropertyClass *property_class, - const gchar *tooltip) +glade_property_class_set_tooltip (GladePropertyClass *property_class, + const gchar *tooltip) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1352,7 +1353,7 @@ glade_property_class_set_tooltip (GladePropertyClass *property_class, } G_CONST_RETURN gchar * -glade_property_class_get_tooltip (GladePropertyClass *property_class) +glade_property_class_get_tooltip (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1360,8 +1361,8 @@ glade_property_class_get_tooltip (GladePropertyClass *property_class) } void -glade_property_class_set_construct_only (GladePropertyClass *property_class, - gboolean construct_only) +glade_property_class_set_construct_only (GladePropertyClass *property_class, + gboolean construct_only) { g_return_if_fail (GLADE_IS_PROPERTY_CLASS (property_class)); @@ -1369,7 +1370,7 @@ glade_property_class_set_construct_only (GladePropertyClass *property_class, } gboolean -glade_property_class_get_construct_only (GladePropertyClass *property_class) +glade_property_class_get_construct_only (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1377,7 +1378,7 @@ glade_property_class_get_construct_only (GladePropertyClass *property_class) } G_CONST_RETURN GValue * -glade_property_class_get_default (GladePropertyClass *property_class) +glade_property_class_get_default (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1385,7 +1386,7 @@ glade_property_class_get_default (GladePropertyClass *property_class) } G_CONST_RETURN GValue * -glade_property_class_get_original_default (GladePropertyClass *property_class) +glade_property_class_get_original_default (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1393,7 +1394,7 @@ glade_property_class_get_original_default (GladePropertyClass *property_class) } gboolean -glade_property_class_translatable (GladePropertyClass *property_class) +glade_property_class_translatable (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1401,7 +1402,7 @@ glade_property_class_translatable (GladePropertyClass *property_class) } gboolean -glade_property_class_needs_sync (GladePropertyClass *property_class) +glade_property_class_needs_sync (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1409,7 +1410,7 @@ glade_property_class_needs_sync (GladePropertyClass *property_class) } gboolean -glade_property_class_query (GladePropertyClass *property_class) +glade_property_class_query (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1417,7 +1418,7 @@ glade_property_class_query (GladePropertyClass *property_class) } gboolean -glade_property_class_atk (GladePropertyClass *property_class) +glade_property_class_atk (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1425,7 +1426,7 @@ glade_property_class_atk (GladePropertyClass *property_class) } gboolean -glade_property_class_common (GladePropertyClass *property_class) +glade_property_class_common (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1433,7 +1434,7 @@ glade_property_class_common (GladePropertyClass *property_class) } gboolean -glade_property_class_parentless_widget (GladePropertyClass *property_class) +glade_property_class_parentless_widget (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1441,7 +1442,7 @@ glade_property_class_parentless_widget (GladePropertyClass *property_class) } gboolean -glade_property_class_optional (GladePropertyClass *property_class) +glade_property_class_optional (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1449,7 +1450,7 @@ glade_property_class_optional (GladePropertyClass *property_class) } gboolean -glade_property_class_optional_default (GladePropertyClass *property_class) +glade_property_class_optional_default (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1457,7 +1458,7 @@ glade_property_class_optional_default (GladePropertyClass *property_class) } gboolean -glade_property_class_multiline (GladePropertyClass *property_class) +glade_property_class_multiline (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1465,7 +1466,7 @@ glade_property_class_multiline (GladePropertyClass *property_class) } gboolean -glade_property_class_stock (GladePropertyClass *property_class) +glade_property_class_stock (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1473,7 +1474,7 @@ glade_property_class_stock (GladePropertyClass *property_class) } gboolean -glade_property_class_stock_icon (GladePropertyClass *property_class) +glade_property_class_stock_icon (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1481,7 +1482,7 @@ glade_property_class_stock_icon (GladePropertyClass *property_class) } gboolean -glade_property_class_transfer_on_paste (GladePropertyClass *property_class) +glade_property_class_transfer_on_paste (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1489,7 +1490,7 @@ glade_property_class_transfer_on_paste (GladePropertyClass *property_class) } gboolean -glade_property_class_custom_layout (GladePropertyClass *property_class) +glade_property_class_custom_layout (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1497,7 +1498,7 @@ glade_property_class_custom_layout (GladePropertyClass *property_class) } gdouble -glade_property_class_weight (GladePropertyClass *property_class) +glade_property_class_weight (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), -1.0); @@ -1505,7 +1506,7 @@ glade_property_class_weight (GladePropertyClass *property_class) } G_CONST_RETURN gchar * -glade_property_class_create_type (GladePropertyClass *property_class) +glade_property_class_create_type (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1513,7 +1514,7 @@ glade_property_class_create_type (GladePropertyClass *property_class) } guint16 -glade_property_class_since_major (GladePropertyClass *property_class) +glade_property_class_since_major (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), 0); @@ -1521,7 +1522,7 @@ glade_property_class_since_major (GladePropertyClass *property_class) } guint16 -glade_property_class_since_minor (GladePropertyClass *property_class) +glade_property_class_since_minor (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), 0); @@ -1529,7 +1530,7 @@ glade_property_class_since_minor (GladePropertyClass *property_class) } gboolean -glade_property_class_deprecated (GladePropertyClass *property_class) +glade_property_class_deprecated (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1537,7 +1538,7 @@ glade_property_class_deprecated (GladePropertyClass *property_class) } G_CONST_RETURN gchar * -glade_property_class_id (GladePropertyClass *property_class) +glade_property_class_id (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), NULL); @@ -1545,7 +1546,7 @@ glade_property_class_id (GladePropertyClass *property_class) } gboolean -glade_property_class_themed_icon (GladePropertyClass *property_class) +glade_property_class_themed_icon (GladePropertyClass *property_class) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (property_class), FALSE); @@ -1561,9 +1562,9 @@ glade_property_class_themed_icon (GladePropertyClass *property_class) * Reads and caches displayable values from the catalog */ static void -gpc_read_displayable_values_from_node (GladeXmlNode * node, - GladePropertyClass * klass, - const gchar * domain) +gpc_read_displayable_values_from_node (GladeXmlNode *node, + GladePropertyClass *klass, + const gchar *domain) { gpointer the_class = g_type_class_ref (klass->pspec->value_type); GladeXmlNode *child; @@ -1668,7 +1669,7 @@ gpc_read_displayable_values_from_node (GladeXmlNode * node, * Returns: An appropriate #GtkAdjustment for use in the Property editor */ GtkAdjustment * -glade_property_class_make_adjustment (GladePropertyClass * property_class) +glade_property_class_make_adjustment (GladePropertyClass *property_class) { GtkAdjustment *adjustment; gdouble min = 0, max = 0, def = 0; @@ -1752,8 +1753,8 @@ glade_property_class_make_adjustment (GladePropertyClass * property_class) static GParamSpec * -glade_property_class_parse_specifications (GladePropertyClass * klass, - GladeXmlNode * spec_node) +glade_property_class_parse_specifications (GladePropertyClass *klass, + GladeXmlNode *spec_node) { gchar *string; GType spec_type = 0, value_type = 0; @@ -1939,10 +1940,10 @@ glade_property_class_parse_specifications (GladePropertyClass * klass, * has Disabled="TRUE". */ gboolean -glade_property_class_update_from_node (GladeXmlNode * node, - GType object_type, - GladePropertyClass ** property_class, - const gchar * domain) +glade_property_class_update_from_node (GladeXmlNode *node, + GType object_type, + GladePropertyClass **property_class, + const gchar *domain) { GladePropertyClass *klass; GParamSpec *pspec = NULL; @@ -2055,7 +2056,7 @@ glade_property_class_update_from_node (GladeXmlNode * node, g_value_unset (klass->orig_def); g_free (klass->orig_def); klass->orig_def = - glade_property_class_make_gvalue_from_string (klass, buf, NULL); + glade_property_class_make_gvalue_from_string (klass, buf, NULL); } g_free (buf); @@ -2147,13 +2148,13 @@ glade_property_class_update_from_node (GladeXmlNode * node, glade_xml_get_property_version (node, GLADE_TAG_VERSION_SINCE, - &klass->version_since_major, - &klass->version_since_minor); + &klass->version_since_major, + &klass->version_since_minor); klass->deprecated = glade_xml_get_property_boolean (node, - GLADE_TAG_DEPRECATED, - klass->deprecated); + GLADE_TAG_DEPRECATED, + klass->deprecated); if ((buf = glade_xml_get_property_string @@ -2199,8 +2200,8 @@ glade_property_class_update_from_node (GladeXmlNode * node, * have the same name are not matches). */ gboolean -glade_property_class_match (GladePropertyClass * klass, - GladePropertyClass * comp) +glade_property_class_match (GladePropertyClass *klass, + GladePropertyClass *comp) { g_return_val_if_fail (klass != NULL, FALSE); g_return_val_if_fail (comp != NULL, FALSE); @@ -2219,7 +2220,7 @@ glade_property_class_match (GladePropertyClass * klass, * can be a %NULL value for boxed or object type param specs. */ gboolean -glade_property_class_void_value (GladePropertyClass * klass, GValue * value) +glade_property_class_void_value (GladePropertyClass *klass, GValue *value) { g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), FALSE); @@ -2245,8 +2246,9 @@ glade_property_class_void_value (GladePropertyClass * klass, GValue * value) * equal to or greater than value2, respectively. */ gint -glade_property_class_compare (GladePropertyClass * klass, - const GValue * value1, const GValue * value2) +glade_property_class_compare (GladePropertyClass *klass, + const GValue *value1, + const GValue *value2) { gint retval; @@ -2304,7 +2306,7 @@ glade_property_class_compare (GladePropertyClass * klass, This function will not override weight if it is already set (weight >= 0.0) */ void -glade_property_class_set_weights (GList ** properties, GType parent) +glade_property_class_set_weights (GList **properties, GType parent) { gint normal = 0, common = 0, packing = 0; GList *l; @@ -2348,3 +2350,4 @@ glade_property_class_load_defaults_from_spec (GladePropertyClass *property_class property_class->def = glade_property_class_get_default_from_spec (property_class->pspec); } + diff --git a/gladeui/glade-property-class.h b/gladeui/glade-property-class.h index a14a8622..b87edcf7 100644 --- a/gladeui/glade-property-class.h +++ b/gladeui/glade-property-class.h @@ -24,14 +24,14 @@ G_BEGIN_DECLS * * Checks if @gpc is good to be loaded as @type */ -#define GLADE_PROPERTY_CLASS_IS_TYPE(gpc, type) \ - (((type) == GLADE_PAGE_GENERAL && \ - !glade_property_class_common (gpc) && \ - !glade_property_class_get_is_packing (gpc) && \ - !glade_property_class_atk (gpc)) || \ - ((type) == GLADE_PAGE_COMMON && glade_property_class_common (gpc)) || \ +#define GLADE_PROPERTY_CLASS_IS_TYPE(gpc, type) \ + (((type) == GLADE_PAGE_GENERAL && \ + !glade_property_class_common (gpc) && \ + !glade_property_class_get_is_packing (gpc) && \ + !glade_property_class_atk (gpc)) || \ + ((type) == GLADE_PAGE_COMMON && glade_property_class_common (gpc)) || \ ((type) == GLADE_PAGE_PACKING && glade_property_class_get_is_packing (gpc)) || \ - ((type) == GLADE_PAGE_ATK && glade_property_class_atk (gpc)) || \ + ((type) == GLADE_PAGE_ATK && glade_property_class_atk (gpc)) || \ ((type) == GLADE_PAGE_QUERY && glade_property_class_query (gpc))) /** @@ -43,7 +43,7 @@ G_BEGIN_DECLS * Evaluates to %TRUE if @klass is available in its owning library version-@major_verion.@minor_version. * */ -#define GPC_VERSION_CHECK(klass, major_version, minor_version) \ +#define GPC_VERSION_CHECK(klass, major_version, minor_version) \ ((glade_property_class_since_major (GLADE_PROPERTY_CLASS (klass)) == major_version) ? \ (glade_property_class_since_minor (GLADE_PROPERTY_CLASS (klass)) <= minor_version) : \ (glade_property_class_since_major (GLADE_PROPERTY_CLASS (klass)) <= major_version)) @@ -56,45 +56,45 @@ typedef struct _GladePropertyClass GladePropertyClass; GladePropertyClass *glade_property_class_new (GladeWidgetAdaptor *adaptor, - const gchar *id); + const gchar *id); GladePropertyClass *glade_property_class_new_from_spec (GladeWidgetAdaptor *adaptor, - GParamSpec *spec); + GParamSpec *spec); GladePropertyClass *glade_property_class_new_from_spec_full (GladeWidgetAdaptor *adaptor, - GParamSpec *spec, - gboolean need_handle); + GParamSpec *spec, + gboolean need_handle); GladePropertyClass *glade_property_class_clone (GladePropertyClass *property_class, - gboolean reset_version); + gboolean reset_version); void glade_property_class_free (GladePropertyClass *property_class); void glade_property_class_set_adaptor (GladePropertyClass *property_class, - GladeWidgetAdaptor *adaptor); + GladeWidgetAdaptor *adaptor); GladeWidgetAdaptor *glade_property_class_get_adaptor (GladePropertyClass *property_class); void glade_property_class_set_pspec (GladePropertyClass *property_class, - GParamSpec *pspec); + GParamSpec *pspec); GParamSpec *glade_property_class_get_pspec (GladePropertyClass *property_class); void glade_property_class_set_is_packing (GladePropertyClass *property_class, - gboolean is_packing); + gboolean is_packing); gboolean glade_property_class_get_is_packing (GladePropertyClass *property_class); gboolean glade_property_class_save (GladePropertyClass *property_class); gboolean glade_property_class_save_always (GladePropertyClass *property_class); gboolean glade_property_class_is_visible (GladePropertyClass *property_class); gboolean glade_property_class_is_object (GladePropertyClass *property_class); void glade_property_class_set_virtual (GladePropertyClass *property_class, - gboolean value); + gboolean value); gboolean glade_property_class_get_virtual (GladePropertyClass *property_class); void glade_property_class_set_ignore (GladePropertyClass *property_class, - gboolean ignore); + gboolean ignore); gboolean glade_property_class_get_ignore (GladePropertyClass *property_class); void glade_property_class_set_name (GladePropertyClass *property_class, - const gchar *name); + const gchar *name); G_CONST_RETURN gchar *glade_property_class_get_name (GladePropertyClass *property_class); void glade_property_class_set_tooltip (GladePropertyClass *property_class, - const gchar *tooltip); + const gchar *tooltip); G_CONST_RETURN gchar *glade_property_class_get_tooltip (GladePropertyClass *property_class); G_CONST_RETURN gchar *glade_property_class_id (GladePropertyClass *property_class); gboolean glade_property_class_themed_icon (GladePropertyClass *property_class); void glade_property_class_set_construct_only (GladePropertyClass *property_class, - gboolean construct_only); + gboolean construct_only); gboolean glade_property_class_get_construct_only (GladePropertyClass *property_class); G_CONST_RETURN GValue *glade_property_class_get_default (GladePropertyClass *property_class); G_CONST_RETURN GValue *glade_property_class_get_original_default (GladePropertyClass *property_class); @@ -121,42 +121,42 @@ guint16 glade_property_class_since_minor (GladePropert gboolean glade_property_class_deprecated (GladePropertyClass *property_class); GValue *glade_property_class_make_gvalue_from_string (GladePropertyClass *property_class, - const gchar *string, - GladeProject *project); + const gchar *string, + GladeProject *project); gchar *glade_property_class_make_string_from_gvalue (GladePropertyClass *property_class, - const GValue *value); + const GValue *value); GValue *glade_property_class_make_gvalue_from_vl (GladePropertyClass *property_class, - va_list vl); + va_list vl); void glade_property_class_set_vl_from_gvalue (GladePropertyClass *klass, - GValue *value, - va_list vl); + GValue *value, + va_list vl); GValue *glade_property_class_make_gvalue (GladePropertyClass *klass, - ...); + ...); void glade_property_class_get_from_gvalue (GladePropertyClass *klass, - GValue *value, - ...); + GValue *value, + ...); gboolean glade_property_class_update_from_node (GladeXmlNode *node, - GType object_type, - GladePropertyClass **property_class, - const gchar *domain); + GType object_type, + GladePropertyClass **property_class, + const gchar *domain); GtkAdjustment *glade_property_class_make_adjustment (GladePropertyClass *property_class); gboolean glade_property_class_match (GladePropertyClass *klass, - GladePropertyClass *comp); + GladePropertyClass *comp); gboolean glade_property_class_void_value (GladePropertyClass *klass, - GValue *value); + GValue *value); gint glade_property_class_compare (GladePropertyClass *klass, - const GValue *value1, - const GValue *value2); + const GValue *value1, + const GValue *value2); GValue *glade_property_class_get_default_from_spec (GParamSpec *spec); diff --git a/gladeui/glade-property-label.c b/gladeui/glade-property-label.c index 21fa9d14..cb4d24f4 100644 --- a/gladeui/glade-property-label.c +++ b/gladeui/glade-property-label.c @@ -35,17 +35,17 @@ static void glade_property_label_finalize (GObject *object); static void glade_property_label_dispose (GObject *object); static void glade_property_label_set_real_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void glade_property_label_get_real_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); + guint prop_id, + GValue *value, + GParamSpec *pspec); /* GtkWidgetClass */ static gint glade_property_label_button_press (GtkWidget *widget, - GdkEventButton *event); + GdkEventButton *event); /* GladeEditableIface */ static void glade_property_label_editable_init (GladeEditableIface *iface); @@ -85,7 +85,7 @@ static GladeEditableIface *parent_editable_iface; G_DEFINE_TYPE_WITH_CODE (GladePropertyLabel, glade_property_label, GTK_TYPE_EVENT_BOX, G_ADD_PRIVATE (GladePropertyLabel) - G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, + G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, glade_property_label_editable_init)); static void @@ -117,8 +117,8 @@ glade_property_label_class_init (GladePropertyLabelClass *class) g_object_class_install_property (gobject_class, PROP_PROPERTY, g_param_spec_object ("property", _("Property"), - _("The GladeProperty to display a label for"), - GLADE_TYPE_PROPERTY, G_PARAM_READWRITE)); + _("The GladeProperty to display a label for"), + GLADE_TYPE_PROPERTY, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PROPERTY_NAME, @@ -127,14 +127,14 @@ glade_property_label_class_init (GladePropertyLabelClass *class) * the GladeProperty object from the GladeWidget the * property belongs to. */ - _("The property name to use when loading by widget"), - NULL, G_PARAM_READWRITE)); + _("The property name to use when loading by widget"), + NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_APPEND_COLON, g_param_spec_boolean ("append-colon", _("Append Colon"), - _("Whether to append a colon ':' to the property name"), - TRUE, G_PARAM_READWRITE)); + _("Whether to append a colon ':' to the property name"), + TRUE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PACKING, @@ -144,20 +144,20 @@ glade_property_label_class_init (GladePropertyLabelClass *class) * to the container or child widget but to the relation. * For more information see GtkContainer docs. */ - _("Whether the property to load is a packing property or not"), - FALSE, G_PARAM_READWRITE)); + _("Whether the property to load is a packing property or not"), + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_CUSTOM_TEXT, g_param_spec_string ("custom-text", _("Custom Text"), - _("Custom text to override the property name"), - NULL, G_PARAM_READWRITE)); + _("Custom text to override the property name"), + NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_CUSTOM_TOOLTIP, g_param_spec_string ("custom-tooltip", _("Custom Tooltip"), - _("Custom tooltip to override the property description"), - NULL, G_PARAM_READWRITE)); + _("Custom tooltip to override the property description"), + NULL, G_PARAM_READWRITE)); /* Bind to template */ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladeui/glade-property-label.ui"); @@ -191,10 +191,10 @@ glade_property_label_dispose (GObject *object) } static void -glade_property_label_set_real_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +glade_property_label_set_real_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GladePropertyLabel *label = GLADE_PROPERTY_LABEL (object); @@ -225,10 +225,10 @@ glade_property_label_set_real_property (GObject *object, } static void -glade_property_label_get_real_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +glade_property_label_get_real_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GladePropertyLabel *label = GLADE_PROPERTY_LABEL (object); @@ -262,8 +262,8 @@ glade_property_label_get_real_property (GObject *object, * GladeEditableIface * *******************************************************************************/ static void -glade_property_label_load (GladeEditable *editable, - GladeWidget *widget) +glade_property_label_load (GladeEditable *editable, + GladeWidget *widget) { GladePropertyLabel *label = GLADE_PROPERTY_LABEL (editable); GladePropertyLabelPrivate *priv; @@ -279,9 +279,9 @@ glade_property_label_load (GladeEditable *editable, if (widget) { if (priv->packing) - property = glade_widget_get_pack_property (widget, priv->property_name); + property = glade_widget_get_pack_property (widget, priv->property_name); else - property = glade_widget_get_property (widget, priv->property_name); + property = glade_widget_get_property (widget, priv->property_name); glade_property_label_set_property (label, property); } @@ -307,8 +307,8 @@ glade_property_label_editable_init (GladeEditableIface *iface) * GtkWidgetClass * ***********************************************************/ static gint -glade_property_label_button_press (GtkWidget *widget, - GdkEventButton *event) +glade_property_label_button_press (GtkWidget *widget, + GdkEventButton *event) { GladePropertyLabel *label = GLADE_PROPERTY_LABEL (widget); GladePropertyLabelPrivate *priv = label->priv; @@ -327,10 +327,10 @@ glade_property_label_button_press (GtkWidget *widget, ***********************************************************/ static void glade_property_label_tooltip_cb (GladeProperty *property, - const gchar *tooltip, - const gchar *insensitive, - const gchar *support, - GladePropertyLabel *label) + const gchar *tooltip, + const gchar *insensitive, + const gchar *support, + GladePropertyLabel *label) { GladePropertyLabelPrivate *priv = label->priv; const gchar *choice_tooltip; @@ -348,8 +348,8 @@ glade_property_label_tooltip_cb (GladeProperty *property, static void glade_property_label_sensitivity_cb (GladeProperty *property, - GParamSpec *pspec, - GladePropertyLabel *label) + GParamSpec *pspec, + GladePropertyLabel *label) { GladePropertyLabelPrivate *priv = label->priv; gboolean sensitive; @@ -380,8 +380,8 @@ get_modified_attribute (void) static void glade_property_label_state_cb (GladeProperty *property, - GParamSpec *pspec, - GladePropertyLabel *label) + GParamSpec *pspec, + GladePropertyLabel *label) { GladePropertyLabelPrivate *priv = label->priv; @@ -403,7 +403,7 @@ glade_property_label_state_cb (GladeProperty *property, static void glade_property_label_property_finalized (GladePropertyLabel *label, - GladeProperty *where_property_was) + GladeProperty *where_property_was) { /* Silent disconnect */ label->priv->property = NULL; @@ -424,7 +424,7 @@ glade_property_label_new (void) void glade_property_label_set_property_name (GladePropertyLabel *label, - const gchar *property_name) + const gchar *property_name) { GladePropertyLabelPrivate *priv; @@ -451,7 +451,7 @@ glade_property_label_get_property_name (GladePropertyLabel *label) void glade_property_label_set_append_colon (GladePropertyLabel *label, - gboolean append_colon) + gboolean append_colon) { GladePropertyLabelPrivate *priv; @@ -477,7 +477,7 @@ glade_property_label_get_append_colon (GladePropertyLabel *label) void glade_property_label_set_packing (GladePropertyLabel *label, - gboolean packing) + gboolean packing) { GladePropertyLabelPrivate *priv; @@ -503,7 +503,7 @@ glade_property_label_get_packing (GladePropertyLabel *label) void glade_property_label_set_custom_text (GladePropertyLabel *label, - const gchar *custom_text) + const gchar *custom_text) { GladePropertyLabelPrivate *priv; gboolean changed = FALSE; @@ -515,7 +515,7 @@ glade_property_label_set_custom_text (GladePropertyLabel *label, if (custom_text) { if (!priv->custom_text) - changed = TRUE; + changed = TRUE; priv->custom_text = TRUE; @@ -524,12 +524,12 @@ glade_property_label_set_custom_text (GladePropertyLabel *label, else { if (priv->custom_text) - changed = TRUE; + changed = TRUE; priv->custom_text = FALSE; if (priv->property) - glade_property_label_state_cb (priv->property, NULL, label); + glade_property_label_state_cb (priv->property, NULL, label); } if (changed) @@ -553,7 +553,7 @@ glade_property_label_get_custom_text (GladePropertyLabel *label) void glade_property_label_set_custom_tooltip (GladePropertyLabel *label, - const gchar *custom_tooltip) + const gchar *custom_tooltip) { GladePropertyLabelPrivate *priv; gboolean changed = FALSE; @@ -565,7 +565,7 @@ glade_property_label_set_custom_tooltip (GladePropertyLabel *label, if (custom_tooltip) { if (!priv->custom_tooltip) - changed = TRUE; + changed = TRUE; priv->custom_tooltip = TRUE; @@ -574,19 +574,19 @@ glade_property_label_set_custom_tooltip (GladePropertyLabel *label, else { if (priv->custom_tooltip) - changed = TRUE; + changed = TRUE; priv->custom_tooltip = FALSE; if (priv->property) - { - GladePropertyClass *pclass = glade_property_get_class (priv->property); - - glade_property_label_tooltip_cb - (priv->property, glade_property_class_get_tooltip (pclass), - glade_propert_get_insensitive_tooltip (priv->property), - glade_property_get_support_warning (priv->property), label); - } + { + GladePropertyClass *pclass = glade_property_get_class (priv->property); + + glade_property_label_tooltip_cb + (priv->property, glade_property_class_get_tooltip (pclass), + glade_propert_get_insensitive_tooltip (priv->property), + glade_property_get_support_warning (priv->property), label); + } } if (changed) @@ -610,7 +610,7 @@ glade_property_label_get_custom_tooltip (GladePropertyLabel *label) void glade_property_label_set_property (GladePropertyLabel *label, - GladeProperty *property) + GladeProperty *property) { GladePropertyLabelPrivate *priv; @@ -624,85 +624,85 @@ glade_property_label_set_property (GladePropertyLabel *label, /* Disconnect last */ if (priv->property) - { - if (priv->tooltip_id > 0) - g_signal_handler_disconnect (priv->property, priv->tooltip_id); - if (priv->state_id > 0) - g_signal_handler_disconnect (priv->property, priv->state_id); - if (priv->sensitive_id > 0) - g_signal_handler_disconnect (priv->property, priv->sensitive_id); - if (priv->enabled_id > 0) - g_signal_handler_disconnect (priv->property, priv->enabled_id); - - priv->tooltip_id = 0; - priv->state_id = 0; - priv->sensitive_id = 0; - priv->enabled_id = 0; - - g_object_weak_unref (G_OBJECT (priv->property), - (GWeakNotify) glade_property_label_property_finalized, label); - } + { + if (priv->tooltip_id > 0) + g_signal_handler_disconnect (priv->property, priv->tooltip_id); + if (priv->state_id > 0) + g_signal_handler_disconnect (priv->property, priv->state_id); + if (priv->sensitive_id > 0) + g_signal_handler_disconnect (priv->property, priv->sensitive_id); + if (priv->enabled_id > 0) + g_signal_handler_disconnect (priv->property, priv->enabled_id); + + priv->tooltip_id = 0; + priv->state_id = 0; + priv->sensitive_id = 0; + priv->enabled_id = 0; + + g_object_weak_unref (G_OBJECT (priv->property), + (GWeakNotify) glade_property_label_property_finalized, label); + } priv->property = property; /* Connect new */ if (priv->property) - { - GladePropertyClass *pclass = glade_property_get_class (priv->property); - - priv->tooltip_id = - g_signal_connect (G_OBJECT (priv->property), - "tooltip-changed", - G_CALLBACK (glade_property_label_tooltip_cb), - label); - priv->sensitive_id = - g_signal_connect (G_OBJECT (priv->property), - "notify::sensitive", - G_CALLBACK (glade_property_label_sensitivity_cb), - label); - priv->state_id = - g_signal_connect (G_OBJECT (priv->property), - "notify::state", - G_CALLBACK (glade_property_label_state_cb), label); - priv->enabled_id = - g_signal_connect (G_OBJECT (priv->property), - "notify::enabled", - G_CALLBACK (glade_property_label_sensitivity_cb), - label); - - g_object_weak_ref (G_OBJECT (priv->property), - (GWeakNotify) glade_property_label_property_finalized, label); - - /* Load initial tooltips - */ - glade_property_label_tooltip_cb - (property, glade_property_class_get_tooltip (pclass), - glade_propert_get_insensitive_tooltip (property), - glade_property_get_support_warning (property), label); - - /* Load initial sensitive state. - */ - glade_property_label_sensitivity_cb (property, NULL, label); - - /* Load intial label state - */ - glade_property_label_state_cb (property, NULL, label); - - if (!priv->custom_text) - { - if (priv->append_colon) - { - gchar *text = g_strdup_printf ("%s:", glade_property_class_get_name (pclass)); - gtk_label_set_text (GTK_LABEL (priv->label), text); - g_free (text); - } - else - { - gtk_label_set_text (GTK_LABEL (priv->label), - glade_property_class_get_name (pclass)); - } - } - } + { + GladePropertyClass *pclass = glade_property_get_class (priv->property); + + priv->tooltip_id = + g_signal_connect (G_OBJECT (priv->property), + "tooltip-changed", + G_CALLBACK (glade_property_label_tooltip_cb), + label); + priv->sensitive_id = + g_signal_connect (G_OBJECT (priv->property), + "notify::sensitive", + G_CALLBACK (glade_property_label_sensitivity_cb), + label); + priv->state_id = + g_signal_connect (G_OBJECT (priv->property), + "notify::state", + G_CALLBACK (glade_property_label_state_cb), label); + priv->enabled_id = + g_signal_connect (G_OBJECT (priv->property), + "notify::enabled", + G_CALLBACK (glade_property_label_sensitivity_cb), + label); + + g_object_weak_ref (G_OBJECT (priv->property), + (GWeakNotify) glade_property_label_property_finalized, label); + + /* Load initial tooltips + */ + glade_property_label_tooltip_cb + (property, glade_property_class_get_tooltip (pclass), + glade_propert_get_insensitive_tooltip (property), + glade_property_get_support_warning (property), label); + + /* Load initial sensitive state. + */ + glade_property_label_sensitivity_cb (property, NULL, label); + + /* Load intial label state + */ + glade_property_label_state_cb (property, NULL, label); + + if (!priv->custom_text) + { + if (priv->append_colon) + { + gchar *text = g_strdup_printf ("%s:", glade_property_class_get_name (pclass)); + gtk_label_set_text (GTK_LABEL (priv->label), text); + g_free (text); + } + else + { + gtk_label_set_text (GTK_LABEL (priv->label), + glade_property_class_get_name (pclass)); + } + } + } g_object_notify (G_OBJECT (label), "property"); } diff --git a/gladeui/glade-property-label.h b/gladeui/glade-property-label.h index 09b786ce..745336e2 100644 --- a/gladeui/glade-property-label.h +++ b/gladeui/glade-property-label.h @@ -57,24 +57,24 @@ GType glade_property_label_get_type (void) G_GNUC_CONST; GtkWidget *glade_property_label_new (void); void glade_property_label_set_property_name (GladePropertyLabel *label, - const gchar *property_name); + const gchar *property_name); const gchar *glade_property_label_get_property_name (GladePropertyLabel *label); void glade_property_label_set_append_colon (GladePropertyLabel *label, - gboolean append_colon); + gboolean append_colon); gboolean glade_property_label_get_append_colon (GladePropertyLabel *label); void glade_property_label_set_packing (GladePropertyLabel *label, - gboolean packing); + gboolean packing); gboolean glade_property_label_get_packing (GladePropertyLabel *label); void glade_property_label_set_custom_text (GladePropertyLabel *label, - const gchar *custom_text); + const gchar *custom_text); const gchar *glade_property_label_get_custom_text (GladePropertyLabel *label); void glade_property_label_set_custom_tooltip(GladePropertyLabel *label, - const gchar *custom_tooltip); + const gchar *custom_tooltip); const gchar *glade_property_label_get_custom_tooltip(GladePropertyLabel *label); void glade_property_label_set_property (GladePropertyLabel *label, - GladeProperty *property); + GladeProperty *property); GladeProperty *glade_property_label_get_property (GladePropertyLabel *label); G_END_DECLS diff --git a/gladeui/glade-property-shell.c b/gladeui/glade-property-shell.c index 6b034cd1..66242527 100644 --- a/gladeui/glade-property-shell.c +++ b/gladeui/glade-property-shell.c @@ -35,13 +35,13 @@ /* GObjectClass */ static void glade_property_shell_finalize (GObject *object); static void glade_property_shell_set_real_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void glade_property_shell_get_real_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); + guint prop_id, + GValue *value, + GParamSpec *pspec); /* GladeEditableIface */ static void glade_property_shell_editable_init (GladeEditableIface *iface); @@ -86,7 +86,7 @@ static GladeEditableIface *parent_editable_iface; G_DEFINE_TYPE_WITH_CODE (GladePropertyShell, glade_property_shell, GTK_TYPE_BOX, G_ADD_PRIVATE (GladePropertyShell) - G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, + G_IMPLEMENT_INTERFACE (GLADE_TYPE_EDITABLE, glade_property_shell_editable_init)); static void @@ -111,38 +111,38 @@ glade_property_shell_class_init (GladePropertyShellClass *klass) g_object_class_install_property (gobject_class, PROP_PROPERTY_NAME, g_param_spec_string ("property-name", _("Property Name"), - _("The property name to use when loading by widget"), - NULL, G_PARAM_READWRITE)); + _("The property name to use when loading by widget"), + NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PACKING, g_param_spec_boolean ("packing", _("Packing"), - _("Whether the property to load is a packing property or not"), - FALSE, G_PARAM_READWRITE)); + _("Whether the property to load is a packing property or not"), + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_USE_COMMAND, g_param_spec_boolean ("use-command", _("Use Command"), - _("Whether to use the GladeCommand API when modifying properties"), - TRUE, G_PARAM_READWRITE)); + _("Whether to use the GladeCommand API when modifying properties"), + TRUE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_EDITOR_TYPE, g_param_spec_string ("editor-type", _("Editor Property Type Name"), - _("Specify the actual editor property type name to use for this shell"), - NULL, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + _("Specify the actual editor property type name to use for this shell"), + NULL, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (gobject_class, PROP_CUSTOM_TEXT, g_param_spec_string ("custom-text", _("Custom Text"), - _("Custom Text to display in the property label"), - NULL, G_PARAM_READWRITE)); + _("Custom Text to display in the property label"), + NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_DISABLE_CHECK, g_param_spec_boolean ("disable-check", _("Disable Check"), - _("Whether to explicitly disable the check button"), - FALSE, G_PARAM_READWRITE)); + _("Whether to explicitly disable the check button"), + FALSE, G_PARAM_READWRITE)); /** * GladePropertyShell::pre-commit: @@ -194,9 +194,9 @@ glade_property_shell_finalize (GObject *object) static void glade_property_shell_set_real_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GladePropertyShell *shell = GLADE_PROPERTY_SHELL (object); GladePropertyShellPrivate *priv = shell->priv; @@ -218,12 +218,12 @@ glade_property_shell_set_real_property (GObject *object, type_name = g_value_get_string (value); if (type_name) - type = glade_util_get_type_from_name (type_name, FALSE); + type = glade_util_get_type_from_name (type_name, FALSE); if (type > 0 && !g_type_is_a (type, GLADE_TYPE_EDITOR_PROPERTY)) - g_warning ("Editor type '%s' is not a GladeEditorProperty", type_name); + g_warning ("Editor type '%s' is not a GladeEditorProperty", type_name); else - priv->editor_type = type; + priv->editor_type = type; break; case PROP_CUSTOM_TEXT: @@ -240,9 +240,9 @@ glade_property_shell_set_real_property (GObject *object, static void glade_property_shell_get_real_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GladePropertyShell *shell = GLADE_PROPERTY_SHELL (object); @@ -274,58 +274,58 @@ glade_property_shell_get_real_property (GObject *object, *******************************************************************************/ static void propagate_pre_commit (GladeEditorProperty *property, - GValue *value, - GladePropertyShell *shell) + GValue *value, + GladePropertyShell *shell) { g_signal_emit (G_OBJECT (shell), glade_property_shell_signals[PRE_COMMIT], 0, value); } static void propagate_post_commit (GladeEditorProperty *property, - GValue *value, - GladePropertyShell *shell) + GValue *value, + GladePropertyShell *shell) { g_signal_emit (G_OBJECT (shell), glade_property_shell_signals[POST_COMMIT], 0, value); } static void glade_property_shell_set_eprop (GladePropertyShell *shell, - GladeEditorProperty *eprop) + GladeEditorProperty *eprop) { GladePropertyShellPrivate *priv = shell->priv; if (priv->property_editor != eprop) { if (priv->property_editor) - { - g_signal_handler_disconnect (priv->property_editor, priv->pre_commit_id); - g_signal_handler_disconnect (priv->property_editor, priv->post_commit_id); - priv->pre_commit_id = 0; - priv->post_commit_id = 0; + { + g_signal_handler_disconnect (priv->property_editor, priv->pre_commit_id); + g_signal_handler_disconnect (priv->property_editor, priv->post_commit_id); + priv->pre_commit_id = 0; + priv->post_commit_id = 0; - gtk_widget_destroy (GTK_WIDGET (priv->property_editor)); - } + gtk_widget_destroy (GTK_WIDGET (priv->property_editor)); + } priv->property_editor = eprop; if (priv->property_editor) - { - glade_editor_property_set_custom_text (priv->property_editor, priv->custom_text); + { + glade_editor_property_set_custom_text (priv->property_editor, priv->custom_text); glade_editor_property_set_disable_check (priv->property_editor, priv->disable_check); - priv->pre_commit_id = g_signal_connect (priv->property_editor, "commit", - G_CALLBACK (propagate_pre_commit), shell); - priv->post_commit_id = g_signal_connect_after (priv->property_editor, "commit", - G_CALLBACK (propagate_post_commit), shell); + priv->pre_commit_id = g_signal_connect (priv->property_editor, "commit", + G_CALLBACK (propagate_pre_commit), shell); + priv->post_commit_id = g_signal_connect_after (priv->property_editor, "commit", + G_CALLBACK (propagate_post_commit), shell); - gtk_container_add (GTK_CONTAINER (shell), GTK_WIDGET (priv->property_editor)); - } + gtk_container_add (GTK_CONTAINER (shell), GTK_WIDGET (priv->property_editor)); + } } } static void glade_property_shell_load (GladeEditable *editable, - GladeWidget *widget) + GladeWidget *widget) { GladePropertyShell *shell = GLADE_PROPERTY_SHELL (editable); GladePropertyShellPrivate *priv; @@ -343,64 +343,64 @@ glade_property_shell_load (GladeEditable *editable, /* Use the parent adaptor if we're a packing property */ if (priv->packing) - { - GladeWidget *parent = glade_widget_get_parent (widget); + { + GladeWidget *parent = glade_widget_get_parent (widget); - if (parent) - adaptor = glade_widget_get_adaptor (parent); - } + if (parent) + adaptor = glade_widget_get_adaptor (parent); + } else - adaptor = glade_widget_get_adaptor (widget); + adaptor = glade_widget_get_adaptor (widget); /* Need to rebuild the internal editor */ if (priv->adaptor != adaptor) - { - GladePropertyClass *pclass = NULL; - GladeEditorProperty *eprop = NULL; - - priv->adaptor = adaptor; - - if (adaptor) - { - if (priv->packing) - pclass = glade_widget_adaptor_get_pack_property_class (priv->adaptor, - priv->property_name); - else - pclass = glade_widget_adaptor_get_property_class (priv->adaptor, - priv->property_name); - } - - /* Be forgiving, allow usage of properties that wont work, so that - * some editors can include properties for subclasses, and hide - * those properties if they're not applicable - */ - if (pclass == NULL) - { - priv->property_editor = NULL; - } - /* Construct custom editor property if specified */ - else if (g_type_is_a (priv->editor_type, GLADE_TYPE_EDITOR_PROPERTY)) - { - eprop = g_object_new (priv->editor_type, - "property-class", pclass, - "use-command", priv->use_command, - NULL); - } - else - { - /* Let the adaptor create one */ - eprop = glade_widget_adaptor_create_eprop_by_name (priv->adaptor, - priv->property_name, - priv->packing, - priv->use_command); - } - - glade_property_shell_set_eprop (shell, eprop); - } + { + GladePropertyClass *pclass = NULL; + GladeEditorProperty *eprop = NULL; + + priv->adaptor = adaptor; + + if (adaptor) + { + if (priv->packing) + pclass = glade_widget_adaptor_get_pack_property_class (priv->adaptor, + priv->property_name); + else + pclass = glade_widget_adaptor_get_property_class (priv->adaptor, + priv->property_name); + } + + /* Be forgiving, allow usage of properties that wont work, so that + * some editors can include properties for subclasses, and hide + * those properties if they're not applicable + */ + if (pclass == NULL) + { + priv->property_editor = NULL; + } + /* Construct custom editor property if specified */ + else if (g_type_is_a (priv->editor_type, GLADE_TYPE_EDITOR_PROPERTY)) + { + eprop = g_object_new (priv->editor_type, + "property-class", pclass, + "use-command", priv->use_command, + NULL); + } + else + { + /* Let the adaptor create one */ + eprop = glade_widget_adaptor_create_eprop_by_name (priv->adaptor, + priv->property_name, + priv->packing, + priv->use_command); + } + + glade_property_shell_set_eprop (shell, eprop); + } /* If we have an editor for the right adaptor, load it */ if (priv->property_editor) - glade_editable_load (GLADE_EDITABLE (priv->property_editor), widget); + glade_editable_load (GLADE_EDITABLE (priv->property_editor), widget); } else if (priv->property_editor) glade_editable_load (GLADE_EDITABLE (priv->property_editor), NULL); @@ -431,7 +431,7 @@ glade_property_shell_new (void) void glade_property_shell_set_property_name (GladePropertyShell *shell, - const gchar *property_name) + const gchar *property_name) { GladePropertyShellPrivate *priv; @@ -458,7 +458,7 @@ glade_property_shell_get_property_name (GladePropertyShell *shell) void glade_property_shell_set_custom_text (GladePropertyShell *shell, - const gchar *custom_text) + const gchar *custom_text) { GladePropertyShellPrivate *priv; @@ -472,7 +472,7 @@ glade_property_shell_set_custom_text (GladePropertyShell *shell, priv->custom_text = g_strdup (custom_text); if (priv->property_editor) - glade_editor_property_set_custom_text (priv->property_editor, custom_text); + glade_editor_property_set_custom_text (priv->property_editor, custom_text); g_object_notify (G_OBJECT (shell), "custom-text"); } @@ -488,7 +488,7 @@ glade_property_shell_get_custom_text (GladePropertyShell *shell) void glade_property_shell_set_packing (GladePropertyShell *shell, - gboolean packing) + gboolean packing) { GladePropertyShellPrivate *priv; @@ -514,7 +514,7 @@ glade_property_shell_get_packing (GladePropertyShell *shell) void glade_property_shell_set_use_command (GladePropertyShell *shell, - gboolean use_command) + gboolean use_command) { GladePropertyShellPrivate *priv; @@ -553,7 +553,7 @@ glade_property_shell_set_disable_check (GladePropertyShell *shell, priv->disable_check = disable_check; if (priv->property_editor) - g_object_set (priv->property_editor, "disable-check", disable_check, NULL); + g_object_set (priv->property_editor, "disable-check", disable_check, NULL); g_object_notify (G_OBJECT (shell), "disable-check"); } diff --git a/gladeui/glade-property-shell.h b/gladeui/glade-property-shell.h index d7bfa35b..6c083e51 100644 --- a/gladeui/glade-property-shell.h +++ b/gladeui/glade-property-shell.h @@ -57,16 +57,16 @@ GType glade_property_shell_get_type (void) G_GNUC_CONST; GtkWidget *glade_property_shell_new (void); void glade_property_shell_set_property_name (GladePropertyShell *shell, - const gchar *property_name); + const gchar *property_name); const gchar *glade_property_shell_get_property_name (GladePropertyShell *shell); void glade_property_shell_set_custom_text (GladePropertyShell *shell, - const gchar *custom_text); + const gchar *custom_text); const gchar *glade_property_shell_get_custom_text (GladePropertyShell *shell); void glade_property_shell_set_packing (GladePropertyShell *shell, - gboolean packing); + gboolean packing); gboolean glade_property_shell_get_packing (GladePropertyShell *shell); void glade_property_shell_set_use_command (GladePropertyShell *shell, - gboolean use_command); + gboolean use_command); gboolean glade_property_shell_get_use_command (GladePropertyShell *shell); void glade_property_shell_set_disable_check (GladePropertyShell *shell, gboolean disable_check); diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c index 8c6588d6..ed061577 100644 --- a/gladeui/glade-property.c +++ b/gladeui/glade-property.c @@ -58,51 +58,51 @@ struct _GladePropertyPrivate { GladePropertyClass *klass; /* A pointer to the GladeProperty that this - * setting specifies - */ + * setting specifies + */ GladeWidget *widget; /* A pointer to the GladeWidget that this - * GladeProperty is modifying - */ + * GladeProperty is modifying + */ GladePropertyState state; /* Current property state, used by editing widgets. - */ - + */ + GValue *value; /* The value of the property - */ + */ gchar *insensitive_tooltip; /* Tooltip to display when in insensitive state - * (used to explain why the property is - * insensitive) - */ + * (used to explain why the property is + * insensitive) + */ gchar *support_warning; /* Tooltip to display when the property - * has format problems - * (used to explain why the property is - * insensitive) - */ + * has format problems + * (used to explain why the property is + * insensitive) + */ guint support_disabled : 1; /* Whether this property is disabled due - * to format conflicts - */ + * to format conflicts + */ guint sensitive : 1; /* Whether this property is sensitive (if the - * property is "optional" this takes precedence). - */ + * property is "optional" this takes precedence). + */ guint enabled : 1; /* Enabled is a flag that is used for GladeProperties - * that have the optional flag set to let us know - * if this widget has this setting enabled or - * not. (Like default size, it can be specified or - * unspecified). This flag also sets the state - * of the property->input state for the loaded - * widget. - */ + * that have the optional flag set to let us know + * if this widget has this setting enabled or + * not. (Like default size, it can be specified or + * unspecified). This flag also sets the state + * of the property->input state for the loaded + * widget. + */ guint save_always : 1; /* Used to make a special case exception and always - * save this property regardless of what the default - * value is (used for some special cases like properties - * that are assigned initial values in composite widgets - * or derived widget code). - */ + * save this property regardless of what the default + * value is (used for some special cases like properties + * that are assigned initial values in composite widgets + * or derived widget code). + */ gint precision; @@ -152,9 +152,9 @@ glade_property_dup_impl (GladeProperty *template_prop, GladeWidget *widget) property = g_object_new (GLADE_TYPE_PROPERTY, "class", template_prop->priv->klass, "i18n-translatable", template_prop->priv->i18n_translatable, - "i18n-context", template_prop->priv->i18n_context, - "i18n-comment", template_prop->priv->i18n_comment, - NULL); + "i18n-context", template_prop->priv->i18n_context, + "i18n-comment", template_prop->priv->i18n_comment, + NULL); property->priv->widget = widget; property->priv->value = g_new0 (GValue, 1); @@ -260,10 +260,10 @@ glade_property_verify (GladeProperty *property, const GValue *value) if (glade_property_class_get_is_packing (property->priv->klass) && parent) ret = glade_widget_adaptor_child_verify_property (glade_widget_get_adaptor (parent), - glade_widget_get_object (parent), - glade_widget_get_object (property->priv->widget), - glade_property_class_id (property->priv->klass), - value); + glade_widget_get_object (parent), + glade_widget_get_object (property->priv->widget), + glade_property_class_id (property->priv->klass), + value); else if (!glade_property_class_get_is_packing (property->priv->klass)) ret = glade_widget_adaptor_verify_property (glade_widget_get_adaptor (property->priv->widget), glade_widget_get_object (property->priv->widget), @@ -284,7 +284,7 @@ glade_property_fix_state (GladeProperty *property) if (glade_property_class_optional (property->priv->klass)) { if (glade_property_get_enabled (property)) - property->priv->state |= GLADE_STATE_CHANGED; + property->priv->state |= GLADE_STATE_CHANGED; } else if (!glade_property_original_default (property)) property->priv->state |= GLADE_STATE_CHANGED; @@ -319,16 +319,16 @@ glade_property_set_value_impl (GladeProperty *property, const GValue *value) if (glade_get_debug_flags () & GLADE_DEBUG_PROPERTIES) { g_print ("PROPERTY: Setting %s property %s on %s ", - glade_property_class_get_is_packing (property->priv->klass) ? "packing" : "normal", - glade_property_class_id (property->priv->klass), - property->priv->widget ? glade_widget_get_name (property->priv->widget) : "unknown"); + glade_property_class_get_is_packing (property->priv->klass) ? "packing" : "normal", + glade_property_class_id (property->priv->klass), + property->priv->widget ? glade_widget_get_name (property->priv->widget) : "unknown"); gchar *str1 = - glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (property->priv->klass), - property->priv->klass, property->priv->value); + glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (property->priv->klass), + property->priv->klass, property->priv->value); gchar *str2 = - glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (property->priv->klass), - property->priv->klass, value); + glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (property->priv->klass), + property->priv->klass, value); g_print ("from %s to %s\n", str1, str2); g_free (str1); g_free (str2); @@ -393,7 +393,7 @@ glade_property_set_value_impl (GladeProperty *property, const GValue *value) /* Update owning widget's warning state if need be */ if (property->priv->widget != NULL && warn_before != warn_after) - glade_widget_verify (property->priv->widget); + glade_widget_verify (property->priv->widget); } /* Special case parentless widget properties */ @@ -511,7 +511,7 @@ glade_property_load_impl (GladeProperty *property) if (g_object_class_find_property (oclass, glade_property_class_id (property->priv->klass))) glade_widget_object_get_property (property->priv->widget, - glade_property_class_id (property->priv->klass), + glade_property_class_id (property->priv->klass), property->priv->value); } @@ -623,8 +623,8 @@ static void glade_property_init (GladeProperty *property) { property->priv = G_TYPE_INSTANCE_GET_PRIVATE (property, - GLADE_TYPE_PROPERTY, - GladePropertyPrivate); + GLADE_TYPE_PROPERTY, + GladePropertyPrivate); property->priv->precision = 2; property->priv->enabled = TRUE; @@ -805,7 +805,7 @@ glade_property_new (GladePropertyClass *klass, if (property->priv->value == NULL) { const GValue *orig_def = - glade_property_class_get_original_default (klass); + glade_property_class_get_original_default (klass); property->priv->value = g_new0 (GValue, 1); g_value_init (property->priv->value, orig_def->g_type); @@ -1176,7 +1176,7 @@ glade_property_read (GladeProperty *property, else { gvalue = - glade_property_class_make_gvalue_from_string (property->priv->klass, value, project); + glade_property_class_make_gvalue_from_string (property->priv->klass, value, project); GLADE_PROPERTY_GET_KLASS (property)->set_value (property, gvalue); @@ -1222,7 +1222,7 @@ glade_property_write (GladeProperty *property, /* This code should work the same for <packing>, <widget> and <template> */ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_PACKING) || glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* There can be a couple of reasons to forcefully save a property */ @@ -1458,7 +1458,7 @@ glade_property_set_sensitive (GladeProperty *property, 0, glade_property_class_get_tooltip (property->priv->klass), property->priv->insensitive_tooltip, - property->priv->support_warning); + property->priv->support_warning); } g_object_notify_by_pspec (G_OBJECT (property), properties[PROP_SENSITIVE]); } @@ -1501,7 +1501,7 @@ glade_property_set_support_warning (GladeProperty *property, 0, glade_property_class_get_tooltip (property->priv->klass), property->priv->insensitive_tooltip, - property->priv->support_warning); + property->priv->support_warning); glade_property_fix_state (property); @@ -1604,12 +1604,12 @@ glade_property_make_string (GladeProperty *property) g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL); return glade_property_class_make_string_from_gvalue (property->priv->klass, - property->priv->value); + property->priv->value); } void glade_property_set_widget (GladeProperty *property, - GladeWidget *widget) + GladeWidget *widget) { g_return_if_fail (GLADE_IS_PROPERTY (property)); diff --git a/gladeui/glade-property.h b/gladeui/glade-property.h index 84eab22a..667f84a6 100644 --- a/gladeui/glade-property.h +++ b/gladeui/glade-property.h @@ -49,7 +49,7 @@ struct _GladePropertyKlass /* Signals */ void (* value_changed) (GladeProperty *, GValue *, GValue *); void (* tooltip_changed) (GladeProperty *, const gchar *, - const gchar *, const gchar *); + const gchar *, const gchar *); void (* glade_reserved1) (void); void (* glade_reserved2) (void); void (* glade_reserved3) (void); @@ -62,11 +62,11 @@ struct _GladePropertyKlass GType glade_property_get_type (void) G_GNUC_CONST; GladeProperty *glade_property_new (GladePropertyClass *klass, - GladeWidget *widget, - GValue *value); + GladeWidget *widget, + GValue *value); GladeProperty *glade_property_dup (GladeProperty *template_prop, - GladeWidget *widget); + GladeWidget *widget); void glade_property_reset (GladeProperty *property); @@ -77,60 +77,60 @@ gboolean glade_property_default (GladeProperty gboolean glade_property_original_default (GladeProperty *property); gboolean glade_property_equals_value (GladeProperty *property, - const GValue *value); + const GValue *value); gboolean glade_property_equals (GladeProperty *property, - ...); + ...); gboolean glade_property_set_value (GladeProperty *property, - const GValue *value); + const GValue *value); gboolean glade_property_set_va_list (GladeProperty *property, - va_list vl); + va_list vl); gboolean glade_property_set (GladeProperty *property, - ...); + ...); void glade_property_get_value (GladeProperty *property, - GValue *value); + GValue *value); void glade_property_get_default (GladeProperty *property, - GValue *value); + GValue *value); void glade_property_get_va_list (GladeProperty *property, - va_list vl); + va_list vl); void glade_property_get (GladeProperty *property, - ...); + ...); void glade_property_add_object (GladeProperty *property, - GObject *object); + GObject *object); void glade_property_remove_object (GladeProperty *property, - GObject *object); + GObject *object); void glade_property_sync (GladeProperty *property); void glade_property_load (GladeProperty *property); void glade_property_read (GladeProperty *property, - GladeProject *project, - GladeXmlNode *node); + GladeProject *project, + GladeXmlNode *node); -void glade_property_write (GladeProperty *property, - GladeXmlContext *context, - GladeXmlNode *node); +void glade_property_write (GladeProperty *property, + GladeXmlContext *context, + GladeXmlNode *node); GladePropertyClass *glade_property_get_class (GladeProperty *property); void glade_property_set_sensitive (GladeProperty *property, - gboolean sensitive, - const gchar *reason); + gboolean sensitive, + const gchar *reason); G_CONST_RETURN gchar *glade_propert_get_insensitive_tooltip(GladeProperty *property); void glade_property_set_support_warning (GladeProperty *property, - gboolean disable, - const gchar *reason); + gboolean disable, + const gchar *reason); G_CONST_RETURN gchar *glade_property_get_support_warning (GladeProperty *property); gboolean glade_property_warn_usage (GladeProperty *property); @@ -139,13 +139,13 @@ gboolean glade_property_get_sensitive (GladeProperty void glade_property_set_save_always (GladeProperty *property, - gboolean setting); + gboolean setting); gboolean glade_property_get_save_always (GladeProperty *property); void glade_property_set_enabled (GladeProperty *property, - gboolean enabled); + gboolean enabled); gboolean glade_property_get_enabled (GladeProperty *property); @@ -154,24 +154,24 @@ gchar *glade_property_make_string (GladeProperty GladeWidget *glade_property_get_widget (GladeProperty *property); void glade_property_set_widget (GladeProperty *property, - GladeWidget *widget); + GladeWidget *widget); GValue *glade_property_inline_value (GladeProperty *property); GladePropertyState glade_property_get_state (GladeProperty *property); void glade_property_i18n_set_comment (GladeProperty *property, - const gchar *str); + const gchar *str); G_CONST_RETURN gchar *glade_property_i18n_get_comment (GladeProperty *property); void glade_property_i18n_set_context (GladeProperty *property, - const gchar *str); + const gchar *str); G_CONST_RETURN gchar *glade_property_i18n_get_context (GladeProperty *property); void glade_property_i18n_set_translatable (GladeProperty *property, - gboolean translatable); + gboolean translatable); gboolean glade_property_i18n_get_translatable (GladeProperty *property); diff --git a/gladeui/glade-signal-class.c b/gladeui/glade-signal-class.c index b797f061..af02908d 100644 --- a/gladeui/glade-signal-class.c +++ b/gladeui/glade-signal-class.c @@ -28,24 +28,24 @@ struct _GladeSignalClass { GladeWidgetAdaptor *adaptor; /* The adaptor that originated this signal. - */ + */ GSignalQuery query; guint16 version_since_major; /* Version in which this signal was */ guint16 version_since_minor; /* introduced - */ + */ const gchar *name; /* Name of the signal, eg clicked */ const gchar *type; /* Name of the object class that this signal - * belongs to eg GtkButton */ + * belongs to eg GtkButton */ guint deprecated : 1; /* True if this signal is deprecated */ }; GladeSignalClass * glade_signal_class_new (GladeWidgetAdaptor *adaptor, - GType for_type, - guint signal_id) + GType for_type, + guint signal_id) { GladeSignalClass *class; @@ -84,20 +84,20 @@ glade_signal_class_free (GladeSignalClass *signal_class) void glade_signal_class_update_from_node (GladeSignalClass *signal_class, - GladeXmlNode *node, - const gchar *domain) + GladeXmlNode *node, + const gchar *domain) { g_return_if_fail (signal_class != NULL); g_return_if_fail (node != NULL); glade_xml_get_property_version (node, GLADE_TAG_VERSION_SINCE, - &signal_class->version_since_major, - &signal_class->version_since_minor); + &signal_class->version_since_major, + &signal_class->version_since_minor); signal_class->deprecated = glade_xml_get_property_boolean (node, - GLADE_TAG_DEPRECATED, - signal_class->deprecated); + GLADE_TAG_DEPRECATED, + signal_class->deprecated); } GladeWidgetAdaptor * @@ -134,8 +134,8 @@ glade_signal_class_get_flags (const GladeSignalClass *signal_class) void glade_signal_class_set_since (GladeSignalClass *signal_class, - guint16 since_major, - guint16 since_minor) + guint16 since_major, + guint16 since_minor) { g_return_if_fail (signal_class != NULL); @@ -161,7 +161,7 @@ glade_signal_class_since_minor (GladeSignalClass *signal_class) void glade_signal_class_set_deprecated (GladeSignalClass *signal_class, - gboolean deprecated) + gboolean deprecated) { g_return_if_fail (signal_class != NULL); diff --git a/gladeui/glade-signal-class.h b/gladeui/glade-signal-class.h index 46e2a537..0330f530 100644 --- a/gladeui/glade-signal-class.h +++ b/gladeui/glade-signal-class.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS * Evaluates to %TRUE if @klass is available in its owning library version-@major_verion.@minor_version. * */ -#define GSC_VERSION_CHECK(klass, major_version, minor_version) \ +#define GSC_VERSION_CHECK(klass, major_version, minor_version) \ ((glade_signal_class_since_major (GLADE_SIGNAL_CLASS (klass)) == major_version) ? \ (glade_signal_class_since_minor (GLADE_SIGNAL_CLASS (klass)) <= minor_version) : \ (glade_signal_class_since_major (GLADE_SIGNAL_CLASS (klass)) <= major_version)) @@ -48,12 +48,12 @@ G_BEGIN_DECLS typedef struct _GladeSignalClass GladeSignalClass; GladeSignalClass *glade_signal_class_new (GladeWidgetAdaptor *adaptor, - GType for_type, - guint signal_id); + GType for_type, + guint signal_id); void glade_signal_class_free (GladeSignalClass *signal_class); void glade_signal_class_update_from_node (GladeSignalClass *signal_class, - GladeXmlNode *node, - const gchar *domain); + GladeXmlNode *node, + const gchar *domain); GladeWidgetAdaptor *glade_signal_class_get_adaptor (const GladeSignalClass *signal_class); G_CONST_RETURN gchar *glade_signal_class_get_name (const GladeSignalClass *signal_class); @@ -61,13 +61,13 @@ G_CONST_RETURN gchar *glade_signal_class_get_type (const GladeSi GSignalFlags glade_signal_class_get_flags (const GladeSignalClass *signal_class); void glade_signal_class_set_since (GladeSignalClass *signal_class, - guint16 since_major, - guint16 since_minor); + guint16 since_major, + guint16 since_minor); guint16 glade_signal_class_since_major (GladeSignalClass *signal_class); guint16 glade_signal_class_since_minor (GladeSignalClass *signal_class); void glade_signal_class_set_deprecated (GladeSignalClass *signal_class, - gboolean deprecated); + gboolean deprecated); gboolean glade_signal_class_deprecated (GladeSignalClass *signal_class); diff --git a/gladeui/glade-signal-editor.c b/gladeui/glade-signal-editor.c index 67d3443f..97b19a56 100644 --- a/gladeui/glade-signal-editor.c +++ b/gladeui/glade-signal-editor.c @@ -49,7 +49,7 @@ struct _GladeSignalEditorPrivate { GtkTreeModel *model; - + GladeWidget *widget; GladeWidgetAdaptor *adaptor; @@ -139,7 +139,7 @@ tree_path_focus_idle (gpointer data) return FALSE; gtk_tree_model_get (self->priv->model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); if (glade_signal_is_dummy (signal)) gtk_tree_view_set_cursor (GTK_TREE_VIEW (self->priv->signal_tree), @@ -166,79 +166,79 @@ on_handler_edited (GtkCellRendererText *renderer, gboolean dummy; g_return_if_fail (self->priv->widget != NULL); - + gtk_tree_model_get_iter (self->priv->model, - &iter, - tree_path); + &iter, + tree_path); gtk_tree_model_get (self->priv->model, &iter, - GLADE_SIGNAL_COLUMN_HANDLER, &old_handler, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); + GLADE_SIGNAL_COLUMN_HANDLER, &old_handler, + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); dummy = glade_signal_is_dummy (signal); - + /* False alarm ? */ if (handler && !g_str_equal (old_handler, handler)) { if (!dummy) - { - if (strlen (handler)) - { - /* change an existing signal handler */ - GladeSignal *old_signal; - GladeSignal *new_signal; - - gtk_tree_model_get (self->priv->model, - &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, - &old_signal, -1); + { + if (strlen (handler)) + { + /* change an existing signal handler */ + GladeSignal *old_signal; + GladeSignal *new_signal; + + gtk_tree_model_get (self->priv->model, + &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, + &old_signal, -1); - new_signal = glade_signal_clone (old_signal); + new_signal = glade_signal_clone (old_signal); - /* Change the new signal handler */ - glade_signal_set_handler (new_signal, handler); + /* Change the new signal handler */ + glade_signal_set_handler (new_signal, handler); - glade_command_change_signal (self->priv->widget, old_signal, new_signal); + glade_command_change_signal (self->priv->widget, old_signal, new_signal); g_object_unref (old_signal); - g_object_unref (new_signal); - } - else - { - GladeSignal *deleted_signal; - gtk_tree_model_get (self->priv->model, - &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, - &deleted_signal, -1); - - - /* Delete signal */ - glade_command_remove_signal (self->priv->widget, deleted_signal); - } - } + g_object_unref (new_signal); + } + else + { + GladeSignal *deleted_signal; + gtk_tree_model_get (self->priv->model, + &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, + &deleted_signal, -1); + + + /* Delete signal */ + glade_command_remove_signal (self->priv->widget, deleted_signal); + } + } else if (strlen (handler)) - { - GladeSignal *new_signal; - - /* Get the signal name */ - gtk_tree_model_get (self->priv->model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); - - /* Add a new signal handler */ - new_signal = glade_signal_new (glade_signal_get_class (signal), + { + GladeSignal *new_signal; + + /* Get the signal name */ + gtk_tree_model_get (self->priv->model, &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); + + /* Add a new signal handler */ + new_signal = glade_signal_new (glade_signal_get_class (signal), handler, NULL, FALSE, FALSE); glade_signal_set_detail (new_signal, glade_signal_get_detail (signal)); - glade_command_add_signal (self->priv->widget, new_signal); + glade_command_add_signal (self->priv->widget, new_signal); glade_signal_set_detail (signal, NULL); - g_object_unref (new_signal); + g_object_unref (new_signal); glade_signal_editor_take_target_focus_path (self, tree_path); /* make sure we do not free the path here as * glade_signal_editor_take_target_focus_path() takes ownership **/ tree_path = NULL; - } + } } g_object_unref (signal); @@ -248,7 +248,7 @@ on_handler_edited (GtkCellRendererText *renderer, static gchar ** glade_signal_editor_callback_suggestions (GladeSignalEditor *editor, - GladeSignal *signal) + GladeSignal *signal) { GladeWidget *widget = glade_signal_editor_get_widget (editor); gchar *signal_name, **suggestions = g_new (gchar *, 10); @@ -345,11 +345,11 @@ on_detail_editing_started (GtkCellRenderer *renderer, gtk_tree_path_free (tree_path); gtk_tree_model_get (priv->model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (glade_signal_get_detail (signal) == NULL) - gtk_entry_set_text (entry, ""); + gtk_entry_set_text (entry, ""); g_object_unref (signal); @@ -388,11 +388,11 @@ on_detail_edited (GtkCellRendererText *renderer, gchar *old_detail; g_return_if_fail (self->priv->widget != NULL); - + gtk_tree_model_get_iter (self->priv->model, &iter, tree_path); gtk_tree_model_get (self->priv->model, &iter, - GLADE_SIGNAL_COLUMN_DETAIL, &old_detail, -1); + GLADE_SIGNAL_COLUMN_DETAIL, &old_detail, -1); if (detail && strlen (detail) && g_strcmp0 (old_detail, detail)) { @@ -445,11 +445,11 @@ on_handler_editing_started (GtkCellRenderer *renderer, gtk_tree_path_free (tree_path); gtk_tree_model_get (priv->model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (glade_signal_is_dummy (signal)) - gtk_entry_set_text (entry, ""); + gtk_entry_set_text (entry, ""); g_signal_emit (self, glade_signal_editor_signals [CALLBACK_SUGGESTIONS], 0, signal, &suggestions); @@ -486,15 +486,15 @@ glade_signal_editor_user_data_activate (GtkCellRenderer *icon_renderer, GladeProject *project; GladeSignal *signal; - + GList *selected = NULL; GList *exception = NULL; gboolean dummy; - + gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); dummy = glade_signal_is_dummy (signal); if (!dummy) @@ -502,29 +502,29 @@ glade_signal_editor_user_data_activate (GtkCellRenderer *icon_renderer, project = glade_widget_get_project (priv->widget); if (glade_signal_get_userdata (signal)) - { - project_object = - glade_project_get_widget_by_name (project, glade_signal_get_userdata (signal)); - selected = g_list_prepend (selected, project_object); - } + { + project_object = + glade_project_get_widget_by_name (project, glade_signal_get_userdata (signal)); + selected = g_list_prepend (selected, project_object); + } exception = g_list_prepend (exception, priv->widget); if (glade_editor_property_show_object_dialog (project, - _("Select an object to pass to the handler"), - gtk_widget_get_toplevel (GTK_WIDGET (editor)), - G_TYPE_OBJECT, priv->widget, - &project_object)) - { - GladeSignal *old_signal = signal; - GladeSignal *new_signal = glade_signal_clone (signal); - - glade_signal_set_userdata (new_signal, - project_object ? glade_widget_get_name (project_object) : NULL); - - glade_command_change_signal (priv->widget, old_signal, new_signal); - g_object_unref (new_signal); - } + _("Select an object to pass to the handler"), + gtk_widget_get_toplevel (GTK_WIDGET (editor)), + G_TYPE_OBJECT, priv->widget, + &project_object)) + { + GladeSignal *old_signal = signal; + GladeSignal *new_signal = glade_signal_clone (signal); + + glade_signal_set_userdata (new_signal, + project_object ? glade_widget_get_name (project_object) : NULL); + + glade_command_change_signal (priv->widget, old_signal, new_signal); + g_object_unref (new_signal); + } } g_object_unref (signal); gtk_tree_path_free (path); @@ -542,28 +542,28 @@ on_swap_toggled (GtkCellRendererToggle *renderer, GladeSignal *new_signal; g_return_if_fail (self->priv->widget != NULL); - + gtk_tree_model_get_iter (self->priv->model, - &iter, - tree_path); + &iter, + tree_path); gtk_tree_model_get (self->priv->model, - &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, - &old_signal, -1); + &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, + &old_signal, -1); new_signal = glade_signal_clone (old_signal); /* Change the new signal handler */ glade_signal_set_swapped (new_signal, - !gtk_cell_renderer_toggle_get_active (renderer)); + !gtk_cell_renderer_toggle_get_active (renderer)); glade_command_change_signal (self->priv->widget, old_signal, new_signal); g_object_unref (new_signal); g_object_unref (old_signal); - gtk_tree_path_free (tree_path); + gtk_tree_path_free (tree_path); } static void @@ -578,28 +578,28 @@ on_after_toggled (GtkCellRendererToggle *renderer, GladeSignal *new_signal; g_return_if_fail (self->priv->widget != NULL); - + gtk_tree_model_get_iter (self->priv->model, - &iter, - tree_path); + &iter, + tree_path); gtk_tree_model_get (self->priv->model, - &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, - &old_signal, -1); + &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, + &old_signal, -1); new_signal = glade_signal_clone (old_signal); /* Change the new signal handler */ glade_signal_set_after (new_signal, - !gtk_cell_renderer_toggle_get_active (renderer)); + !gtk_cell_renderer_toggle_get_active (renderer)); glade_command_change_signal (self->priv->widget, old_signal, new_signal); g_object_unref (new_signal); g_object_unref (old_signal); - - gtk_tree_path_free (tree_path); + + gtk_tree_path_free (tree_path); } static void @@ -615,14 +615,14 @@ glade_signal_editor_devhelp (GtkCellRenderer *cell, const GladeSignalClass *signal_class; GladeSignal *signal; gchar *book; - gchar *search; + gchar *search; g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path)); gtk_tree_path_free (path); gtk_tree_model_get (model, &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); signal_class = glade_signal_get_class (signal); adaptor = glade_signal_class_get_adaptor (signal_class); g_object_get (adaptor, "book", &book, NULL); @@ -638,9 +638,9 @@ glade_signal_editor_devhelp (GtkCellRenderer *cell, static void glade_signal_editor_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { GladeSignalEditor *self = GLADE_SIGNAL_EDITOR (object); GladeSignalEditorPrivate *priv = self->priv; @@ -658,9 +658,9 @@ glade_signal_editor_get_property (GObject *object, static void glade_signal_editor_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GladeSignalEditor *self = GLADE_SIGNAL_EDITOR (object); @@ -686,14 +686,14 @@ glade_signal_editor_new () GladeSignalEditor *signal_editor; signal_editor = GLADE_SIGNAL_EDITOR (g_object_new (GLADE_TYPE_SIGNAL_EDITOR, - NULL, NULL)); + NULL, NULL)); return signal_editor; } static gint find_adaptor_by_name (GladeWidgetAdaptor *adaptor, - const gchar *name) + const gchar *name) { return g_strcmp0 (glade_widget_adaptor_get_name (adaptor), name); } @@ -708,29 +708,28 @@ find_adaptor_by_name (GladeWidgetAdaptor *adaptor, */ void glade_signal_editor_load_widget (GladeSignalEditor *editor, - GladeWidget *widget) + GladeWidget *widget) { GladeSignalEditorPrivate *priv = editor->priv; GList *signals, *l, *adaptors = NULL; GtkTreePath *path; GtkTreeIter iter; gboolean valid; - + if (priv->widget != widget) - { + { priv->widget = widget; priv->adaptor = widget ? glade_widget_get_adaptor (widget) : NULL; - + if (priv->widget) - { - g_object_ref (priv->widget); - } + { + g_object_ref (priv->widget); + } } gtk_tree_view_set_model (GTK_TREE_VIEW (priv->signal_tree), NULL); priv->model = NULL; - if (!widget) return; @@ -756,7 +755,7 @@ glade_signal_editor_load_widget (GladeSignalEditor *editor, adaptor = glade_signal_class_get_adaptor (signal_class); if (!g_list_find (adaptors, adaptor)) - adaptors = g_list_prepend (adaptors, adaptor); + adaptors = g_list_prepend (adaptors, adaptor); } g_list_free (signals); @@ -767,15 +766,15 @@ glade_signal_editor_load_widget (GladeSignalEditor *editor, gchar *name = NULL; gtk_tree_model_get (priv->model, &iter, - GLADE_SIGNAL_COLUMN_NAME, &name, - -1); + GLADE_SIGNAL_COLUMN_NAME, &name, + -1); if (g_list_find_custom (adaptors, name, (GCompareFunc)find_adaptor_by_name)) - { - path = gtk_tree_model_get_path (priv->model, &iter); - gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->signal_tree), path, FALSE); - gtk_tree_path_free (path); - } + { + path = gtk_tree_model_get_path (priv->model, &iter); + gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->signal_tree), path, FALSE); + gtk_tree_path_free (path); + } g_free (name); valid = gtk_tree_model_iter_next (priv->model, &iter); @@ -801,16 +800,16 @@ glade_signal_editor_enable_dnd (GladeSignalEditor *editor, gboolean enabled) if (enabled) { const GtkTargetEntry entry = { - "application/x-glade-signal", - GTK_TARGET_OTHER_WIDGET, - 1 + "application/x-glade-signal", + GTK_TARGET_OTHER_WIDGET, + 1 }; /* DND */ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW(priv->signal_tree), - GDK_BUTTON1_MASK, - &entry, - 1, - GDK_ACTION_COPY); + GDK_BUTTON1_MASK, + &entry, + 1, + GDK_ACTION_COPY); } else { @@ -840,7 +839,7 @@ create_rich_drag_surface (GtkWidget *widget, const gchar *text) cairo_surface_t *s; gint width, height; GdkRGBA rgba; - + pango_layout_set_text (layout, text, -1); pango_layout_get_size (layout, &width, &height); width = PANGO_PIXELS(width) + BORDER; @@ -866,7 +865,7 @@ create_rich_drag_surface (GtkWidget *widget, const gchar *text) cairo_destroy (cr); g_object_unref (layout); - + return s; } @@ -887,7 +886,7 @@ glade_signal_editor_drag_begin (GtkWidget *widget, gchar* handler; gchar* text; gtk_tree_model_get (model, &iter, - GLADE_SIGNAL_COLUMN_HANDLER, &handler, -1); + GLADE_SIGNAL_COLUMN_HANDLER, &handler, -1); text = g_strdup_printf ("%s ()", handler); g_free (handler); @@ -895,7 +894,7 @@ glade_signal_editor_drag_begin (GtkWidget *widget, s = create_rich_drag_surface (widget, text); g_free (text); } - + if (s) { gtk_drag_set_icon_surface (context, s); @@ -919,36 +918,36 @@ glade_signal_editor_name_cell_data_func (GtkTreeViewColumn *column, gboolean show_name; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - GLADE_SIGNAL_COLUMN_SHOW_NAME, &show_name, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + GLADE_SIGNAL_COLUMN_SHOW_NAME, &show_name, + -1); if (signal) { gboolean dummy; - + dummy = glade_signal_is_dummy (signal); if (!dummy && show_name) - { - g_object_set (renderer, - "weight", PANGO_WEIGHT_BOLD, - NULL); - } + { + g_object_set (renderer, + "weight", PANGO_WEIGHT_BOLD, + NULL); + } else - { - g_object_set (renderer, - "weight", PANGO_WEIGHT_NORMAL, - NULL); - } + { + g_object_set (renderer, + "weight", PANGO_WEIGHT_NORMAL, + NULL); + } g_object_unref (signal); } else g_object_set (renderer, - "weight", PANGO_WEIGHT_NORMAL, - NULL); - + "weight", PANGO_WEIGHT_NORMAL, + NULL); + g_object_set (renderer, - "visible", show_name, - NULL); + "visible", show_name, + NULL); } static void @@ -963,51 +962,51 @@ glade_signal_editor_handler_cell_data_func (GtkTreeViewColumn *column, GdkRGBA color; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (signal) { gboolean dummy; GtkStyleContext* context = gtk_widget_get_style_context (editor->priv->signal_tree); - + dummy = glade_signal_is_dummy (signal); if (dummy) - { + { gtk_style_context_save (context); gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_INSENSITIVE); - gtk_style_context_get_color (context, + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); - g_object_set (renderer, - "style", PANGO_STYLE_ITALIC, - "foreground-rgba", &color, - NULL); + g_object_set (renderer, + "style", PANGO_STYLE_ITALIC, + "foreground-rgba", &color, + NULL); gtk_style_context_restore (context); - } + } else - { - gtk_style_context_get_color (context, - gtk_style_context_get_state (context), - &color); - g_object_set (renderer, - "style", PANGO_STYLE_NORMAL, - "foreground-rgba", &color, - NULL); - } + { + gtk_style_context_get_color (context, + gtk_style_context_get_state (context), + &color); + g_object_set (renderer, + "style", PANGO_STYLE_NORMAL, + "foreground-rgba", &color, + NULL); + } g_object_set (renderer, - "visible", TRUE, - "sensitive", TRUE, - "editable", TRUE, - NULL); + "visible", TRUE, + "sensitive", TRUE, + "editable", TRUE, + NULL); g_object_unref (signal); } else { g_object_set (renderer, - "visible", FALSE, - "editable", FALSE, - NULL); + "visible", FALSE, + "editable", FALSE, + NULL); } } @@ -1022,8 +1021,8 @@ glade_signal_editor_detail_cell_data_func (GtkTreeViewColumn *column, GladeSignal *signal; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (signal && (glade_signal_class_get_flags (glade_signal_get_class (signal)) & G_SIGNAL_DETAILED)) { @@ -1033,28 +1032,28 @@ glade_signal_editor_detail_cell_data_func (GtkTreeViewColumn *column, dummy = glade_signal_is_dummy (signal); if (dummy || !glade_signal_get_detail (signal)) - { + { gtk_style_context_save (context); gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_INSENSITIVE); - gtk_style_context_get_color (context, - gtk_style_context_get_state (context), + gtk_style_context_get_color (context, + gtk_style_context_get_state (context), &color); - g_object_set (renderer, - "style", PANGO_STYLE_ITALIC, - "foreground-rgba", &color, - NULL); + g_object_set (renderer, + "style", PANGO_STYLE_ITALIC, + "foreground-rgba", &color, + NULL); gtk_style_context_restore (context); - } + } else - { - gtk_style_context_get_color (context, - gtk_style_context_get_state (context), - &color); - g_object_set (renderer, - "style", PANGO_STYLE_NORMAL, - "foreground-rgba", &color, - NULL); - } + { + gtk_style_context_get_color (context, + gtk_style_context_get_state (context), + &color); + g_object_set (renderer, + "style", PANGO_STYLE_NORMAL, + "foreground-rgba", &color, + NULL); + } g_object_set (renderer, "sensitive", TRUE, @@ -1069,8 +1068,8 @@ glade_signal_editor_detail_cell_data_func (GtkTreeViewColumn *column, g_object_set (renderer, "editable", FALSE, "sensitive", FALSE, - "visible", FALSE, - NULL); + "visible", FALSE, + NULL); } } @@ -1086,55 +1085,55 @@ glade_signal_editor_data_cell_data_func (GtkTreeViewColumn *column, GdkRGBA color; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (signal) { gboolean dummy; - + dummy = glade_signal_is_dummy (signal); g_object_set (renderer, - "sensitive", !dummy, - "visible", TRUE, - NULL); + "sensitive", !dummy, + "visible", TRUE, + NULL); if (GTK_IS_CELL_RENDERER_TEXT (renderer)) - { - GtkStyleContext* context = gtk_widget_get_style_context (editor->priv->signal_tree); + { + GtkStyleContext* context = gtk_widget_get_style_context (editor->priv->signal_tree); - if (dummy || !glade_signal_get_userdata (signal)) - { + if (dummy || !glade_signal_get_userdata (signal)) + { gtk_style_context_save (context); gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_INSENSITIVE); - gtk_style_context_get_color (context, + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); - g_object_set (renderer, - "style", PANGO_STYLE_ITALIC, - "foreground-rgba", &color, - NULL); + g_object_set (renderer, + "style", PANGO_STYLE_ITALIC, + "foreground-rgba", &color, + NULL); gtk_style_context_restore (context); - } - else - { - gtk_style_context_get_color (context, + } + else + { + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); - g_object_set (renderer, - "style", PANGO_STYLE_NORMAL, - "foreground-rgba", &color, - NULL); - } - } + g_object_set (renderer, + "style", PANGO_STYLE_NORMAL, + "foreground-rgba", &color, + NULL); + } + } g_object_unref (signal); } else { g_object_set (renderer, - "sensitive", FALSE, - "visible", FALSE, - NULL); + "sensitive", FALSE, + "visible", FALSE, + NULL); } } @@ -1150,9 +1149,9 @@ glade_signal_editor_warning_cell_data_func (GtkTreeViewColumn *column, gboolean show_name; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - GLADE_SIGNAL_COLUMN_SHOW_NAME, &show_name, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + GLADE_SIGNAL_COLUMN_SHOW_NAME, &show_name, + -1); if (signal) { @@ -1160,10 +1159,10 @@ glade_signal_editor_warning_cell_data_func (GtkTreeViewColumn *column, visible = warning && strlen (warning); g_object_unref (signal); } - + g_object_set (renderer, - "visible", (visible && show_name), - NULL); + "visible", (visible && show_name), + NULL); } static void @@ -1176,8 +1175,8 @@ glade_signal_editor_devhelp_cell_data_func (GtkTreeViewColumn *column, GladeSignal *signal; gtk_tree_model_get (model, iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); if (signal) { const GladeSignalClass *class = glade_signal_get_class (signal); @@ -1186,16 +1185,16 @@ glade_signal_editor_devhelp_cell_data_func (GtkTreeViewColumn *column, g_object_get (adaptor, "book", &book, NULL); g_object_set (renderer, - "visible", book != NULL, - NULL); + "visible", book != NULL, + NULL); g_free (book); g_object_unref (signal); } else { g_object_set (renderer, - "visible", FALSE, - NULL); + "visible", FALSE, + NULL); } } @@ -1251,47 +1250,47 @@ glade_signal_editor_init (GladeSignalEditor *self) GtkCellRenderer *renderer; GtkCellArea *cell_area; GladeSignalEditorPrivate *priv; - + self->priv = glade_signal_editor_get_instance_private (self); priv = self->priv; - + /* Create signal tree */ priv->signal_tree = gtk_tree_view_new (); g_signal_connect (G_OBJECT (priv->signal_tree), "row-activated", - G_CALLBACK (glade_signal_editor_signal_activate), - self); + G_CALLBACK (glade_signal_editor_signal_activate), + self); /* Create columns */ /* Signal name */ priv->column_name = gtk_tree_view_column_new (); - + /* version warning */ renderer = gtk_cell_renderer_pixbuf_new (); g_object_set (G_OBJECT (renderer), - "icon-name", "dialog-warning", - "xalign", 0.0, + "icon-name", "dialog-warning", + "xalign", 0.0, NULL); gtk_tree_view_column_set_cell_data_func (priv->column_name, renderer, - glade_signal_editor_warning_cell_data_func, - self, - NULL); + glade_signal_editor_warning_cell_data_func, + self, + NULL); gtk_tree_view_column_pack_start (priv->column_name, renderer, FALSE); /* signal name */ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), - "ellipsize", PANGO_ELLIPSIZE_END, - "width-chars", 20, - NULL); + "ellipsize", PANGO_ELLIPSIZE_END, + "width-chars", 20, + NULL); gtk_tree_view_column_pack_end (priv->column_name, renderer, TRUE); gtk_tree_view_column_set_attributes (priv->column_name, renderer, - "text", GLADE_SIGNAL_COLUMN_NAME, - NULL); + "text", GLADE_SIGNAL_COLUMN_NAME, + NULL); gtk_tree_view_column_set_cell_data_func (priv->column_name, renderer, - glade_signal_editor_name_cell_data_func, - self, - NULL); + glade_signal_editor_name_cell_data_func, + self, + NULL); gtk_tree_view_column_set_resizable (priv->column_name, TRUE); gtk_tree_view_column_set_expand (priv->column_name, TRUE); @@ -1308,9 +1307,9 @@ glade_signal_editor_init (GladeSignalEditor *self) "text", GLADE_SIGNAL_COLUMN_DETAIL, NULL); gtk_tree_view_column_set_cell_data_func (priv->column_detail, renderer, - glade_signal_editor_detail_cell_data_func, - self, - NULL); + glade_signal_editor_detail_cell_data_func, + self, + NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->signal_tree), priv->column_detail); /* Signal handler */ @@ -1319,50 +1318,50 @@ glade_signal_editor_init (GladeSignalEditor *self) g_signal_connect (renderer, "edited", G_CALLBACK(on_handler_edited), self); g_signal_connect (renderer, "editing-started", G_CALLBACK (on_handler_editing_started), self); priv->column_handler = gtk_tree_view_column_new_with_attributes (_("Handler"), - renderer, - "text", GLADE_SIGNAL_COLUMN_HANDLER, - NULL); + renderer, + "text", GLADE_SIGNAL_COLUMN_HANDLER, + NULL); gtk_tree_view_column_set_cell_data_func (priv->column_handler, renderer, - glade_signal_editor_handler_cell_data_func, - self, - NULL); + glade_signal_editor_handler_cell_data_func, + self, + NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->signal_tree), priv->column_handler); /* Signal user_data */ priv->renderer_userdata = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (priv->renderer_userdata), - "editable", FALSE, - "ellipsize", PANGO_ELLIPSIZE_END, - "width-chars", 10, NULL); + "editable", FALSE, + "ellipsize", PANGO_ELLIPSIZE_END, + "width-chars", 10, NULL); cell_area = gtk_cell_area_box_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cell_area), - priv->renderer_userdata, - TRUE); + priv->renderer_userdata, + TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (cell_area), - priv->renderer_userdata, - "text", GLADE_SIGNAL_COLUMN_OBJECT, - NULL); - + priv->renderer_userdata, + "text", GLADE_SIGNAL_COLUMN_OBJECT, + NULL); + renderer = glade_cell_renderer_icon_new (); g_object_set (G_OBJECT (renderer), "icon-name", "gtk-edit", NULL); g_signal_connect (G_OBJECT (renderer), "activate", - G_CALLBACK (glade_signal_editor_user_data_activate), - self); + G_CALLBACK (glade_signal_editor_user_data_activate), + self); gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (cell_area), renderer, FALSE); gtk_cell_area_add_focus_sibling (cell_area, - renderer, - priv->renderer_userdata); - + renderer, + priv->renderer_userdata); + priv->column_userdata = gtk_tree_view_column_new_with_area (cell_area); gtk_tree_view_column_set_title (priv->column_userdata, _("User data")); gtk_tree_view_column_set_cell_data_func (priv->column_userdata, priv->renderer_userdata, - glade_signal_editor_data_cell_data_func, - self, NULL); + glade_signal_editor_data_cell_data_func, + self, NULL); gtk_tree_view_column_set_cell_data_func (priv->column_userdata, renderer, - glade_signal_editor_data_cell_data_func, - self, NULL); + glade_signal_editor_data_cell_data_func, + self, NULL); gtk_tree_view_column_set_resizable (priv->column_userdata, TRUE); gtk_tree_view_column_set_expand (priv->column_userdata, TRUE); @@ -1372,15 +1371,15 @@ glade_signal_editor_init (GladeSignalEditor *self) renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (renderer, "toggled", G_CALLBACK (on_swap_toggled), self); priv->column_swap = gtk_tree_view_column_new_with_attributes (_("Swap"), - renderer, - "active", GLADE_SIGNAL_COLUMN_SWAP, - NULL); + renderer, + "active", GLADE_SIGNAL_COLUMN_SWAP, + NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->signal_tree), priv->column_swap); gtk_tree_view_column_set_cell_data_func (priv->column_swap, renderer, - glade_signal_editor_data_cell_data_func, - self, - NULL); - + glade_signal_editor_data_cell_data_func, + self, + NULL); + /* After */ cell_area = gtk_cell_area_box_new (); renderer = gtk_cell_renderer_toggle_new (); @@ -1392,12 +1391,12 @@ glade_signal_editor_init (GladeSignalEditor *self) gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->signal_tree), priv->column_after); gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_area), - renderer, FALSE, TRUE, FALSE); + renderer, FALSE, TRUE, FALSE); gtk_cell_area_attribute_connect (cell_area, renderer, "active", GLADE_SIGNAL_COLUMN_AFTER); gtk_tree_view_column_set_cell_data_func (priv->column_after, renderer, - glade_signal_editor_data_cell_data_func, - self, NULL); - + glade_signal_editor_data_cell_data_func, + self, NULL); + /* Devhelp */ if (glade_util_have_devhelp ()) { @@ -1406,44 +1405,44 @@ glade_signal_editor_init (GladeSignalEditor *self) g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL); if (gtk_icon_theme_has_icon - (gtk_icon_theme_get_default (), GLADE_DEVHELP_ICON_NAME)) - g_object_set (G_OBJECT (renderer), "icon-name", GLADE_DEVHELP_ICON_NAME, - NULL); + (gtk_icon_theme_get_default (), GLADE_DEVHELP_ICON_NAME)) + g_object_set (G_OBJECT (renderer), "icon-name", GLADE_DEVHELP_ICON_NAME, + NULL); else - g_object_set (G_OBJECT (renderer), "icon-name", "dialog-information", NULL); + g_object_set (G_OBJECT (renderer), "icon-name", "dialog-information", NULL); g_signal_connect (G_OBJECT (renderer), "activate", - G_CALLBACK (glade_signal_editor_devhelp), self); + G_CALLBACK (glade_signal_editor_devhelp), self); gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (cell_area), - renderer, FALSE, TRUE, FALSE); + renderer, FALSE, TRUE, FALSE); gtk_tree_view_column_set_cell_data_func (priv->column_after, renderer, - glade_signal_editor_devhelp_cell_data_func, - self, - NULL); + glade_signal_editor_devhelp_cell_data_func, + self, + NULL); } - + /* Tooltips */ gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (self->priv->signal_tree), - GLADE_SIGNAL_COLUMN_TOOLTIP); + GLADE_SIGNAL_COLUMN_TOOLTIP); /* Create scrolled window */ scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scroll), self->priv->signal_tree); - + gtk_box_pack_start (GTK_BOX (self), scroll, TRUE, TRUE, 0); /* Dnd */ g_signal_connect_after (self->priv->signal_tree, - "drag-begin", - G_CALLBACK(glade_signal_editor_drag_begin), - self); + "drag-begin", + G_CALLBACK(glade_signal_editor_drag_begin), + self); /* Detail completion */ priv->detail_store = gtk_list_store_new (1, G_TYPE_STRING); @@ -1453,7 +1452,7 @@ glade_signal_editor_init (GladeSignalEditor *self) /* Emit created signal */ g_signal_emit_by_name (glade_app_get(), "signal-editor-created", self); - + gtk_widget_show_all (GTK_WIDGET(self)); } @@ -1533,8 +1532,8 @@ glade_signal_editor_class_init (GladeSignalEditorClass *klass) g_object_class_install_property (object_class, PROP_GLADE_WIDGET, g_param_spec_object ("glade-widget", - _("Glade Widget"), - _("The glade widget to edit signals"), - GTK_TYPE_TREE_MODEL, - G_PARAM_READWRITE)); + _("Glade Widget"), + _("The glade widget to edit signals"), + GTK_TYPE_TREE_MODEL, + G_PARAM_READWRITE)); } diff --git a/gladeui/glade-signal-editor.h b/gladeui/glade-signal-editor.h index e8fef6b4..1fb75d54 100644 --- a/gladeui/glade-signal-editor.h +++ b/gladeui/glade-signal-editor.h @@ -43,7 +43,7 @@ GType glade_signal_editor_get_type (void) G_GNUC_CONST; GladeSignalEditor *glade_signal_editor_new (void); void glade_signal_editor_load_widget (GladeSignalEditor *editor, - GladeWidget *widget); + GladeWidget *widget); GladeWidget *glade_signal_editor_get_widget (GladeSignalEditor *editor); void glade_signal_editor_enable_dnd (GladeSignalEditor *editor, gboolean enabled); diff --git a/gladeui/glade-signal-model.c b/gladeui/glade-signal-model.c index 4d1a8a40..0fc13177 100644 --- a/gladeui/glade-signal-model.c +++ b/gladeui/glade-signal-model.c @@ -50,11 +50,11 @@ enum static void gtk_tree_model_iface_init (GtkTreeModelIface *iface); static void gtk_tree_drag_source_iface_init (GtkTreeDragSourceIface *iface); static void on_glade_signal_model_added (GladeWidget *widget, const GladeSignal *signal, - GladeSignalModel *model); + GladeSignalModel *model); static void on_glade_signal_model_removed (GladeWidget *widget, const GladeSignal *signal, - GladeSignalModel *model); + GladeSignalModel *model); static void on_glade_signal_model_changed (GladeWidget *widget, const GladeSignal *signal, - GladeSignalModel *model); + GladeSignalModel *model); static void on_glade_widget_support_changed (GladeWidget *widget, GladeSignalModel *model); G_DEFINE_TYPE_WITH_CODE (GladeSignalModel, glade_signal_model, G_TYPE_OBJECT, @@ -86,11 +86,11 @@ glade_signal_model_create_widget_list (GladeSignalModel *sig_model) GladeSignalClass *signal = (GladeSignalClass *) list->data; if (!g_list_find_custom (sig_model->priv->widgets, - (gpointer) glade_signal_class_get_type (signal), (GCompareFunc) strcmp)) - { - sig_model->priv->widgets = - g_list_prepend (sig_model->priv->widgets, (gpointer) glade_signal_class_get_type (signal)); - } + (gpointer) glade_signal_class_get_type (signal), (GCompareFunc) strcmp)) + { + sig_model->priv->widgets = + g_list_prepend (sig_model->priv->widgets, (gpointer) glade_signal_class_get_type (signal)); + } } sig_model->priv->widgets = g_list_reverse (sig_model->priv->widgets); } @@ -176,18 +176,18 @@ glade_signal_model_class_init (GladeSignalModelClass *klass) object_class->get_property = glade_signal_model_get_property; g_object_class_install_property (object_class, - PROP_WIDGET, - g_param_spec_object ("widget", - "A GladeWidget", - "The GladeWidget used to query the signals", - GLADE_TYPE_WIDGET, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); + PROP_WIDGET, + g_param_spec_object ("widget", + "A GladeWidget", + "The GladeWidget used to query the signals", + GLADE_TYPE_WIDGET, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); g_object_class_install_property (object_class, - PROP_SIGNALS, - g_param_spec_pointer ("signals", - "A GHashTable containing the widget signals", - "Use to query signals", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); + PROP_SIGNALS, + g_param_spec_pointer ("signals", + "A GHashTable containing the widget signals", + "Use to query signals", + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); } /* @@ -203,8 +203,8 @@ GtkTreeModel * glade_signal_model_new (GladeWidget *widget, GHashTable *signals) { GObject *object = g_object_new (GLADE_TYPE_SIGNAL_MODEL, - "widget", widget, - "signals", signals, NULL); + "widget", widget, + "signals", signals, NULL); return GTK_TREE_MODEL (object); } @@ -257,30 +257,30 @@ enum static inline gboolean glade_signal_model_is_dummy_handler (GladeSignalModel *model, - GladeSignal *signal) + GladeSignal *signal) { return glade_signal_get_handler (signal) == NULL; } static GladeSignal * -glade_signal_model_get_dummy_handler (GladeSignalModel *model, +glade_signal_model_get_dummy_handler (GladeSignalModel *model, const GladeSignalClass *sig_class) { GladeSignal *signal; signal = g_hash_table_lookup (model->priv->dummy_signals, - glade_signal_class_get_name (sig_class)); + glade_signal_class_get_name (sig_class)); if (!signal) { signal = glade_signal_new (sig_class, - NULL, - NULL, - FALSE, - FALSE); + NULL, + NULL, + FALSE, + FALSE); g_hash_table_insert (model->priv->dummy_signals, - (gpointer) glade_signal_class_get_name (sig_class), - signal); + (gpointer) glade_signal_class_get_name (sig_class), + signal); glade_project_verify_signal (model->priv->widget, signal); } @@ -289,8 +289,8 @@ glade_signal_model_get_dummy_handler (GladeSignalModel *model, static void glade_signal_model_create_widget_iter (GladeSignalModel *sig_model, - const gchar *widget, - GtkTreeIter *iter) + const gchar *widget, + GtkTreeIter *iter) { iter->stamp = sig_model->priv->stamp; iter->user_data = (gpointer) widget; @@ -299,18 +299,18 @@ glade_signal_model_create_widget_iter (GladeSignalModel *sig_model, } static void -glade_signal_model_create_signal_iter (GladeSignalModel *sig_model, - const gchar *widget, +glade_signal_model_create_signal_iter (GladeSignalModel *sig_model, + const gchar *widget, const GladeSignal *signal, - GtkTreeIter *iter) + GtkTreeIter *iter) { - glade_signal_model_create_widget_iter (sig_model, widget, iter); - iter->user_data2 = GLADE_SIGNAL (signal); + glade_signal_model_create_widget_iter (sig_model, widget, iter); + iter->user_data2 = GLADE_SIGNAL (signal); } static GList * glade_signal_model_create_signal_list (GladeSignalModel *sig_model, - const gchar *widget_type) + const gchar *widget_type) { GList *widget_signals = NULL; const GList *signals; @@ -323,26 +323,26 @@ glade_signal_model_create_signal_list (GladeSignalModel *sig_model, { GladeSignalClass *sig_class = signals->data; if (g_str_equal (glade_signal_class_get_type (sig_class), widget_type)) - { - widget_signals = g_list_append (widget_signals, sig_class); - } + { + widget_signals = g_list_append (widget_signals, sig_class); + } } return widget_signals; } static void -on_glade_signal_model_added (GladeWidget *widget, +on_glade_signal_model_added (GladeWidget *widget, const GladeSignal *signal, - GladeSignalModel* model) + GladeSignalModel *model) { - GtkTreeIter iter; + GtkTreeIter iter; GtkTreePath *path; const GladeSignalClass *sig_class = glade_signal_get_class (signal); glade_signal_model_create_signal_iter (model, - glade_signal_class_get_type (sig_class), - signal, - &iter); + glade_signal_class_get_type (sig_class), + signal, + &iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter); @@ -351,18 +351,18 @@ on_glade_signal_model_added (GladeWidget *widget, } static void -on_glade_signal_model_removed (GladeWidget *widget, +on_glade_signal_model_removed (GladeWidget *widget, const GladeSignal *signal, - GladeSignalModel *model) + GladeSignalModel *model) { GtkTreeIter iter; GtkTreePath *path; const GladeSignalClass *sig_class = glade_signal_get_class (signal); glade_signal_model_create_signal_iter (model, - glade_signal_class_get_type (sig_class), - signal, - &iter); + glade_signal_class_get_type (sig_class), + signal, + &iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path); gtk_tree_path_free (path); @@ -379,9 +379,9 @@ on_glade_signal_model_changed (GladeWidget *widget, const GladeSignalClass *sig_class = glade_signal_get_class (signal); glade_signal_model_create_signal_iter (model, - glade_signal_class_get_type (sig_class), - signal, - &iter); + glade_signal_class_get_type (sig_class), + signal, + &iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter); gtk_tree_path_free (path); @@ -389,8 +389,8 @@ on_glade_signal_model_changed (GladeWidget *widget, } static void -verify_dummies (const gchar *signal_name, - GladeSignal *signal, +verify_dummies (const gchar *signal_name, + GladeSignal *signal, GladeSignalModel *model) { glade_project_verify_signal (model->priv->widget, signal); @@ -399,9 +399,9 @@ verify_dummies (const gchar *signal_name, } static void -emit_changed (const gchar *signal_name, - GPtrArray *signals, - GladeSignalModel *model) +emit_changed (const gchar *signal_name, + GPtrArray *signals, + GladeSignalModel *model) { gint i; GladeSignal *signal; @@ -425,8 +425,8 @@ on_glade_widget_support_changed (GladeWidget *widget, GladeSignalModel *model) static gboolean glade_signal_model_get_iter (GtkTreeModel *model, - GtkTreeIter *iter, - GtkTreePath *path) + GtkTreeIter *iter, + GtkTreePath *path) { gint *indices; gint depth; @@ -492,52 +492,52 @@ glade_signal_model_get_path (GtkTreeModel *model, GtkTreeIter *iter) gint index0, index1 = 0; GList *signal; GList *signals = glade_signal_model_create_signal_list (sig_model, - widget); + widget); index0 = g_list_index (sig_model->priv->widgets, - widget); + widget); for (signal = signals; signal != NULL; signal = g_list_next (signal)) - { - GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals, - glade_signal_class_get_name (signal->data)); + { + GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals, + glade_signal_class_get_name (signal->data)); - if (signal->data != sig_class) - { - if (handlers) + if (signal->data != sig_class) + { + if (handlers) index1 += handlers->len; - index1++; /* dummy_handler */ - } - else - { - if (handlers) - { - guint handler_index; - if (g_ptr_array_find (handlers, handler, &handler_index)) - index1 += handler_index; - else - index1 += handlers->len; - } - break; - } - } + index1++; /* dummy_handler */ + } + else + { + if (handlers) + { + guint handler_index; + if (g_ptr_array_find (handlers, handler, &handler_index)) + index1 += handler_index; + else + index1 += handlers->len; + } + break; + } + } return gtk_tree_path_new_from_indices (index0, index1, -1); } else if (widget) { /* Widget */ return gtk_tree_path_new_from_indices (g_list_index (sig_model->priv->widgets, - widget), -1); + widget), -1); } g_assert_not_reached(); } static void glade_signal_model_get_value (GtkTreeModel *model, - GtkTreeIter *iter, - gint column, - GValue *value) -{ + GtkTreeIter *iter, + gint column, + GValue *value) +{ const gchar *widget; GladeSignal *signal; GladeSignalModel *sig_model; @@ -550,7 +550,7 @@ glade_signal_model_get_value (GtkTreeModel *model, sig_model = GLADE_SIGNAL_MODEL (model); value = g_value_init (value, - glade_signal_model_get_column_type (model, column)); + glade_signal_model_get_column_type (model, column)); switch (column) { @@ -577,7 +577,7 @@ glade_signal_model_get_value (GtkTreeModel *model, } else if (widget) g_value_set_boolean (value, TRUE); - break; + break; case GLADE_SIGNAL_COLUMN_HANDLER: if (signal) { @@ -637,30 +637,30 @@ glade_signal_model_get_value (GtkTreeModel *model, static gboolean glade_signal_model_iter_next_signal (GladeSignalModel *sig_model, - const gchar *widget, - GtkTreeIter *iter, - GList *signal) + const gchar *widget, + GtkTreeIter *iter, + GList *signal) { if (signal->next) { signal = signal->next; GladeSignal *next_handler; GPtrArray *next_handlers = - g_hash_table_lookup (sig_model->priv->signals, - glade_signal_class_get_name (signal->data)); + g_hash_table_lookup (sig_model->priv->signals, + glade_signal_class_get_name (signal->data)); if (next_handlers && next_handlers->len) - { - next_handler = g_ptr_array_index (next_handlers, 0); - } + { + next_handler = g_ptr_array_index (next_handlers, 0); + } else - { - next_handler = - glade_signal_model_get_dummy_handler (sig_model, - signal->data); - } + { + next_handler = + glade_signal_model_get_dummy_handler (sig_model, + signal->data); + } glade_signal_model_create_signal_iter (sig_model, widget, - next_handler, - iter); + next_handler, + iter); g_list_free (signal); return TRUE; } @@ -688,54 +688,54 @@ glade_signal_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) sig_model = GLADE_SIGNAL_MODEL (model); - gtk_tree_model_iter_parent (model, &parent, iter); + gtk_tree_model_iter_parent (model, &parent, iter); if (handler) { const GladeSignalClass *sig_class = glade_signal_get_class (handler); GList *signals = - glade_signal_model_create_signal_list (sig_model, - widget); + glade_signal_model_create_signal_list (sig_model, + widget); GList* signal = g_list_find (signals, sig_class); GPtrArray* handlers = g_hash_table_lookup (sig_model->priv->signals, - glade_signal_class_get_name (sig_class)); + glade_signal_class_get_name (sig_class)); if (glade_signal_model_is_dummy_handler (sig_model, handler)) - { - return glade_signal_model_iter_next_signal (sig_model, widget, iter, signal); - } + { + return glade_signal_model_iter_next_signal (sig_model, widget, iter, signal); + } else if (handlers) - { - guint new_index = 0; - if (g_ptr_array_find (handlers, handler, &new_index)) - new_index++; - - if (new_index < handlers->len) - { - glade_signal_model_create_signal_iter (sig_model, widget, - g_ptr_array_index (handlers, new_index), - iter); - g_list_free (signals); - return TRUE; - } - else if (new_index == handlers->len) - { - glade_signal_model_create_signal_iter (sig_model, widget, - glade_signal_model_get_dummy_handler (sig_model, - sig_class), - iter); - g_list_free (signals); - return TRUE; - } - else - { - return glade_signal_model_iter_next_signal (sig_model, widget, iter, signal); - } - } + { + guint new_index = 0; + if (g_ptr_array_find (handlers, handler, &new_index)) + new_index++; + + if (new_index < handlers->len) + { + glade_signal_model_create_signal_iter (sig_model, widget, + g_ptr_array_index (handlers, new_index), + iter); + g_list_free (signals); + return TRUE; + } + else if (new_index == handlers->len) + { + glade_signal_model_create_signal_iter (sig_model, widget, + glade_signal_model_get_dummy_handler (sig_model, + sig_class), + iter); + g_list_free (signals); + return TRUE; + } + else + { + return glade_signal_model_iter_next_signal (sig_model, widget, iter, signal); + } + } else - { - g_list_free (signals); - return FALSE; - } + { + g_list_free (signals); + return FALSE; + } } else if (widget) { @@ -773,23 +773,23 @@ glade_signal_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter) else if (widget) { GList *signals = glade_signal_model_create_signal_list (sig_model, - widget); + widget); GList *signal; gint retval = 0; for (signal = signals; signal != NULL; signal = g_list_next (signal)) - { - GPtrArray* handlers = g_hash_table_lookup (sig_model->priv->signals, - glade_signal_class_get_name (signal->data)); - if (handlers) - retval += handlers->len; - retval++; - } + { + GPtrArray* handlers = g_hash_table_lookup (sig_model->priv->signals, + glade_signal_class_get_name (signal->data)); + if (handlers) + retval += handlers->len; + retval++; + } g_list_free (signals); return retval; } - g_assert_not_reached (); + g_assert_not_reached (); } static gboolean @@ -803,9 +803,9 @@ glade_signal_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter) static gboolean glade_signal_model_iter_nth_child (GtkTreeModel *model, - GtkTreeIter *iter, - GtkTreeIter *parent, - gint n) + GtkTreeIter *iter, + GtkTreeIter *parent, + gint n) { GladeSignal *handler; GladeSignalModel *sig_model; @@ -825,59 +825,59 @@ glade_signal_model_iter_nth_child (GtkTreeModel *model, else if (widget) { GList *signals = glade_signal_model_create_signal_list (sig_model, - widget); + widget); GList *signal; for (signal = signals; signal != NULL; signal = g_list_next (signal)) - { - GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals, - glade_signal_class_get_name (signal->data)); - if (handlers) - { - if (n >= handlers->len) - n -= handlers->len; - else - { - glade_signal_model_create_signal_iter (sig_model, - widget, - g_ptr_array_index (handlers, n), - iter); - g_list_free (signals); - return TRUE; - } - } - if (n == 0) - { - GladeSignal *handler = - glade_signal_model_get_dummy_handler (sig_model, - signal->data); - glade_signal_model_create_signal_iter (sig_model, - widget, - handler, - iter); - g_list_free (signals); - return TRUE; - } - n--; - } + { + GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals, + glade_signal_class_get_name (signal->data)); + if (handlers) + { + if (n >= handlers->len) + n -= handlers->len; + else + { + glade_signal_model_create_signal_iter (sig_model, + widget, + g_ptr_array_index (handlers, n), + iter); + g_list_free (signals); + return TRUE; + } + } + if (n == 0) + { + GladeSignal *handler = + glade_signal_model_get_dummy_handler (sig_model, + signal->data); + glade_signal_model_create_signal_iter (sig_model, + widget, + handler, + iter); + g_list_free (signals); + return TRUE; + } + n--; + } return FALSE; } else { if (g_list_length (sig_model->priv->widgets) > n) - { - glade_signal_model_create_widget_iter (sig_model, - g_list_nth_data (sig_model->priv->widgets, n), - iter); - return TRUE; - } + { + glade_signal_model_create_widget_iter (sig_model, + g_list_nth_data (sig_model->priv->widgets, n), + iter); + return TRUE; + } } return FALSE; } static gboolean glade_signal_model_iter_children (GtkTreeModel *model, - GtkTreeIter *iter, - GtkTreeIter *parent) + GtkTreeIter *iter, + GtkTreeIter *parent) { return glade_signal_model_iter_nth_child (model, iter, parent, 0); } @@ -915,7 +915,7 @@ gtk_tree_model_iface_init (GtkTreeModelIface *iface) iface->get_n_columns = glade_signal_model_get_n_columns; iface->get_iter = glade_signal_model_get_iter; iface->get_path = glade_signal_model_get_path; - iface->get_value = glade_signal_model_get_value; + iface->get_value = glade_signal_model_get_value; iface->iter_next = glade_signal_model_iter_next; iface->iter_children = glade_signal_model_iter_children; iface->iter_has_child = glade_signal_model_iter_has_child; @@ -933,11 +933,11 @@ glade_signal_model_row_draggable (GtkTreeDragSource *model, GtkTreePath *path) gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path); gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, - -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); retval = signal && !glade_signal_model_is_dummy_handler (GLADE_SIGNAL_MODEL (model), - signal); + signal); g_object_unref (signal); return retval; @@ -945,8 +945,8 @@ glade_signal_model_row_draggable (GtkTreeDragSource *model, GtkTreePath *path) static gboolean glade_signal_model_drag_data_get (GtkTreeDragSource *model, - GtkTreePath *path, - GtkSelectionData *data) + GtkTreePath *path, + GtkSelectionData *data) { GtkTreeIter iter; @@ -958,7 +958,7 @@ glade_signal_model_drag_data_get (GtkTreeDragSource *model, const gchar *user_data; gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, - GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, -1); user_data = glade_signal_get_userdata (signal); @@ -969,10 +969,10 @@ glade_signal_model_drag_data_get (GtkTreeDragSource *model, glade_signal_get_swapped (signal), glade_signal_get_after (signal)); gtk_selection_data_set (data, - gdk_atom_intern_static_string ("application/x-glade-signal"), - 8, - (guchar*) dnd_text, - strlen (dnd_text)); + gdk_atom_intern_static_string ("application/x-glade-signal"), + 8, + (guchar*) dnd_text, + strlen (dnd_text)); g_free (dnd_text); return TRUE; @@ -985,7 +985,7 @@ glade_signal_model_drag_data_get (GtkTreeDragSource *model, static gboolean glade_signal_model_drag_data_delete (GtkTreeDragSource *model, - GtkTreePath *path) + GtkTreePath *path) { /* We don't move rows... */ return FALSE; @@ -998,3 +998,4 @@ gtk_tree_drag_source_iface_init (GtkTreeDragSourceIface *iface) iface->drag_data_get = glade_signal_model_drag_data_get; iface->drag_data_delete = glade_signal_model_drag_data_delete; } + diff --git a/gladeui/glade-signal-model.h b/gladeui/glade-signal-model.h index 24c1e73a..10236696 100644 --- a/gladeui/glade-signal-model.h +++ b/gladeui/glade-signal-model.h @@ -64,7 +64,7 @@ struct _GladeSignalModel GType glade_signal_model_get_type (void) G_GNUC_CONST; GtkTreeModel *glade_signal_model_new (GladeWidget *widget, - GHashTable *signals); + GHashTable *signals); G_END_DECLS diff --git a/gladeui/glade-signal.c b/gladeui/glade-signal.c index cbe14305..cfb2221d 100644 --- a/gladeui/glade-signal.c +++ b/gladeui/glade-signal.c @@ -82,9 +82,10 @@ glade_signal_finalize (GObject *object) } static void -glade_signal_get_property (GObject *object, - guint prop_id, - GValue *value, GParamSpec *pspec) +glade_signal_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GladeSignal *signal = GLADE_SIGNAL (object); @@ -118,34 +119,35 @@ glade_signal_get_property (GObject *object, } static void -glade_signal_set_property (GObject *object, - guint prop_id, - const GValue *value, GParamSpec *pspec) +glade_signal_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GladeSignal *signal = GLADE_SIGNAL (object); switch (prop_id) { case PROP_CLASS: - signal->priv->class = g_value_get_pointer (value); + signal->priv->class = g_value_get_pointer (value); break; case PROP_DETAIL: - glade_signal_set_detail (signal, g_value_get_string (value)); + glade_signal_set_detail (signal, g_value_get_string (value)); break; case PROP_HANDLER: - glade_signal_set_handler (signal, g_value_get_string (value)); + glade_signal_set_handler (signal, g_value_get_string (value)); break; case PROP_USERDATA: - glade_signal_set_userdata (signal, g_value_get_string (value)); + glade_signal_set_userdata (signal, g_value_get_string (value)); break; case PROP_SUPPORT_WARNING: - glade_signal_set_support_warning (signal, g_value_get_string (value)); + glade_signal_set_support_warning (signal, g_value_get_string (value)); break; case PROP_AFTER: - glade_signal_set_after (signal, g_value_get_boolean (value)); + glade_signal_set_after (signal, g_value_get_boolean (value)); break; case PROP_SWAPPED: - glade_signal_set_swapped (signal, g_value_get_boolean (value)); + glade_signal_set_swapped (signal, g_value_get_boolean (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -234,8 +236,8 @@ GladeSignal * glade_signal_new (const GladeSignalClass *sig_class, const gchar *handler, const gchar *userdata, - gboolean after, - gboolean swapped) + gboolean after, + gboolean swapped) { g_return_val_if_fail (sig_class != NULL, NULL); @@ -294,8 +296,8 @@ glade_signal_clone (const GladeSignal *signal) dup = glade_signal_new (signal->priv->class, signal->priv->handler, signal->priv->userdata, - signal->priv->after, - signal->priv->swapped); + signal->priv->after, + signal->priv->swapped); glade_signal_set_detail (dup, signal->priv->detail); glade_signal_set_support_warning (dup, signal->priv->support_warning); @@ -413,9 +415,9 @@ glade_signal_read (GladeXmlNode *node, GladeWidgetAdaptor *adaptor) { /* XXX These errors should be collected and reported to the user */ g_warning ("No signal %s was found for class %s, skipping\n", - name, glade_widget_adaptor_get_name (adaptor)); + name, glade_widget_adaptor_get_name (adaptor)); } - + g_free (name); g_free (handler); g_free (userdata); @@ -434,7 +436,7 @@ glade_signal_get_name (const GladeSignal *signal) G_CONST_RETURN GladeSignalClass * glade_signal_get_class (const GladeSignal *signal) { - return signal->priv->class; + return signal->priv->class; } void diff --git a/gladeui/glade-signal.h b/gladeui/glade-signal.h index 763095d3..2698d2a9 100644 --- a/gladeui/glade-signal.h +++ b/gladeui/glade-signal.h @@ -37,38 +37,38 @@ struct _GladeSignalKlass { GType glade_signal_get_type (void) G_GNUC_CONST; GladeSignal *glade_signal_new (const GladeSignalClass *sig_class, - const gchar *handler, - const gchar *userdata, - gboolean after, - gboolean swapped); + const gchar *handler, + const gchar *userdata, + gboolean after, + gboolean swapped); GladeSignal *glade_signal_clone (const GladeSignal *signal); gboolean glade_signal_equal (const GladeSignal *sig1, - const GladeSignal *sig2); + const GladeSignal *sig2); GladeSignal *glade_signal_read (GladeXmlNode *node, GladeWidgetAdaptor *adaptor); void glade_signal_write (GladeSignal *signal, - GladeXmlContext *context, - GladeXmlNode *node); + GladeXmlContext *context, + GladeXmlNode *node); G_CONST_RETURN gchar *glade_signal_get_name (const GladeSignal *signal); G_CONST_RETURN GladeSignalClass *glade_signal_get_class (const GladeSignal * signal); void glade_signal_set_detail (GladeSignal *signal, - const gchar *detail); + const gchar *detail); G_CONST_RETURN gchar *glade_signal_get_detail (const GladeSignal *signal); void glade_signal_set_handler (GladeSignal *signal, - const gchar *handler); + const gchar *handler); G_CONST_RETURN gchar *glade_signal_get_handler (const GladeSignal *signal); void glade_signal_set_userdata (GladeSignal *signal, - const gchar *userdata); + const gchar *userdata); G_CONST_RETURN gchar *glade_signal_get_userdata (const GladeSignal *signal); void glade_signal_set_after (GladeSignal *signal, - gboolean after); + gboolean after); gboolean glade_signal_get_after (const GladeSignal *signal); void glade_signal_set_swapped (GladeSignal *signal, - gboolean swapped); + gboolean swapped); gboolean glade_signal_get_swapped (const GladeSignal *signal); void glade_signal_set_support_warning (GladeSignal *signal, - const gchar *support_warning); + const gchar *support_warning); G_CONST_RETURN gchar *glade_signal_get_support_warning (const GladeSignal *signal); G_END_DECLS diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c index c6c99b19..6d9fa226 100644 --- a/gladeui/glade-utils.c +++ b/gladeui/glade-utils.c @@ -137,7 +137,7 @@ glade_util_get_type_from_name (const gchar *name, gboolean have_func) } if (!have_func) - g_free (func_name); + g_free (func_name); } if (type == 0) @@ -308,10 +308,10 @@ glade_util_check_and_warn_scrollable (GladeWidget *parent, glade_util_ui_message (parent_widget, GLADE_UI_INFO, NULL, _("Cannot add non scrollable %s widget to a %s directly.\n" - "Add a %s first."), - glade_widget_adaptor_get_title (child_adaptor), + "Add a %s first."), + glade_widget_adaptor_get_title (child_adaptor), glade_widget_adaptor_get_title (parent_adaptor), - glade_widget_adaptor_get_title (vadaptor)); + glade_widget_adaptor_get_title (vadaptor)); return TRUE; } return FALSE; @@ -564,7 +564,7 @@ _glade_util_strreplace (gchar *str, if (free_str) g_free (str); - + return retval; } @@ -679,7 +679,7 @@ glade_util_count_placeholders (GladeWidget *parent) /* count placeholders */ if ((children = glade_widget_adaptor_get_children (glade_widget_get_adaptor (parent), - glade_widget_get_object (parent))) != NULL) + glade_widget_get_object (parent))) != NULL) { for (list = children; list && list->data; list = list->next) { @@ -873,10 +873,10 @@ glade_util_canonical_path (const gchar *path) if (g_chdir (dirname) == 0) { if ((direct_dir = g_get_current_dir ()) != NULL) - { - direct_name = g_build_filename (direct_dir, basename, NULL); - g_free (direct_dir); - } + { + direct_name = g_build_filename (direct_dir, basename, NULL); + g_free (direct_dir); + } else g_warning ("g_path"); @@ -2025,10 +2025,10 @@ glade_utils_pointer_mode_render_icon (GladePointerMode mode, GtkIconSize size) */ void glade_utils_get_pointer (GtkWidget *widget, - GdkWindow *window, - GdkDevice *device, - gint *x, - gint *y) + GdkWindow *window, + GdkDevice *device, + gint *x, + gint *y) { gint device_x = 0, device_y = 0; gint final_x = 0, final_y = 0; @@ -2059,7 +2059,7 @@ glade_utils_get_pointer (GtkWidget *widget, gtk_widget_translate_coordinates (event_widget, widget, device_x, device_y, - &final_x, &final_y); + &final_x, &final_y); } else { @@ -2080,8 +2080,8 @@ glade_utils_get_pointer (GtkWidget *widget, */ static gint abort_scroll_events (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) + GdkEvent *event, + gpointer user_data) { GtkWidget *parent = gtk_widget_get_parent (widget); @@ -2104,7 +2104,7 @@ glade_util_remove_scroll_events (GtkWidget *widget) gtk_widget_set_events (widget, events); g_signal_connect (G_OBJECT (widget), "scroll-event", - G_CALLBACK (abort_scroll_events), NULL); + G_CALLBACK (abort_scroll_events), NULL); } /** diff --git a/gladeui/glade-utils.h b/gladeui/glade-utils.h index e5d928d6..54204b04 100644 --- a/gladeui/glade-utils.h +++ b/gladeui/glade-utils.h @@ -26,20 +26,20 @@ typedef enum /* UI interaction */ gboolean glade_util_ui_message (GtkWidget *parent, - GladeUIMessageType type, - GtkWidget *widget, - const gchar *format, + GladeUIMessageType type, + GtkWidget *widget, + const gchar *format, ...) G_GNUC_PRINTF (4, 5); -void glade_util_flash_message (GtkWidget *statusbar, - guint context_id, - gchar *format, +void glade_util_flash_message (GtkWidget *statusbar, + guint context_id, + gchar *format, ...) G_GNUC_PRINTF (3, 4); gboolean glade_util_url_show (const gchar *url); GtkWidget *glade_util_file_dialog_new (const gchar *title, - GladeProject *project, - GtkWindow *parent, - GladeUtilFileDialogType action); + GladeProject *project, + GtkWindow *parent, + GladeUtilFileDialogType action); /* Strings */ gint glade_util_compare_stock_labels (gconstpointer a, gconstpointer b); @@ -51,7 +51,7 @@ gchar *glade_util_duplicate_underscores (const gchar *name); /* GModule stuff */ -GType glade_util_get_type_from_name (const gchar *name, gboolean have_func); +GType glade_util_get_type_from_name (const gchar *name, gboolean have_func); GParamSpec *glade_utils_get_pspec_from_funcname (const gchar *funcname); GModule *glade_util_load_library (const gchar *library_name); @@ -64,18 +64,18 @@ gchar *glade_utils_flags_string_from_value (GType enum_type, gint val gchar *glade_utils_flags_string_from_value_displayable (GType flags_type, gint value); gchar *glade_utils_enum_string_from_value_displayable (GType flags_type, gint value); GValue *glade_utils_value_from_string (GType type, - const gchar *string, - GladeProject *project); + const gchar *string, + GladeProject *project); gchar *glade_utils_string_from_value (const GValue *value); gboolean glade_utils_boolean_from_string (const gchar *string, - gboolean *value); + gboolean *value); /* Devhelp */ gboolean glade_util_have_devhelp (void); GtkWidget *glade_util_get_devhelp_icon (GtkIconSize size); void glade_util_search_devhelp (const gchar *book, - const gchar *page, - const gchar *search); + const gchar *page, + const gchar *search); /* Files/Filenames*/ gchar *glade_utils_replace_home_dir_with_tilde (const gchar *path); @@ -87,51 +87,51 @@ gchar *glade_util_icon_name_to_filename (const gchar *value); /* Cairo utilities */ void glade_utils_cairo_draw_line (cairo_t *cr, - GdkColor *color, - gint x1, - gint y1, - gint x2, - gint y2); + GdkColor *color, + gint x1, + gint y1, + gint x2, + gint y2); void glade_utils_cairo_draw_rectangle (cairo_t *cr, - GdkColor *color, - gboolean filled, - gint x, - gint y, - gint width, - gint height); + GdkColor *color, + gboolean filled, + gint x, + gint y, + gint width, + gint height); /* Lists */ GList *glade_util_purify_list (GList *list); GList *glade_util_added_in_list (GList *old_list, - GList *new_list); + GList *new_list); GList *glade_util_removed_from_list (GList *old_list, - GList *new_list); + GList *new_list); /* Other utilities */ GtkListStore *glade_utils_liststore_from_enum_type (GType enum_type, gboolean include_empty); gint glade_utils_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data); + GdkEventKey *event, + gpointer user_data); gboolean glade_util_check_and_warn_scrollable (GladeWidget *parent, - GladeWidgetAdaptor *child_adaptor, - GtkWidget *parent_widget); + GladeWidgetAdaptor *child_adaptor, + GtkWidget *parent_widget); GList *glade_util_container_get_all_children (GtkContainer *container); gint glade_util_count_placeholders (GladeWidget *parent); GtkTreeIter *glade_util_find_iter_by_widget (GtkTreeModel *model, - GladeWidget *findme, - gint column); + GladeWidget *findme, + gint column); GtkWidget *glade_util_get_placeholder_from_pointer (GtkContainer *container); gboolean glade_util_object_is_loading (GObject *object); GdkPixbuf *glade_utils_pointer_mode_render_icon (GladePointerMode mode, GtkIconSize size); void glade_utils_get_pointer (GtkWidget *widget, - GdkWindow *window, - GdkDevice *device, - gint *x, - gint *y); + GdkWindow *window, + GdkDevice *device, + gint *x, + gint *y); void glade_util_remove_scroll_events (GtkWidget *widget); diff --git a/gladeui/glade-widget-action.c b/gladeui/glade-widget-action.c index 478652c0..cf9f58bb 100644 --- a/gladeui/glade-widget-action.c +++ b/gladeui/glade-widget-action.c @@ -107,7 +107,7 @@ glade_widget_action_constructor (GType type, NULL); action->priv->actions = g_list_prepend (action->priv->actions, - GLADE_WIDGET_ACTION (obj)); + GLADE_WIDGET_ACTION (obj)); } action->priv->actions = g_list_reverse (action->priv->actions); @@ -231,7 +231,7 @@ glade_widget_action_get_sensitive (GladeWidgetAction *action) void glade_widget_action_set_visible (GladeWidgetAction *action, - gboolean visible) + gboolean visible) { g_return_if_fail (GLADE_IS_WIDGET_ACTION (action)); @@ -348,7 +348,7 @@ glade_widget_action_class_free (GWActionClass *action) void glade_widget_action_class_set_label (GWActionClass *action, - const gchar *label) + const gchar *label) { g_free (action->label); action->label = g_strdup (label); @@ -356,7 +356,7 @@ glade_widget_action_class_set_label (GWActionClass *action, void glade_widget_action_class_set_stock (GWActionClass *action, - const gchar *stock) + const gchar *stock) { g_free (action->stock); action->stock = g_strdup (stock); @@ -364,7 +364,7 @@ glade_widget_action_class_set_stock (GWActionClass *action, void glade_widget_action_class_set_important (GWActionClass *action, - gboolean important) + gboolean important) { action->important = important; } diff --git a/gladeui/glade-widget-action.h b/gladeui/glade-widget-action.h index ef9ef213..b320d5b3 100644 --- a/gladeui/glade-widget-action.h +++ b/gladeui/glade-widget-action.h @@ -41,10 +41,10 @@ typedef struct _GWActionClass GWActionClass; struct _GWActionClass { const gchar *id; /* The identifier of this action in the action tree */ - gchar *path; /* Full action path */ + gchar *path; /* Full action path */ gchar *label; /* A translated label to show in the UI for this action */ gchar *stock; /* If set, this stock item will be shown in the UI along side - * the label */ + * the label */ gboolean important; /* If this action is important */ GList *actions;/* Recursive list of child actions */ @@ -71,10 +71,10 @@ struct _GladeWidgetActionClass GType glade_widget_action_get_type (void) G_GNUC_CONST; void glade_widget_action_set_sensitive (GladeWidgetAction *action, - gboolean sensitive); + gboolean sensitive); gboolean glade_widget_action_get_sensitive (GladeWidgetAction *action); void glade_widget_action_set_visible (GladeWidgetAction *action, - gboolean visible); + gboolean visible); gboolean glade_widget_action_get_visible (GladeWidgetAction *action); GList *glade_widget_action_get_children (GladeWidgetAction *action); GWActionClass *glade_widget_action_get_class (GladeWidgetAction *action); @@ -84,11 +84,11 @@ GWActionClass *glade_widget_action_class_new (const gchar *path); GWActionClass *glade_widget_action_class_clone (GWActionClass *action); void glade_widget_action_class_free (GWActionClass *action); void glade_widget_action_class_set_label (GWActionClass *action, - const gchar *label); + const gchar *label); void glade_widget_action_class_set_stock (GWActionClass *action, - const gchar *stock); + const gchar *stock); void glade_widget_action_class_set_important (GWActionClass *action, - gboolean important); + gboolean important); G_END_DECLS diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c index e33f6ffa..17333b4d 100644 --- a/gladeui/glade-widget-adaptor.c +++ b/gladeui/glade-widget-adaptor.c @@ -62,44 +62,44 @@ struct _GladeWidgetAdaptorPrivate gchar *name; /* Name of the widget, for example GtkButton */ gchar *generic_name; /* Used to generate names of new widgets, for - * example "button" so that we generate button1, - * button2, buttonX .. - */ + * example "button" so that we generate button1, + * button2, buttonX .. + */ gchar *icon_name; /* icon name to use for widget class */ gchar *missing_icon; /* the name of the missing icon if it was not found */ gchar *title; /* Translated class name used in the UI */ GList *properties; /* List of GladePropertyClass objects. - * [see glade-property.h] this list contains - * properties about the widget that we are going - * to modify. Like "title", "label", "rows" . - * Each property creates an input in the propety - * editor. - */ + * [see glade-property.h] this list contains + * properties about the widget that we are going + * to modify. Like "title", "label", "rows" . + * Each property creates an input in the propety + * editor. + */ GList *packing_props; /* List of GladePropertyClass objects that describe - * properties for child objects packing definition - - * note there may be more than one type of child supported - * by a widget and thus they may have different sets - * of properties for each type - this association is - * managed on the GladePropertyClass proper. - */ + * properties for child objects packing definition - + * note there may be more than one type of child supported + * by a widget and thus they may have different sets + * of properties for each type - this association is + * managed on the GladePropertyClass proper. + */ GList *signals; /* List of GladeSignalClass objects */ GList *child_packings; /* Default packing property values */ GList *actions; /* A list of GWActionClass */ GList *packing_actions; /* A list of GWActionClass for child objects */ GList *internal_children; /* A list of GladeInternalChild */ gchar *catalog; /* The name of the widget catalog this class - * was declared by. - */ + * was declared by. + */ gchar *book; /* DevHelp search namespace for this widget class - */ + */ GdkCursor *cursor; /* a cursor for inserting widgets */ gchar *special_child_type; /* Special case code for children that - * are special children (like notebook tab - * widgets for example). - */ + * are special children (like notebook tab + * widgets for example). + */ gboolean query; /* Do we have to query the user, see glade_widget_adaptor_query() */ }; @@ -313,7 +313,7 @@ gwa_signal_comp (gpointer a, gpointer b) GladeSignalClass *signal_a = a, *signal_b = b; return strcmp (glade_signal_class_get_name (signal_b), - glade_signal_class_get_name (signal_a)); + glade_signal_class_get_name (signal_a)); } static gint @@ -339,8 +339,8 @@ gwa_add_signals (GladeWidgetAdaptor *adaptor, GList **signals, GType type) for (count = 0; count < num_signals; count++) { signal = glade_signal_class_new (type_adaptor ? - type_adaptor : adaptor, - type, sig_ids[count]); + type_adaptor : adaptor, + type, sig_ids[count]); list = g_list_prepend (list, signal); } @@ -396,7 +396,7 @@ gwa_clone_parent_properties (GladeWidgetAdaptor *adaptor, gboolean is_packing) { GladePropertyClass *pclass = glade_property_class_clone (list->data, reset_version); - glade_property_class_set_adaptor (pclass, adaptor); + glade_property_class_set_adaptor (pclass, adaptor); properties = g_list_prepend (properties, pclass); } @@ -485,7 +485,7 @@ gwa_setup_properties (GladeWidgetAdaptor *adaptor, { GladePropertyClass *property_class = l->data; - glade_property_class_set_is_packing (property_class, TRUE); + glade_property_class_set_is_packing (property_class, TRUE); } } } @@ -539,25 +539,25 @@ gwa_inherit_signals (GladeWidgetAdaptor *adaptor) signal = list->data; if ((node = g_list_find_custom (parent_adaptor->priv->signals, - glade_signal_class_get_name (signal), - (GCompareFunc) gwa_signal_find_comp)) != NULL) + glade_signal_class_get_name (signal), + (GCompareFunc) gwa_signal_find_comp)) != NULL) { parent_signal = node->data; /* XXX FIXME: This is questionable, why should derived catalogs - * reset the derived signal versions ??? - * - * Reset versioning in derived catalogs just once - */ + * reset the derived signal versions ??? + * + * Reset versioning in derived catalogs just once + */ if (strcmp (adaptor->priv->catalog, parent_adaptor->priv->catalog)) - glade_signal_class_set_since (signal, 0, 0); + glade_signal_class_set_since (signal, 0, 0); else - glade_signal_class_set_since (signal, - glade_signal_class_since_major (parent_signal), - glade_signal_class_since_minor (parent_signal)); + glade_signal_class_set_since (signal, + glade_signal_class_since_major (parent_signal), + glade_signal_class_since_minor (parent_signal)); - glade_signal_class_set_deprecated (signal, glade_signal_class_deprecated (parent_signal)); + glade_signal_class_set_deprecated (signal, glade_signal_class_deprecated (parent_signal)); } } } @@ -825,18 +825,18 @@ glade_widget_adaptor_real_set_property (GObject *object, break; case PROP_CATALOG: /* assume once (construct-only) */ - g_free (adaptor->priv->catalog); + g_free (adaptor->priv->catalog); adaptor->priv->catalog = g_value_dup_string (value); break; case PROP_BOOK: /* assume once (construct-only) */ - g_free (adaptor->priv->book); + g_free (adaptor->priv->book); adaptor->priv->book = g_value_dup_string (value); break; case PROP_SPECIAL_TYPE: /* assume once (construct-only) */ - g_free (adaptor->priv->special_child_type); - adaptor->priv->special_child_type = g_value_dup_string (value); + g_free (adaptor->priv->special_child_type); + adaptor->priv->special_child_type = g_value_dup_string (value); break; case PROP_QUERY: adaptor->priv->query = g_value_get_boolean (value); @@ -918,7 +918,7 @@ glade_widget_adaptor_object_construct_object (GladeWidgetAdaptor *adaptor, static void glade_widget_adaptor_object_destroy_object (GladeWidgetAdaptor *adaptor, - GObject *object) + GObject *object) { /* Do nothing, just have a method here incase classes chain up */ } @@ -941,15 +941,15 @@ glade_widget_adaptor_object_get_internal_child (GladeWidgetAdaptor *adaptor, static gboolean glade_widget_adaptor_object_add_verify (GladeWidgetAdaptor *adaptor, - GObject *parent, - GObject *child, - gboolean user_feedback) + GObject *parent, + GObject *child, + gboolean user_feedback) { if (user_feedback) glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("%s does not support adding any children."), - adaptor->priv->title); + GLADE_UI_INFO, NULL, + _("%s does not support adding any children."), + adaptor->priv->title); return FALSE; } @@ -1080,16 +1080,16 @@ glade_widget_adaptor_object_write_widget (GladeWidgetAdaptor *adaptor, GladePropertyClass *klass = glade_property_get_class (property); if (glade_property_class_save (klass) && - glade_property_get_enabled (property)) + glade_property_get_enabled (property)) glade_property_write (GLADE_PROPERTY (props->data), context, node); } } static void glade_widget_adaptor_object_write_widget_after (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { } @@ -1115,15 +1115,15 @@ glade_widget_adaptor_object_read_child (GladeWidgetAdaptor *adaptor, glade_xml_search_child (node, GLADE_XML_TAG_WIDGET)) != NULL) { child_widget = - glade_widget_read (glade_widget_get_project (widget), - widget, widget_node, internal_name); + glade_widget_read (glade_widget_get_project (widget), + widget, widget_node, internal_name); if (child_widget) { if (!internal_name) { glade_widget_set_child_type_from_node - (widget, glade_widget_get_object (child_widget), node); + (widget, glade_widget_get_object (child_widget), node); glade_widget_add_child (widget, child_widget, FALSE); } @@ -1152,7 +1152,7 @@ glade_widget_adaptor_object_read_child (GladeWidgetAdaptor *adaptor, glade_widget_get_pack_property (child_widget, prop_name)) != NULL) glade_property_read (property, - glade_widget_get_project (child_widget), + glade_widget_get_project (child_widget), iter_node); g_free (prop_name); @@ -1202,14 +1202,14 @@ glade_widget_adaptor_object_write_child (GladeWidgetAdaptor *adaptor, GladePropertyClass *klass = glade_property_get_class (property); if (glade_property_class_save (klass) && - glade_property_get_enabled (property)) + glade_property_get_enabled (property)) glade_property_write (GLADE_PROPERTY (props->data), context, packing_node); } glade_widget_write_special_child_prop (glade_widget_get_parent (widget), glade_widget_get_object (widget), - context, child_node); + context, child_node); /* Default packing properties and such are not saved, * so lets check afterwords if there was anything saved @@ -1242,7 +1242,7 @@ glade_widget_adaptor_get_eprop_type (GParamSpec *pspec) else if (G_IS_PARAM_SPEC_BOXED (pspec)) { if (pspec->value_type == GDK_TYPE_COLOR || - pspec->value_type == GDK_TYPE_RGBA) + pspec->value_type == GDK_TYPE_RGBA) type = GLADE_TYPE_EPROP_COLOR; else if (pspec->value_type == G_TYPE_STRV) type = GLADE_TYPE_EPROP_TEXT; @@ -2097,9 +2097,9 @@ gwa_update_properties_from_node (GladeWidgetAdaptor *adaptor, } if ((updated = glade_property_class_update_from_node (child, - adaptor->priv->type, - &property_class, - domain)) == FALSE) + adaptor->priv->type, + &property_class, + domain)) == FALSE) { g_warning ("failed to update %s property of %s from xml", id, adaptor->priv->name); @@ -2280,7 +2280,7 @@ gwa_update_properties_from_type (GladeWidgetAdaptor *adaptor, { property_class = glade_property_class_new (adaptor, spec->name); - glade_property_class_set_pspec (property_class, spec); + glade_property_class_set_pspec (property_class, spec); /* Make sure we can tell properties apart by there * owning class. @@ -2288,17 +2288,17 @@ gwa_update_properties_from_type (GladeWidgetAdaptor *adaptor, spec->owner_type = adaptor->priv->type; /* Disable properties by default since the does not really implement them */ - glade_property_class_set_virtual (property_class, TRUE); - glade_property_class_set_ignore (property_class, TRUE); + glade_property_class_set_virtual (property_class, TRUE); + glade_property_class_set_ignore (property_class, TRUE); - glade_property_class_set_tooltip (property_class, g_param_spec_get_blurb (spec)); - glade_property_class_set_name (property_class, g_param_spec_get_nick (spec)); + glade_property_class_set_tooltip (property_class, g_param_spec_get_blurb (spec)); + glade_property_class_set_name (property_class, g_param_spec_get_nick (spec)); if (spec->flags & G_PARAM_CONSTRUCT_ONLY) - glade_property_class_set_construct_only (property_class, TRUE); + glade_property_class_set_construct_only (property_class, TRUE); - glade_property_class_load_defaults_from_spec (property_class); - glade_property_class_set_is_packing (property_class, is_packing); + glade_property_class_load_defaults_from_spec (property_class); + glade_property_class_set_is_packing (property_class, is_packing); *properties = g_list_append (*properties, property_class); } @@ -2371,8 +2371,8 @@ gwa_action_update_from_node (GladeWidgetAdaptor *adaptor, static void gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor, - GladeXmlNode *node, - const gchar *domain) + GladeXmlNode *node, + const gchar *domain) { GladeXmlNode *child; GladeSignalClass *signal; @@ -2394,7 +2394,7 @@ gwa_set_signals_from_node (GladeWidgetAdaptor *adaptor, { signal = list->data; - glade_signal_class_update_from_node (signal, child, domain); + glade_signal_class_update_from_node (signal, child, domain); } g_free (id); } @@ -2528,7 +2528,7 @@ gwa_displayable_values_check (GladeWidgetAdaptor *adaptor, gboolean packing) GParamSpec *pspec = glade_property_class_get_pspec (klass); if (adaptor->priv->type == pspec->owner_type && - glade_property_class_is_visible (klass) && + glade_property_class_is_visible (klass) && (G_IS_PARAM_SPEC_ENUM (pspec) || G_IS_PARAM_SPEC_FLAGS (pspec)) && !glade_type_has_displayable_values (pspec->value_type) && @@ -2536,10 +2536,10 @@ gwa_displayable_values_check (GladeWidgetAdaptor *adaptor, gboolean packing) pspec->value_type != GLADE_TYPE_STOCK_IMAGE) { /* We do not need displayable values if the property is not visible */ - if (g_getenv (GLADE_ENV_TESTING) == NULL) - g_message ("No displayable values for %sproperty %s::%s", - (packing) ? "child " : "", adaptor->priv->name, - glade_property_class_id (klass)); + if (g_getenv (GLADE_ENV_TESTING) == NULL) + g_message ("No displayable values for %sproperty %s::%s", + (packing) ? "child " : "", adaptor->priv->name, + glade_property_class_id (klass)); } } } @@ -2603,19 +2603,19 @@ generate_deprecated_icon (const gchar *icon_name) filename = g_build_filename (glade_app_get_pixmaps_dir (), "deprecated-16x16.png", NULL); if ((deprecated_pixbuf[0] = gdk_pixbuf_new_from_file (filename, &error)) == NULL) - { - g_warning ("Unable to render deprecated icon: %s", error->message); - error = (g_error_free (error), NULL); - } + { + g_warning ("Unable to render deprecated icon: %s", error->message); + error = (g_error_free (error), NULL); + } g_free (filename); filename = g_build_filename (glade_app_get_pixmaps_dir (), "deprecated-22x22.png", NULL); if ((deprecated_pixbuf[1] = gdk_pixbuf_new_from_file (filename, &error)) == NULL) - { - g_warning ("Unable to render deprecated icon: %s", error->message); - error = (g_error_free (error), NULL); - } + { + g_warning ("Unable to render deprecated icon: %s", error->message); + error = (g_error_free (error), NULL); + } g_free (filename); } @@ -2625,7 +2625,7 @@ generate_deprecated_icon (const gchar *icon_name) /* Load pixbuf's for the current icons */ if ((orig_pixbuf[0] = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - icon_name, 16, 0, &error)) == NULL) + icon_name, 16, 0, &error)) == NULL) { g_warning ("Unable to render icon %s at size 16: %s", icon_name, error->message); error = (g_error_free (error), NULL); @@ -2639,7 +2639,7 @@ generate_deprecated_icon (const gchar *icon_name) if ((orig_pixbuf[1] = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - icon_name, 22, 0, &error)) == NULL) + icon_name, 22, 0, &error)) == NULL) { g_warning ("Unable to render icon %s at size 22: %s", icon_name, error->message); error = (g_error_free (error), NULL); @@ -2656,12 +2656,12 @@ generate_deprecated_icon (const gchar *icon_name) if (!gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), deprecated)) { if (orig_pixbuf[0]) - gdk_pixbuf_composite (deprecated_pixbuf[0], orig_pixbuf[0], - 0, 0, 16, 16, 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + gdk_pixbuf_composite (deprecated_pixbuf[0], orig_pixbuf[0], + 0, 0, 16, 16, 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); if (orig_pixbuf[1]) - gdk_pixbuf_composite (deprecated_pixbuf[1], orig_pixbuf[1], - 0, 0, 22, 22, 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + gdk_pixbuf_composite (deprecated_pixbuf[1], orig_pixbuf[1], + 0, 0, 22, 22, 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); gtk_icon_theme_add_builtin_icon (deprecated, 16, orig_pixbuf[0]); gtk_icon_theme_add_builtin_icon (deprecated, 22, orig_pixbuf[1]); @@ -3216,7 +3216,7 @@ glade_widget_adaptor_default_params (GladeWidgetAdaptor *adaptor, */ if (pclass == NULL || /* Unaccounted for in the builder */ glade_property_class_get_virtual (pclass) || /* should not be set before - GladeWidget wrapper exists */ + GladeWidget wrapper exists */ glade_property_class_get_ignore (pclass)) /* Catalog explicitly ignores the object */ continue; @@ -3238,8 +3238,8 @@ glade_widget_adaptor_default_params (GladeWidgetAdaptor *adaptor, } if (g_param_values_cmp (pspec[i], - glade_property_class_get_default (pclass), - glade_property_class_get_original_default (pclass)) == 0) + glade_property_class_get_default (pclass), + glade_property_class_get_original_default (pclass)) == 0) continue; parameter.name = pspec[i]->name; /* These are not copied/freed */ @@ -3288,7 +3288,7 @@ glade_widget_adaptor_construct_object (GladeWidgetAdaptor *adaptor, */ void glade_widget_adaptor_destroy_object (GladeWidgetAdaptor *adaptor, - GObject *object) + GObject *object) { g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor)); @@ -3503,9 +3503,9 @@ glade_widget_adaptor_verify_property (GladeWidgetAdaptor *adaptor, */ gboolean glade_widget_adaptor_add_verify (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - gboolean user_feedback) + GObject *container, + GObject *child, + gboolean user_feedback) { g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), FALSE); g_return_val_if_fail (G_IS_OBJECT (container), FALSE); @@ -3895,7 +3895,7 @@ glade_widget_adaptor_action_add_real (GList **list, const gchar *action_path, const gchar *label, const gchar *stock, - gboolean important) + gboolean important) { GWActionClass *action, *group; const gchar *id; @@ -4062,7 +4062,7 @@ glade_widget_adaptor_actions_new (GladeWidgetAdaptor *adaptor) { GWActionClass *action = l->data; GObject *obj = g_object_new (GLADE_TYPE_WIDGET_ACTION, - "class", action, NULL); + "class", action, NULL); list = g_list_prepend (list, GLADE_WIDGET_ACTION (obj)); } @@ -4251,16 +4251,16 @@ glade_widget_adaptor_write_widget (GladeWidgetAdaptor *adaptor, */ void glade_widget_adaptor_write_widget_after (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor)); g_return_if_fail (GLADE_IS_WIDGET (widget)); g_return_if_fail (node != NULL); GLADE_WIDGET_ADAPTOR_GET_CLASS (adaptor)->write_widget_after (adaptor, widget, - context, node); + context, node); } diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h index 69d89af2..04797f19 100644 --- a/gladeui/glade-widget-adaptor.h +++ b/gladeui/glade-widget-adaptor.h @@ -59,9 +59,9 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * Evaluates to %TRUE if @adaptor is available in its owning library version-@major_verion.@minor_version. * */ -#define GWA_VERSION_CHECK(adaptor, major_version, minor_version) \ - ((GWA_VERSION_SINCE_MAJOR (adaptor) == major_version) ? \ - (GWA_VERSION_SINCE_MINOR (adaptor) <= minor_version) : \ +#define GWA_VERSION_CHECK(adaptor, major_version, minor_version) \ + ((GWA_VERSION_SINCE_MAJOR (adaptor) == major_version) ? \ + (GWA_VERSION_SINCE_MINOR (adaptor) <= minor_version) : \ (GWA_VERSION_SINCE_MAJOR (adaptor) <= major_version)) /** @@ -91,11 +91,11 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * Evaluates to %TRUE if @adaptor is deprecated in its owning library version-@major_verion.@minor_version. * */ -#define GWA_DEPRECATED_SINCE_CHECK(adaptor, major_version, minor_version) \ +#define GWA_DEPRECATED_SINCE_CHECK(adaptor, major_version, minor_version) \ ((GWA_DEPRECATED_SINCE_MAJOR (adaptor) || GWA_DEPRECATED_SINCE_MINOR (adaptor)) ? \ - ((GWA_DEPRECATED_SINCE_MAJOR (adaptor) == major_version) ? \ - (GWA_DEPRECATED_SINCE_MINOR (adaptor) <= minor_version) : \ - (GWA_DEPRECATED_SINCE_MAJOR (adaptor) <= major_version)) : \ + ((GWA_DEPRECATED_SINCE_MAJOR (adaptor) == major_version) ? \ + (GWA_DEPRECATED_SINCE_MINOR (adaptor) <= minor_version) : \ + (GWA_DEPRECATED_SINCE_MAJOR (adaptor) <= major_version)) : \ FALSE) /** @@ -147,11 +147,11 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * * Checks whether this is a GtkWidgetClass with scrolling capabilities. */ -#define GWA_SCROLLABLE_WIDGET(obj) \ - ((obj) ? \ - g_type_is_a (glade_widget_adaptor_get_object_type \ - (GLADE_WIDGET_ADAPTOR (obj)), \ - GTK_TYPE_SCROLLABLE) : FALSE) +#define GWA_SCROLLABLE_WIDGET(obj) \ + ((obj) ? \ + g_type_is_a (glade_widget_adaptor_get_object_type \ + (GLADE_WIDGET_ADAPTOR (obj)), \ + GTK_TYPE_SCROLLABLE) : FALSE) /** * GWA_GET_CLASS: @@ -160,8 +160,8 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; * Shorthand for referencing glade adaptor classes from * the plugin eg. GWA_GET_CLASS (GTK_TYPE_CONTAINER)->post_create (adaptor... */ -#define GWA_GET_CLASS(type) \ - (((type) == G_TYPE_OBJECT) ? \ +#define GWA_GET_CLASS(type) \ + (((type) == G_TYPE_OBJECT) ? \ (GladeWidgetAdaptorClass *)g_type_class_peek (GLADE_TYPE_WIDGET_ADAPTOR) : \ GLADE_WIDGET_ADAPTOR_GET_CLASS (glade_widget_adaptor_get_by_type(type))) @@ -204,11 +204,11 @@ typedef struct _GladeWidgetAdaptorClass GladeWidgetAdaptorClass; */ typedef enum { - GLADE_CREATE_USER = 0, - GLADE_CREATE_COPY, - GLADE_CREATE_LOAD, - GLADE_CREATE_REBUILD, - GLADE_CREATE_REASONS + GLADE_CREATE_USER = 0, + GLADE_CREATE_COPY, + GLADE_CREATE_LOAD, + GLADE_CREATE_REBUILD, + GLADE_CREATE_REASONS } GladeCreateReason; /** @@ -224,8 +224,8 @@ typedef enum * Returns: A newly created #GladeWidget for the said adaptor. */ typedef GladeWidget * (* GladeCreateWidgetFunc) (GladeWidgetAdaptor *adaptor, - const gchar *first_property_name, - va_list var_args); + const gchar *first_property_name, + va_list var_args); /** * GladeSetPropertyFunc: @@ -240,9 +240,9 @@ typedef GladeWidget * (* GladeCreateWidgetFunc) (GladeWidgetAdaptor *adaptor, * Sets @value on @object for a given #GladePropertyClass */ typedef void (* GladeSetPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - const GValue *value); + GObject *object, + const gchar *property_name, + const GValue *value); /** * GladeGetPropertyFunc: @@ -254,9 +254,9 @@ typedef void (* GladeSetPropertyFunc) (GladeWidgetAdaptor *adaptor, * Gets @value on @object for a given #GladePropertyClass */ typedef void (* GladeGetPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - GValue *value); + GObject *object, + const gchar *property_name, + GValue *value); /** * GladeVerifyPropertyFunc: @@ -274,9 +274,9 @@ typedef void (* GladeGetPropertyFunc) (GladeWidgetAdaptor *adaptor, * Returns: whether or not its OK to set @value on @object */ typedef gboolean (* GladeVerifyPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - const GValue *value); + GObject *object, + const gchar *property_name, + const GValue *value); /** * GladeChildSetPropertyFunc: @@ -290,10 +290,10 @@ typedef gboolean (* GladeVerifyPropertyFunc) (GladeWidgetAdaptor *adaptor, * on the @child object of @container. */ typedef void (* GladeChildSetPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - const GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value); /** * GladeChildGetPropertyFunc: @@ -307,10 +307,10 @@ typedef void (* GladeChildSetPropertyFunc) (GladeWidgetAdaptor *adaptor, * on the @child object of @container into @value. */ typedef void (* GladeChildGetPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value); /** * GladeChildVerifyPropertyFunc: @@ -329,10 +329,10 @@ typedef void (* GladeChildGetPropertyFunc) (GladeWidgetAdaptor *adaptor, * Returns: whether or not its OK to set @value on @object */ typedef gboolean (* GladeChildVerifyPropertyFunc) (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - const GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value); /** * GladeAddChildVerifyFunc: @@ -351,9 +351,9 @@ typedef gboolean (* GladeChildVerifyPropertyFunc) (GladeWidgetAdaptor *adaptor, * Returns: whether @child can be added to @parent. */ typedef gboolean (* GladeAddChildVerifyFunc) (GladeWidgetAdaptor *adaptor, - GObject *parent, - GObject *child, - gboolean user_feedback); + GObject *parent, + GObject *child, + gboolean user_feedback); /** * GladeGetChildrenFunc: @@ -365,7 +365,7 @@ typedef gboolean (* GladeAddChildVerifyFunc) (GladeWidgetAdaptor *adaptor, * Returns: A #GList of #GObject children. */ typedef GList *(* GladeGetChildrenFunc) (GladeWidgetAdaptor *adaptor, - GObject *container); + GObject *container); /** * GladeAddChildFunc: @@ -376,8 +376,8 @@ typedef GList *(* GladeGetChildrenFunc) (GladeWidgetAdaptor *adaptor, * Called to add @child to @parent. */ typedef void (* GladeAddChildFunc) (GladeWidgetAdaptor *adaptor, - GObject *parent, - GObject *child); + GObject *parent, + GObject *child); /** * GladeRemoveChildFunc: @@ -388,8 +388,8 @@ typedef void (* GladeAddChildFunc) (GladeWidgetAdaptor *adaptor, * Called to remove @child from @parent. */ typedef void (* GladeRemoveChildFunc) (GladeWidgetAdaptor *adaptor, - GObject *parent, - GObject *child); + GObject *parent, + GObject *child); /** * GladeReplaceChildFunc: @@ -402,9 +402,9 @@ typedef void (* GladeRemoveChildFunc) (GladeWidgetAdaptor *adaptor, * in containers. */ typedef void (* GladeReplaceChildFunc) (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *old_obj, - GObject *new_obj); + GObject *container, + GObject *old_obj, + GObject *new_obj); /** @@ -421,8 +421,8 @@ typedef void (* GladeReplaceChildFunc) (GladeWidgetAdaptor *adaptor, * Returns: A newly created #GObject */ typedef GObject *(* GladeConstructObjectFunc) (GladeWidgetAdaptor *adaptor, - guint n_parameters, - GParameter *parameters); + guint n_parameters, + GParameter *parameters); /** * GladeDestroyObjectFunc: @@ -444,7 +444,7 @@ typedef GObject *(* GladeConstructObjectFunc) (GladeWidgetAdaptor *adaptor, * */ typedef void (* GladeDestroyObjectFunc) (GladeWidgetAdaptor *adaptor, - GObject *object); + GObject *object); /** @@ -457,8 +457,8 @@ typedef void (* GladeDestroyObjectFunc) (GladeWidgetAdaptor *adaptor, * instance and can be for any #GladeCreateReason. */ typedef void (* GladePostCreateFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason); + GObject *object, + GladeCreateReason reason); /** * GladeGetInternalFunc: @@ -471,8 +471,8 @@ typedef void (* GladePostCreateFunc) (GladeWidgetAdaptor *adaptor, * Returns: The specified internal widget. */ typedef GObject *(* GladeGetInternalFunc) (GladeWidgetAdaptor *adaptor, - GObject *parent, - const gchar *name); + GObject *parent, + const gchar *name); /** * GladeActionActivateFunc: @@ -484,8 +484,8 @@ typedef GObject *(* GladeGetInternalFunc) (GladeWidgetAdaptor *adaptor, * */ typedef void (* GladeActionActivateFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path); + GObject *object, + const gchar *action_path); /** * GladeChildActionActivateFunc: @@ -498,9 +498,9 @@ typedef void (* GladeActionActivateFunc) (GladeWidgetAdaptor *adaptor, * */ typedef void (* GladeChildActionActivateFunc) (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *object, - const gchar *action_path); + GObject *container, + GObject *object, + const gchar *action_path); /** @@ -514,8 +514,8 @@ typedef void (* GladeChildActionActivateFunc) (GladeWidgetAdaptor *adaptor, * */ typedef GtkWidget *(* GladeActionSubmenuFunc) (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path); + GObject *object, + const gchar *action_path); /** @@ -531,8 +531,8 @@ typedef GtkWidget *(* GladeActionSubmenuFunc) (GladeWidgetAdaptor *adaptor, * the resulting glade file. */ typedef gboolean (* GladeDependsFunc) (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeWidget *another); + GladeWidget *widget, + GladeWidget *another); @@ -546,8 +546,8 @@ typedef gboolean (* GladeDependsFunc) (GladeWidgetAdaptor *adaptor, * */ typedef void (* GladeReadWidgetFunc) (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlNode *node); /** * GladeWriteWidgetFunc: @@ -559,9 +559,9 @@ typedef void (* GladeReadWidgetFunc) (GladeWidgetAdaptor *adaptor, * */ typedef void (* GladeWriteWidgetFunc) (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node); /** @@ -576,8 +576,8 @@ typedef void (* GladeWriteWidgetFunc) (GladeWidgetAdaptor *adaptor, * Returns: A newly created #GladeEditorProperty */ typedef GladeEditorProperty *(* GladeCreateEPropFunc) (GladeWidgetAdaptor *adaptor, - GladePropertyClass *klass, - gboolean use_command); + GladePropertyClass *klass, + gboolean use_command); /** * GladeStringFromValueFunc: @@ -593,8 +593,8 @@ typedef GladeEditorProperty *(* GladeCreateEPropFunc) (GladeWidgetAdaptor *adapt * Returns: A newly allocated string representation of @value */ typedef gchar *(* GladeStringFromValueFunc) (GladeWidgetAdaptor *adaptor, - GladePropertyClass *klass, - const GValue *value); + GladePropertyClass *klass, + const GValue *value); @@ -610,7 +610,7 @@ typedef gchar *(* GladeStringFromValueFunc) (GladeWidgetAdaptor *adaptor, * Returns: A new #GladeEditable widget */ typedef GladeEditable *(* GladeCreateEditableFunc) (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type); + GladeEditorPageType type); /* Note that everything that must be processed at the creation of @@ -637,42 +637,42 @@ struct _GladeWidgetAdaptorClass gint16 default_height; /* Default height in GladeDesignLayout */ guint deprecated : 1; /* If this widget is currently - * deprecated - */ + * deprecated + */ guint toplevel : 1; /* If this class is toplevel */ guint use_placeholders : 1; /* Whether or not to use placeholders - * to interface with child widgets. - */ + * to interface with child widgets. + */ GladeCreateWidgetFunc create_widget; /* Creates a GladeWidget for this adaptor */ GladeConstructObjectFunc construct_object; /* Object constructor - */ + */ GladePostCreateFunc deep_post_create; /* Executed after widget creation: - * plugins use this to setup various - * support codes (adaptors must always - * chain up in this stage of instantiation). - */ + * plugins use this to setup various + * support codes (adaptors must always + * chain up in this stage of instantiation). + */ GladePostCreateFunc post_create; /* Executed after widget creation: - * plugins use this to setup various - * support codes (adaptors are free here - * to chain up or not in this stage of - * instantiation). - */ + * plugins use this to setup various + * support codes (adaptors are free here + * to chain up or not in this stage of + * instantiation). + */ GladeGetInternalFunc get_internal_child; /* Retrieves the the internal child - * of the given name. - */ + * of the given name. + */ /* Delagate to verify if this is a valid value for this property, * if this function exists and returns FALSE, then glade_property_set * will abort before making any changes */ GladeVerifyPropertyFunc verify_property; - + /* An optional backend function used instead of g_object_set() * virtual properties must be handled with this function. */ @@ -692,25 +692,25 @@ struct _GladeWidgetAdaptorClass GladeAddChildFunc add; /* Adds a new child of this type */ GladeRemoveChildFunc remove; /* Removes a child from the container */ GladeGetChildrenFunc get_children; /* Returns a list of direct children for - * this support type. - */ + * this support type. + */ GladeChildVerifyPropertyFunc child_verify_property; /* A boundry checker for - * packing properties - */ + * packing properties + */ GladeChildSetPropertyFunc child_set_property; /* Sets/Gets a packing property */ GladeChildGetPropertyFunc child_get_property; /* for this child */ GladeReplaceChildFunc replace_child; /* This method replaces a - * child widget with - * another one: it's used to - * replace a placeholder with - * a widget and viceversa. - */ - + * child widget with + * another one: it's used to + * replace a placeholder with + * a widget and viceversa. + */ + GladeActionActivateFunc action_activate; /* This method is used to catch actions */ GladeChildActionActivateFunc child_action_activate; /* This method is used to catch packing actions */ GladeActionSubmenuFunc action_submenu; /* Delagate function to create dynamic submenus - * in action menus. */ + * in action menus. */ GladeDependsFunc depends; /* Periodically sort widgets in the project */ GladeReadWidgetFunc read_widget; /* Reads widget attributes from xml */ GladeWriteWidgetFunc write_widget; /* Writes widget attributes to the xml */ @@ -755,165 +755,165 @@ G_CONST_RETURN GList *glade_widget_adaptor_get_signals (GladeWidgetAdaptor GList *glade_widget_adaptor_list_adaptors (void); GladeWidgetAdaptor *glade_widget_adaptor_from_catalog (GladeCatalog *catalog, - GladeXmlNode *class_node, - GModule *module); + GladeXmlNode *class_node, + GModule *module); void glade_widget_adaptor_register (GladeWidgetAdaptor *adaptor); GladeWidget *glade_widget_adaptor_create_internal (GladeWidget *parent, - GObject *internal_object, - const gchar *internal_name, - const gchar *parent_name, - gboolean anarchist, - GladeCreateReason reason); + GObject *internal_object, + const gchar *internal_name, + const gchar *parent_name, + gboolean anarchist, + GladeCreateReason reason); GladeWidget *glade_widget_adaptor_create_widget_real (gboolean query, - const gchar *first_property, - ...); + const gchar *first_property, + ...); GladeWidgetAdaptor *glade_widget_adaptor_get_by_name (const gchar *name); GladeWidgetAdaptor *glade_widget_adaptor_get_by_type (GType type); GladeWidgetAdaptor *glade_widget_adaptor_from_pspec (GladeWidgetAdaptor *adaptor, - GParamSpec *spec); + GParamSpec *spec); GladePropertyClass *glade_widget_adaptor_get_property_class (GladeWidgetAdaptor *adaptor, - const gchar *name); + const gchar *name); GladePropertyClass *glade_widget_adaptor_get_pack_property_class (GladeWidgetAdaptor *adaptor, - const gchar *name); + const gchar *name); GParameter *glade_widget_adaptor_default_params (GladeWidgetAdaptor *adaptor, - gboolean construct, - guint *n_params); + gboolean construct, + guint *n_params); GObject *glade_widget_adaptor_construct_object (GladeWidgetAdaptor *adaptor, - guint n_parameters, - GParameter *parameters); + guint n_parameters, + GParameter *parameters); void glade_widget_adaptor_destroy_object (GladeWidgetAdaptor *adaptor, - GObject *object); + GObject *object); void glade_widget_adaptor_post_create (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason); + GObject *object, + GladeCreateReason reason); GObject *glade_widget_adaptor_get_internal_child (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *internal_name); + GObject *object, + const gchar *internal_name); void glade_widget_adaptor_set_property (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - const GValue *value); + GObject *object, + const gchar *property_name, + const GValue *value); void glade_widget_adaptor_get_property (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - GValue *value); + GObject *object, + const gchar *property_name, + GValue *value); gboolean glade_widget_adaptor_verify_property (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *property_name, - const GValue *value); + GObject *object, + const gchar *property_name, + const GValue *value); gboolean glade_widget_adaptor_add_verify (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - gboolean user_feedback); + GObject *container, + GObject *child, + gboolean user_feedback); void glade_widget_adaptor_add (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child); + GObject *container, + GObject *child); void glade_widget_adaptor_remove (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child); + GObject *container, + GObject *child); GList *glade_widget_adaptor_get_children (GladeWidgetAdaptor *adaptor, - GObject *container); + GObject *container); gboolean glade_widget_adaptor_has_child (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child); + GObject *container, + GObject *child); void glade_widget_adaptor_child_set_property (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - const GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value); void glade_widget_adaptor_child_get_property (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value); gboolean glade_widget_adaptor_child_verify_property (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - const GValue *value); + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value); void glade_widget_adaptor_replace_child (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *old_obj, - GObject *new_obj); + GObject *container, + GObject *old_obj, + GObject *new_obj); gboolean glade_widget_adaptor_query (GladeWidgetAdaptor *adaptor); G_CONST_RETURN gchar *glade_widget_adaptor_get_packing_default(GladeWidgetAdaptor *child_adaptor, - GladeWidgetAdaptor *container_adaptor, - const gchar *id); + GladeWidgetAdaptor *container_adaptor, + const gchar *id); gboolean glade_widget_adaptor_is_container (GladeWidgetAdaptor *adaptor); gboolean glade_widget_adaptor_action_add (GladeWidgetAdaptor *adaptor, - const gchar *action_path, - const gchar *label, - const gchar *stock, - gboolean important); + const gchar *action_path, + const gchar *label, + const gchar *stock, + gboolean important); gboolean glade_widget_adaptor_pack_action_add (GladeWidgetAdaptor *adaptor, - const gchar *action_path, - const gchar *label, - const gchar *stock, - gboolean important); + const gchar *action_path, + const gchar *label, + const gchar *stock, + gboolean important); gboolean glade_widget_adaptor_action_remove (GladeWidgetAdaptor *adaptor, - const gchar *action_path); + const gchar *action_path); gboolean glade_widget_adaptor_pack_action_remove (GladeWidgetAdaptor *adaptor, - const gchar *action_path); + const gchar *action_path); GList *glade_widget_adaptor_actions_new (GladeWidgetAdaptor *adaptor); GList *glade_widget_adaptor_pack_actions_new (GladeWidgetAdaptor *adaptor); void glade_widget_adaptor_action_activate (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path); + GObject *object, + const gchar *action_path); void glade_widget_adaptor_child_action_activate (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *object, - const gchar *action_path); + GObject *container, + GObject *object, + const gchar *action_path); GtkWidget *glade_widget_adaptor_action_submenu (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path); + GObject *object, + const gchar *action_path); G_DEPRECATED gboolean glade_widget_adaptor_depends (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeWidget *another); + GladeWidget *widget, + GladeWidget *another); void glade_widget_adaptor_read_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlNode *node); void glade_widget_adaptor_write_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_adaptor_write_widget_after (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_adaptor_read_child (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlNode *node); void glade_widget_adaptor_write_child (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node); GladeEditorProperty *glade_widget_adaptor_create_eprop (GladeWidgetAdaptor *adaptor, - GladePropertyClass *klass, - gboolean use_command); + GladePropertyClass *klass, + gboolean use_command); GladeEditorProperty *glade_widget_adaptor_create_eprop_by_name (GladeWidgetAdaptor *adaptor, - const gchar *property_id, - gboolean packing, - gboolean use_command); + const gchar *property_id, + gboolean packing, + gboolean use_command); gchar *glade_widget_adaptor_string_from_value (GladeWidgetAdaptor *adaptor, - GladePropertyClass *klass, - const GValue *value); + GladePropertyClass *klass, + const GValue *value); GladeEditable *glade_widget_adaptor_create_editable (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type); + GladeEditorPageType type); GladeSignalClass *glade_widget_adaptor_get_signal_class (GladeWidgetAdaptor *adaptor, - const gchar *name); + const gchar *name); GladeWidgetAdaptor *glade_widget_adaptor_get_parent_adaptor (GladeWidgetAdaptor *adaptor); gboolean glade_widget_adaptor_has_internal_children (GladeWidgetAdaptor *adaptor); diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c index 563f86e7..ccfaa500 100644 --- a/gladeui/glade-widget.c +++ b/gladeui/glade-widget.c @@ -72,80 +72,80 @@ struct _GladeWidgetPrivate { GladeWidgetAdaptor *adaptor; /* An adaptor class for the object type */ GladeProject *project; /* A pointer to the project that this - widget currently belongs to. */ + widget currently belongs to. */ GladeWidget *parent; /* A pointer to the parent widget in the hierarchy */ - + gchar *name; /* The name of the widget. For example window1 or - * button2. This is a unique name and is the one - * used when loading widget with libglade - */ + * button2. This is a unique name and is the one + * used when loading widget with libglade + */ gchar *support_warning; /* A warning message for version incompatabilities - * in this widget - */ + * in this widget + */ gchar *internal; /* If the widget is an internal child of - * another widget this is the name of the - * internal child, otherwise is NULL. - * Internal children cannot be deleted. - */ + * another widget this is the name of the + * internal child, otherwise is NULL. + * Internal children cannot be deleted. + */ gboolean anarchist; /* Some composite widgets have internal children - * that are not part of the same hierarchy; hence 'anarchists', - * typicly a popup window or its child (we need to mark - * them so we can avoid bookkeeping packing props on them etc.). - */ + * that are not part of the same hierarchy; hence 'anarchists', + * typicly a popup window or its child (we need to mark + * them so we can avoid bookkeeping packing props on them etc.). + */ GObject *object; /* A pointer to the object that was created. - * if it is a GtkWidget; it is shown as a "view" - * of the GladeWidget. This object is updated as - * the properties are modified for the GladeWidget. - */ + * if it is a GtkWidget; it is shown as a "view" + * of the GladeWidget. This object is updated as + * the properties are modified for the GladeWidget. + */ GList *properties; /* A list of GladeProperty. A GladeProperty is an - * instance of a GladePropertyClass. If a - * GladePropertyClass for a gtkbutton is label, its - * property is "Ok". - */ + * instance of a GladePropertyClass. If a + * GladePropertyClass for a gtkbutton is label, its + * property is "Ok". + */ GList *packing_properties; /* A list of GladeProperty. Note that these - * properties are related to the container - * of the widget, thus they change after - * pasting the widget to a different - * container. Toplevels widget do not have - * packing properties. - * See also child_properties of - * GladeWidgetClass. - */ + * properties are related to the container + * of the widget, thus they change after + * pasting the widget to a different + * container. Toplevels widget do not have + * packing properties. + * See also child_properties of + * GladeWidgetClass. + */ GHashTable *props_hash; /* A Quick reference table to speed up calls to glade_widget_get_property() - */ + */ GHashTable *pack_props_hash; /* A Quick reference table to speed up calls to glade_widget_get_pack_property() - */ + */ GHashTable *signals; /* A table with a GPtrArray of GladeSignals (signal handlers), - * indexed by its name */ + * indexed by its name */ GList *prop_refs; /* List of properties in the project who's value are `this object' - * (this is used to set/unset those properties when the object is - * added/removed from the project). - */ + * (this is used to set/unset those properties when the object is + * added/removed from the project). + */ gint width; /* Current size used in the UI, this is only */ gint height; /* usefull for parentless widgets in the - * GladeDesignLayout */ + * GladeDesignLayout */ - GList *actions; /* A GladeWidgetAction list */ + GList *actions; /* A GladeWidgetAction list */ - GList *packing_actions; /* A GladeWidgetAction list, this actions are - * related to the container and they are not always present. - */ + GList *packing_actions; /* A GladeWidgetAction list, this actions are + * related to the container and they are not always present. + */ GladeWidget *lock; /* The glade widget that has locked this widget down. - */ + */ GList *locked_widgets; /* A list of widgets this widget has locked down. - */ + */ GtkTreeModel *signal_model; /* Signal model (or NULL if not yet requested) */ @@ -158,8 +158,8 @@ struct _GladeWidgetPrivate { guint in_project : 1; guint visible : 1; /* Local copy of widget visibility, we need to keep track of this - * since the objects copy may be invalid due to a rebuild. - */ + * since the objects copy may be invalid due to a rebuild. + */ guint rebuilding : 1; guint composite : 1; }; @@ -216,7 +216,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeWidget, glade_widget, G_TYPE_INITIALLY_UNOWNED, *******************************************************************************/ static void glade_widget_set_packing_actions (GladeWidget *widget, - GladeWidget *parent) + GladeWidget *parent) { if (widget->priv->packing_actions) { @@ -246,8 +246,8 @@ glade_widget_add_child_impl (GladeWidget *widget, glade_widget_set_packing_actions (child, widget); glade_widget_adaptor_add (widget->priv->adaptor, - widget->priv->object, - child->priv->object); + widget->priv->object, + child->priv->object); /* XXX FIXME: * We have a fundamental flaw here, we set packing props @@ -335,7 +335,7 @@ glade_widget_add_signal_handler (GladeWidget *widget, { signals = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); g_hash_table_insert (widget->priv->signals, - g_strdup (glade_signal_get_name (signal_handler)), + g_strdup (glade_signal_get_name (signal_handler)), signals); } @@ -378,11 +378,11 @@ glade_widget_remove_signal_handler (GladeWidget *widget, tmp_signal_handler = g_ptr_array_index (signals, i); if (glade_signal_equal (tmp_signal_handler, signal_handler)) { - g_signal_emit (widget, glade_widget_signals[REMOVE_SIGNAL_HANDLER], 0, tmp_signal_handler); + g_signal_emit (widget, glade_widget_signals[REMOVE_SIGNAL_HANDLER], 0, tmp_signal_handler); g_ptr_array_remove_index (signals, i); - if (glade_signal_get_support_warning (tmp_signal_handler)) - glade_widget_verify (widget); + if (glade_signal_get_support_warning (tmp_signal_handler)) + glade_widget_verify (widget); g_object_unref (tmp_signal_handler); break; @@ -411,7 +411,7 @@ glade_widget_change_signal_handler (GladeWidget *widget, g_return_if_fail (GLADE_IS_SIGNAL (old_signal_handler)); g_return_if_fail (GLADE_IS_SIGNAL (new_signal_handler)); g_return_if_fail (strcmp (glade_signal_get_name (old_signal_handler), - glade_signal_get_name (new_signal_handler)) == 0); + glade_signal_get_name (new_signal_handler)) == 0); signals = glade_widget_list_signal_handlers (widget, glade_signal_get_name (old_signal_handler)); @@ -425,27 +425,27 @@ glade_widget_change_signal_handler (GladeWidget *widget, if (glade_signal_equal (signal_handler_iter, old_signal_handler)) { /* Detail */ - glade_signal_set_detail (signal_handler_iter, - glade_signal_get_detail (new_signal_handler)); + glade_signal_set_detail (signal_handler_iter, + glade_signal_get_detail (new_signal_handler)); /* Handler */ - glade_signal_set_handler (signal_handler_iter, - glade_signal_get_handler (new_signal_handler)); + glade_signal_set_handler (signal_handler_iter, + glade_signal_get_handler (new_signal_handler)); /* Object */ - glade_signal_set_userdata (signal_handler_iter, - glade_signal_get_userdata (new_signal_handler)); + glade_signal_set_userdata (signal_handler_iter, + glade_signal_get_userdata (new_signal_handler)); - /* Flags */ - glade_signal_set_after (signal_handler_iter, - glade_signal_get_after (new_signal_handler)); - glade_signal_set_swapped (signal_handler_iter, - glade_signal_get_swapped (new_signal_handler)); + /* Flags */ + glade_signal_set_after (signal_handler_iter, + glade_signal_get_after (new_signal_handler)); + glade_signal_set_swapped (signal_handler_iter, + glade_signal_get_swapped (new_signal_handler)); - g_signal_emit (widget, glade_widget_signals[CHANGE_SIGNAL_HANDLER], 0, - signal_handler_iter); + g_signal_emit (widget, glade_widget_signals[CHANGE_SIGNAL_HANDLER], 0, + signal_handler_iter); - break; + break; } } } @@ -478,7 +478,7 @@ glade_widget_button_press_event_impl (GladeWidget *gwidget, gwidget->priv->object) == FALSE) { glade_project_selection_set (gwidget->priv->project, - gwidget->priv->object, TRUE); + gwidget->priv->object, TRUE); /* Add selection without interrupting event flow * when shift is down, this allows better behaviour @@ -553,8 +553,8 @@ glade_widget_event (GladeWidget *gwidget, GdkEvent *event) #ifdef GLADE_ENABLE_DEBUG if (event->type != GDK_EXPOSE) GLADE_NOTE (WIDGET_EVENTS, - g_print ("event widget '%s' handled '%d' event '%d'\n", - gwidget->priv->name, handled, event->type)); + g_print ("event widget '%s' handled '%d' event '%d'\n", + gwidget->priv->name, handled, event->type)); #endif return handled; @@ -608,9 +608,9 @@ glade_widget_template_params (GladeWidget *widget, /* Ignore properties based on some criteria */ if (!glade_property_get_enabled (glade_property) || - pclass == NULL || /* Unaccounted for in the builder */ + pclass == NULL || /* Unaccounted for in the builder */ glade_property_class_get_virtual (pclass) || /* should not be set before - GladeWidget wrapper exists */ + GladeWidget wrapper exists */ glade_property_class_get_ignore (pclass)) /* Catalog explicitly ignores the object */ continue; @@ -627,7 +627,7 @@ glade_widget_template_params (GladeWidget *widget, { g_critical ("Type mismatch on %s property of %s", parameter.name, - glade_widget_adaptor_get_name (adaptor)); + glade_widget_adaptor_get_name (adaptor)); continue; } @@ -818,8 +818,8 @@ glade_widget_set_catalog_defaults (GList *list) if (glade_property_equals_value (prop, glade_property_class_get_original_default (klass)) && g_param_values_cmp (pspec, - glade_property_class_get_original_default (klass), - glade_property_class_get_default (klass))) + glade_property_class_get_original_default (klass), + glade_property_class_get_default (klass))) glade_property_reset (prop); } } @@ -834,7 +834,7 @@ glade_widget_sync_custom_props (GladeWidget *widget) GladePropertyClass *pclass = glade_property_get_class (prop); if (glade_property_class_get_virtual (pclass) || - glade_property_class_needs_sync (pclass)) + glade_property_class_needs_sync (pclass)) glade_property_sync (prop); } } @@ -894,7 +894,7 @@ glade_widget_constructor (GType type, for (list = gwidget->priv->properties; list; list = list->next) { GladeProperty *property = list->data; - GladePropertyClass *pclass = glade_property_get_class (property); + GladePropertyClass *pclass = glade_property_get_class (property); if (glade_property_class_parentless_widget (pclass)) glade_property_sync (property); @@ -961,7 +961,7 @@ glade_widget_finalize (GObject *object) g_return_if_fail (GLADE_IS_WIDGET (object)); GLADE_NOTE (REF_COUNTS, - g_print ("Finalizing widget %s\n", widget->priv->name)); + g_print ("Finalizing widget %s\n", widget->priv->name)); g_free (widget->priv->name); g_free (widget->priv->internal); @@ -1001,7 +1001,7 @@ glade_widget_dispose (GObject *object) GladeWidget *child = glade_widget_get_from_gobject (l->data); if (glade_widget_get_internal (child) == NULL) - glade_widget_remove_child (widget, child); + glade_widget_remove_child (widget, child); } g_list_free (children); @@ -1126,7 +1126,7 @@ glade_widget_set_real_property (GObject *object, break; case PROP_COMPOSITE: glade_widget_set_is_composite (widget, g_value_get_boolean (value)); - break; + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1186,7 +1186,7 @@ glade_widget_get_real_property (GObject *object, break; case PROP_COMPOSITE: g_value_set_boolean (value, glade_widget_get_is_composite (widget)); - break; + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1461,7 +1461,7 @@ glade_widget_class_init (GladeWidgetClass *klass) * GladeWidget::remove-signal-handler: * @gladewidget: the #GladeWidget which received the signal. * @arg1: the #GladeSignal that was removed from @gladewidget. - */ + */ glade_widget_signals[REMOVE_SIGNAL_HANDLER] = g_signal_new ("remove-signal-handler", G_TYPE_FROM_CLASS (object_class), @@ -1592,7 +1592,7 @@ glade_widget_set_default_packing_properties (GladeWidget *container, if ((def = glade_widget_adaptor_get_packing_default (child->priv->adaptor, container->priv->adaptor, - glade_property_class_id (property_class))) == NULL) + glade_property_class_id (property_class))) == NULL) continue; value = glade_property_class_make_gvalue_from_string (property_class, @@ -1610,8 +1610,8 @@ glade_widget_set_default_packing_properties (GladeWidget *container, */ static GObject * glade_widget_get_internal_child (GladeWidget *main_target, - GladeWidget *parent, - const gchar *internal) + GladeWidget *parent, + const gchar *internal) { while (parent) { @@ -1649,12 +1649,12 @@ glade_widget_dup_internal (GladeWidget *main_target, GObject *internal_object = NULL; if ((internal_object = - glade_widget_get_internal_child (main_target, - parent, - template_widget->priv->internal)) != NULL) - { - gwidget = glade_widget_get_from_gobject (internal_object); - g_assert (gwidget); + glade_widget_get_internal_child (main_target, + parent, + template_widget->priv->internal)) != NULL) + { + gwidget = glade_widget_get_from_gobject (internal_object); + g_assert (gwidget); } } @@ -1856,25 +1856,25 @@ glade_widget_insert_children (GladeWidget *gwidget, GList *children) * widgets. */ internal_object = glade_widget_get_internal_child (NULL, - gwidget, - extract->internal_name); - - /* Some internal children can disappear after a construct only - * property has changed, eg. the "has-entry" property of - * GtkComboBox decides whether there is an internal entry. - * - * Just ignore the saved information we have about missing internal - * children. - */ - if (!internal_object) - { - if (extract->properties) - g_list_free_full (extract->properties, (GDestroyNotify)g_object_unref); - - g_free (extract->internal_name); - g_free (extract); - continue; - } + gwidget, + extract->internal_name); + + /* Some internal children can disappear after a construct only + * property has changed, eg. the "has-entry" property of + * GtkComboBox decides whether there is an internal entry. + * + * Just ignore the saved information we have about missing internal + * children. + */ + if (!internal_object) + { + if (extract->properties) + g_list_free_full (extract->properties, (GDestroyNotify)g_object_unref); + + g_free (extract->internal_name); + g_free (extract); + continue; + } gchild = glade_widget_get_from_gobject (internal_object); @@ -1886,9 +1886,9 @@ glade_widget_insert_children (GladeWidget *gwidget, GList *children) { GValue value = { 0, }; GladeProperty *saved_prop = l->data; - GladePropertyClass *pclass = glade_property_get_class (saved_prop); + GladePropertyClass *pclass = glade_property_get_class (saved_prop); GladeProperty *widget_prop = - glade_widget_get_property (gchild, glade_property_class_id (pclass)); + glade_widget_get_property (gchild, glade_property_class_id (pclass)); glade_property_get_value (saved_prop, &value); glade_property_set_value (widget_prop, &value); @@ -1912,9 +1912,9 @@ glade_widget_insert_children (GladeWidget *gwidget, GList *children) { GValue value = { 0, }; GladeProperty *saved_prop = l->data; - GladePropertyClass *pclass = glade_property_get_class (saved_prop); + GladePropertyClass *pclass = glade_property_get_class (saved_prop); GladeProperty *widget_prop = - glade_widget_get_pack_property (extract->widget, glade_property_class_id (pclass)); + glade_widget_get_pack_property (extract->widget, glade_property_class_id (pclass)); glade_property_get_value (saved_prop, &value); glade_property_set_value (widget_prop, &value); @@ -1961,16 +1961,16 @@ glade_widget_set_properties (GladeWidget *widget, GList *properties) for (list = properties; list; list = list->next) { - GladePropertyClass *pclass; + GladePropertyClass *pclass; property = list->data; - pclass = glade_property_get_class (property); - glade_property_set_widget (property, widget); + pclass = glade_property_get_class (property); + glade_property_set_widget (property, widget); g_hash_table_insert (widget->priv->props_hash, - (gchar *)glade_property_class_id (pclass), - property); + (gchar *)glade_property_class_id (pclass), + property); } } } @@ -2001,7 +2001,7 @@ glade_widget_set_adaptor (GladeWidget *widget, GladeWidgetAdaptor *adaptor) widget, NULL)) == NULL) { g_warning ("Failed to create [%s] property", - glade_property_class_id (property_class)); + glade_property_class_id (property_class)); continue; } properties = g_list_prepend (properties, property); @@ -2149,7 +2149,7 @@ glade_widget_add_prop_ref (GladeWidget *widget, GladeProperty *property) GladeProject *project = glade_widget_get_project (widget); if (project) - glade_project_widget_changed (project, widget); + glade_project_widget_changed (project, widget); glade_widget_hide (widget); } @@ -2181,7 +2181,7 @@ glade_widget_remove_prop_ref (GladeWidget *widget, GladeProperty *property) GladeProject *project = glade_widget_get_project (widget); if (project) - glade_project_widget_changed (project, widget); + glade_project_widget_changed (project, widget); } } @@ -2350,9 +2350,9 @@ glade_widget_copy_properties (GladeWidget *widget, widget_pclass = glade_property_get_class (widget_prop); template_prop = glade_widget_get_property (template_widget, - glade_property_class_id (widget_pclass)); + glade_property_class_id (widget_pclass)); if (template_prop) - template_pclass = glade_property_get_class (template_prop); + template_pclass = glade_property_get_class (template_prop); /* Check if they share the same class definition, different * properties may have the same name (support for @@ -2404,16 +2404,16 @@ glade_widget_copy_properties (GladeWidget *widget, */ gboolean glade_widget_add_verify (GladeWidget *widget, - GladeWidget *child, - gboolean user_feedback) + GladeWidget *child, + gboolean user_feedback) { g_return_val_if_fail (GLADE_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GLADE_IS_WIDGET (child), FALSE); return glade_widget_adaptor_add_verify (widget->priv->adaptor, - widget->priv->object, - child->priv->object, - user_feedback); + widget->priv->object, + child->priv->object, + user_feedback); } /** @@ -2520,8 +2520,8 @@ glade_widget_rebuild (GladeWidget *gwidget) if (gwidget->priv->parent && glade_widget_adaptor_has_child (gwidget->priv->parent->priv->adaptor, - gwidget->priv->parent->priv->object, - gwidget->priv->object)) + gwidget->priv->parent->priv->object, + gwidget->priv->object)) parent = gwidget->priv->parent; g_object_ref (gwidget); @@ -2555,7 +2555,7 @@ glade_widget_rebuild (GladeWidget *gwidget) GladePropertyClass *pclass = glade_property_get_class (property); if (glade_property_get_widget (property) != gwidget || - glade_property_class_parentless_widget (pclass)) + glade_property_class_parentless_widget (pclass)) { PropertyData *prop_data; @@ -2566,7 +2566,7 @@ glade_widget_rebuild (GladeWidget *gwidget) prop_data->property = property; if (glade_property_get_widget (property) == gwidget) - glade_property_get_value (property, &prop_data->value); + glade_property_get_value (property, &prop_data->value); restore_properties = g_list_prepend (restore_properties, prop_data); glade_property_set (property, NULL); @@ -2789,9 +2789,9 @@ glade_widget_set_is_composite (GladeWidget *widget, gboolean composite) /* Update the project model when this changes */ if (widget->priv->parent == NULL && - widget->priv->project != NULL && - glade_project_has_object (widget->priv->project, widget->priv->object)) - glade_project_widget_changed (project, widget); + widget->priv->project != NULL && + glade_project_has_object (widget->priv->project, widget->priv->object)) + glade_project_widget_changed (project, widget); } } @@ -3270,7 +3270,7 @@ glade_widget_pack_property_set_save_always (GladeWidget *widget, gchar * glade_widget_property_string (GladeWidget *widget, const gchar *id_property, - const GValue *value) + const GValue *value) { GladeProperty *property; GladePropertyClass *pclass; @@ -3284,7 +3284,7 @@ glade_widget_property_string (GladeWidget *widget, pclass = glade_property_get_class (property); ret_string = glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (pclass), pclass, - value ? value : glade_property_inline_value (property)); + value ? value : glade_property_inline_value (property)); } return ret_string; @@ -3318,7 +3318,7 @@ glade_widget_pack_property_string (GladeWidget *widget, pclass = glade_property_get_class (property); ret_string = glade_widget_adaptor_string_from_value (glade_property_class_get_adaptor (pclass), pclass, - value ? value : glade_property_inline_value (property)); + value ? value : glade_property_inline_value (property)); } return ret_string; @@ -3624,14 +3624,14 @@ glade_widget_set_object (GladeWidget *gwidget, GObject *new_object) { if (gwidget->priv->internal == NULL) { - GLADE_NOTE (REF_COUNTS, - g_print ("Killing '%s::%s' widget's object with reference count %d\n", - glade_widget_adaptor_get_name (gwidget->priv->adaptor), - gwidget->priv->name ? gwidget->priv->name : "(unknown)", - old_object->ref_count)); - - /* Have the adaptor for this widget break any additional references */ - glade_widget_adaptor_destroy_object (gwidget->priv->adaptor, old_object); + GLADE_NOTE (REF_COUNTS, + g_print ("Killing '%s::%s' widget's object with reference count %d\n", + glade_widget_adaptor_get_name (gwidget->priv->adaptor), + gwidget->priv->name ? gwidget->priv->name : "(unknown)", + old_object->ref_count)); + + /* Have the adaptor for this widget break any additional references */ + glade_widget_adaptor_destroy_object (gwidget->priv->adaptor, old_object); } /* From this point on, the GladeWidget is no longer retrievable with @@ -3858,15 +3858,15 @@ glade_widget_set_packing_properties (GladeWidget *widget, GladePropertyClass *pclass = glade_property_get_class (property); g_hash_table_insert (widget->priv->pack_props_hash, - (gchar *)glade_property_class_id (pclass), - property); + (gchar *)glade_property_class_id (pclass), + property); } /* Dont introspect on properties that are not parented yet. */ if (glade_widget_adaptor_has_child (container->priv->adaptor, container->priv->object, - widget->priv->object)) + widget->priv->object)) { glade_widget_set_default_packing_properties (container, widget); @@ -3874,16 +3874,16 @@ glade_widget_set_packing_properties (GladeWidget *widget, for (list = widget->priv->packing_properties; list && list->data; list = list->next) { - /* XXX Ugly dangerous code, plays with the property value inline */ + /* XXX Ugly dangerous code, plays with the property value inline */ GladeProperty *property = list->data; - GladePropertyClass *pclass = glade_property_get_class (property); - GValue *value = glade_property_inline_value (property); + GladePropertyClass *pclass = glade_property_get_class (property); + GValue *value = glade_property_inline_value (property); g_value_reset (value); glade_widget_child_get_property (container, - widget, - glade_property_class_id (pclass), - value); + widget, + glade_property_class_id (pclass), + value); } } } @@ -3976,8 +3976,8 @@ glade_widget_set_child_type_from_node (GladeWidget *parent, return; g_object_get (parent->priv->adaptor, - "special-child-type", &special_child_type, - NULL); + "special-child-type", &special_child_type, + NULL); if (!special_child_type) return; @@ -4038,7 +4038,7 @@ glade_widget_read (GladeProject *project, return NULL; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return NULL; if (glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)) @@ -4051,25 +4051,25 @@ glade_widget_read (GladeProject *project, (node, GLADE_XML_TAG_CLASS, NULL)) != NULL) { if (template) - { - template_parent = glade_xml_get_property_string_required (node, GLADE_TAG_PARENT, NULL); + { + template_parent = glade_xml_get_property_string_required (node, GLADE_TAG_PARENT, NULL); - if (template_parent) - id = g_strdup (klass); - } + if (template_parent) + id = g_strdup (klass); + } else - { - id = glade_xml_get_property_string (node, GLADE_XML_TAG_ID); - - /* Here we use an internal unnamed prefix to identify unnamed widgets, then - * we just issue a warning if anyone was dense enough to actually use - * this prefix in a project as a widget name. - */ - if (!id) - id = glade_project_new_widget_name (project, NULL, GLADE_UNNAMED_PREFIX); - else if (strncmp (id, GLADE_UNNAMED_PREFIX, strlen (GLADE_UNNAMED_PREFIX)) == 0) - g_warning ("Loaded widget `%s' has internal glade prefix, please rename this widget", id); - } + { + id = glade_xml_get_property_string (node, GLADE_XML_TAG_ID); + + /* Here we use an internal unnamed prefix to identify unnamed widgets, then + * we just issue a warning if anyone was dense enough to actually use + * this prefix in a project as a widget name. + */ + if (!id) + id = glade_project_new_widget_name (project, NULL, GLADE_UNNAMED_PREFIX); + else if (strncmp (id, GLADE_UNNAMED_PREFIX, strlen (GLADE_UNNAMED_PREFIX)) == 0) + g_warning ("Loaded widget `%s' has internal glade prefix, please rename this widget", id); + } if (template_parent) { @@ -4097,60 +4097,60 @@ glade_widget_read (GladeProject *project, * Create GladeWidget instance based on type. */ if ((adaptor = glade_widget_adaptor_get_by_name (type_to_use)) && - (type = glade_widget_adaptor_get_object_type (adaptor)) && - G_TYPE_IS_INSTANTIATABLE (type) && - G_TYPE_IS_ABSTRACT (type) == FALSE) - { - /* Internal children !!! */ - if (internal) - { - GObject *child_object = - glade_widget_get_internal_child (NULL, parent, internal); - - if (!child_object) - { - g_warning ("Failed to locate " - "internal child %s of %s", - internal, glade_widget_get_name (parent)); - goto out; - } - - if (!(widget = glade_widget_get_from_gobject (child_object))) - g_warning ("Unable to get GladeWidget " - "for internal child %s\n", internal); - - /* Apply internal widget name from here */ - glade_widget_set_name (widget, id); - } - else - { - widget = glade_widget_adaptor_create_widget - (adaptor, FALSE, - "name", id, - "composite", template, - "parent", parent, - "project", project, "reason", GLADE_CREATE_LOAD, NULL); - } - - glade_widget_adaptor_read_widget (adaptor, widget, node); - } + (type = glade_widget_adaptor_get_object_type (adaptor)) && + G_TYPE_IS_INSTANTIATABLE (type) && + G_TYPE_IS_ABSTRACT (type) == FALSE) + { + /* Internal children !!! */ + if (internal) + { + GObject *child_object = + glade_widget_get_internal_child (NULL, parent, internal); + + if (!child_object) + { + g_warning ("Failed to locate " + "internal child %s of %s", + internal, glade_widget_get_name (parent)); + goto out; + } + + if (!(widget = glade_widget_get_from_gobject (child_object))) + g_warning ("Unable to get GladeWidget " + "for internal child %s\n", internal); + + /* Apply internal widget name from here */ + glade_widget_set_name (widget, id); + } + else + { + widget = glade_widget_adaptor_create_widget + (adaptor, FALSE, + "name", id, + "composite", template, + "parent", parent, + "project", project, "reason", GLADE_CREATE_LOAD, NULL); + } + + glade_widget_adaptor_read_widget (adaptor, widget, node); + } else - { - GObject *stub = g_object_new (GLADE_TYPE_OBJECT_STUB, - "object-type", klass, - "xml-node", node, - NULL); + { + GObject *stub = g_object_new (GLADE_TYPE_OBJECT_STUB, + "object-type", klass, + "xml-node", node, + NULL); - widget = glade_widget_adaptor_create_widget (glade_widget_adaptor_get_by_type (GTK_TYPE_WIDGET), - FALSE, - "parent", parent, - "composite", template, - "project", project, - "reason", GLADE_CREATE_LOAD, - "object", stub, - "name", id, - NULL); - } + widget = glade_widget_adaptor_create_widget (glade_widget_adaptor_get_by_type (GTK_TYPE_WIDGET), + FALSE, + "parent", parent, + "composite", template, + "project", project, + "reason", GLADE_CREATE_LOAD, + "object", stub, + "name", id, + NULL); + } g_free (id); g_free (template_parent); @@ -4309,19 +4309,19 @@ glade_widget_write_signals (GladeWidget *widget, gint i; for (i = 0; i < signals->len; i++) - { - signal = g_ptr_array_index (signals, i); + { + signal = g_ptr_array_index (signals, i); - sorted_signals = g_list_prepend (sorted_signals, signal); - } + sorted_signals = g_list_prepend (sorted_signals, signal); + } } sorted_signals = g_list_sort (sorted_signals, (GCompareFunc)signal_compare); for (l = sorted_signals; l; l = l->next) { - signal = l->data; - glade_signal_write (signal, context, node); + signal = l->data; + glade_signal_write (signal, context, node); } g_list_free (sorted_signals); @@ -4369,14 +4369,14 @@ glade_widget_write (GladeWidget *widget, { widget_node = glade_xml_node_new (context, GLADE_XML_TAG_WIDGET); glade_xml_node_set_property_string (widget_node, - GLADE_XML_TAG_CLASS, - glade_widget_adaptor_get_name (widget->priv->adaptor)); + GLADE_XML_TAG_CLASS, + glade_widget_adaptor_get_name (widget->priv->adaptor)); /* Conditionally omit the ID in the output if the name is 'unset' */ if (glade_widget_has_name (widget) || glade_project_writing_preview (widget->priv->project)) - glade_xml_node_set_property_string (widget_node, - GLADE_XML_TAG_ID, widget->priv->name); + glade_xml_node_set_property_string (widget_node, + GLADE_XML_TAG_ID, widget->priv->name); } glade_xml_node_append_child (node, widget_node); @@ -4566,7 +4566,7 @@ glade_widget_action_lookup (GList *actions, const gchar *path) GList *children = glade_widget_action_get_children (action); if (strcmp (aclass->path, path) == 0) - return action; + return action; if (children && g_str_has_prefix (path, aclass->path) && @@ -4698,8 +4698,8 @@ glade_widget_set_pack_action_sensitive (GladeWidget *widget, */ gboolean glade_widget_set_action_visible (GladeWidget *widget, - const gchar *action_path, - gboolean visible) + const gchar *action_path, + gboolean visible) { GladeWidgetAction *action; @@ -4725,8 +4725,8 @@ glade_widget_set_action_visible (GladeWidget *widget, */ gboolean glade_widget_set_pack_action_visible (GladeWidget *widget, - const gchar *action_path, - gboolean visible) + const gchar *action_path, + gboolean visible) { GladeWidgetAction *action; @@ -4847,7 +4847,7 @@ glade_widget_verify (GladeWidget *widget) if (!warning) warning = glade_project_verify_widget_adaptor (priv->project, priv->adaptor, - NULL); + NULL); /* If there is already support issues with the adaptor, skip signals * and properties @@ -4864,82 +4864,82 @@ glade_widget_verify (GladeWidget *widget) /* Collect signals with warnings on them */ g_hash_table_iter_init (&iter, priv->signals); while (g_hash_table_iter_next (&iter, &key, &value)) - { - GPtrArray *signals = (GPtrArray *)value; - gint i; + { + GPtrArray *signals = (GPtrArray *)value; + gint i; - for (i = 0; i < signals->len; i++) - { - GladeSignal *signal = g_ptr_array_index (signals, i); + for (i = 0; i < signals->len; i++) + { + GladeSignal *signal = g_ptr_array_index (signals, i); - if (glade_signal_get_support_warning (signal)) - warn_signals = g_list_prepend (warn_signals, signal); - } - } + if (glade_signal_get_support_warning (signal)) + warn_signals = g_list_prepend (warn_signals, signal); + } + } /* Collect properties with warnings on them */ for (l = priv->properties; l; l = g_list_next (l)) - { - GladeProperty *property = l->data; + { + GladeProperty *property = l->data; - if (glade_property_warn_usage (property)) - warn_properties = g_list_prepend (warn_properties, property); - } + if (glade_property_warn_usage (property)) + warn_properties = g_list_prepend (warn_properties, property); + } for (l = priv->packing_properties; l; l = g_list_next (l)) - { - GladeProperty *property = l->data; + { + GladeProperty *property = l->data; - if (glade_property_warn_usage (property)) - warn_properties = g_list_prepend (warn_properties, property); - } + if (glade_property_warn_usage (property)) + warn_properties = g_list_prepend (warn_properties, property); + } if (warn_signals || warn_properties) - string = g_string_new (NULL); + string = g_string_new (NULL); /* Print out property warnings */ for (l = warn_properties; l; l = g_list_next (l)) - { - GladeProperty *property = l->data; - GladePropertyClass *pclass = glade_property_get_class (property); - - if (l->prev == NULL) - { - if (l->next == NULL) - g_string_append (string, _("Property has versioning problems: ")); - else - g_string_append (string, _("Some properties have versioning problems: ")); - } - else - g_string_append (string, ", "); - - g_string_append (string, glade_property_class_get_name (pclass)); - } + { + GladeProperty *property = l->data; + GladePropertyClass *pclass = glade_property_get_class (property); + + if (l->prev == NULL) + { + if (l->next == NULL) + g_string_append (string, _("Property has versioning problems: ")); + else + g_string_append (string, _("Some properties have versioning problems: ")); + } + else + g_string_append (string, ", "); + + g_string_append (string, glade_property_class_get_name (pclass)); + } /* New line if printing both */ if (warn_signals && warn_properties) - g_string_append (string, "\n"); + g_string_append (string, "\n"); /* Print out signal warnings */ for (l = warn_signals; l; l = g_list_next (l)) - { - GladeSignal *signal = l->data; - - if (l->prev == NULL) - { - if (l->next == NULL) - g_string_append (string, _("Signal has versioning problems: ")); - else - g_string_append (string, _("Some signals have versioning problems: ")); - } - else - g_string_append (string, ", "); - - g_string_append (string, glade_signal_get_name (signal)); - } + { + GladeSignal *signal = l->data; + + if (l->prev == NULL) + { + if (l->next == NULL) + g_string_append (string, _("Signal has versioning problems: ")); + else + g_string_append (string, _("Some signals have versioning problems: ")); + } + else + g_string_append (string, ", "); + + g_string_append (string, glade_signal_get_name (signal)); + } if (string) - warning = g_string_free (string, FALSE); + warning = g_string_free (string, FALSE); } glade_widget_set_support_warning (widget, warning); @@ -5058,12 +5058,12 @@ glade_widget_support_changed (GladeWidget *widget) GtkTreeModel * glade_widget_get_signal_model (GladeWidget *widget) { - if (!widget->priv->signal_model) - { - widget->priv->signal_model = glade_signal_model_new (widget, + if (!widget->priv->signal_model) + { + widget->priv->signal_model = glade_signal_model_new (widget, widget->priv->signals); - } - return widget->priv->signal_model; + } + return widget->priv->signal_model; } GList * @@ -5084,18 +5084,18 @@ glade_widget_get_packing_properties (GladeWidget *widget) void glade_widget_ensure_name (GladeWidget *widget, - GladeProject *project, - gboolean use_command) + GladeProject *project, + gboolean use_command) { if (!glade_widget_has_name (widget)) { gchar *new_name = glade_project_new_widget_name (project, NULL, - glade_widget_adaptor_get_generic_name (widget->priv->adaptor)); + glade_widget_adaptor_get_generic_name (widget->priv->adaptor)); if (use_command) - glade_command_set_name (widget, new_name); + glade_command_set_name (widget, new_name); else - glade_widget_set_name (widget, new_name); + glade_widget_set_name (widget, new_name); g_free (new_name); } diff --git a/gladeui/glade-widget.h b/gladeui/glade-widget.h index 80fa9ee0..6ca09ea0 100644 --- a/gladeui/glade-widget.h +++ b/gladeui/glade-widget.h @@ -36,9 +36,9 @@ struct _GladeWidgetClass void (*remove_child) (GladeWidget *, GladeWidget *); void (*replace_child) (GladeWidget *, GObject *, GObject *); - void (*add_signal_handler) (GladeWidget *, GladeSignal *); - void (*remove_signal_handler) (GladeWidget *, GladeSignal *); - void (*change_signal_handler) (GladeWidget *, GladeSignal *); + void (*add_signal_handler) (GladeWidget *, GladeSignal *); + void (*remove_signal_handler) (GladeWidget *, GladeSignal *); + void (*change_signal_handler) (GladeWidget *, GladeSignal *); gint (*button_press_event) (GladeWidget *, GdkEvent *); gint (*button_release_event) (GladeWidget *, GdkEvent *); @@ -61,185 +61,185 @@ struct _GladeWidgetClass */ #define GLADE_UNNAMED_PREFIX "__glade_unnamed_" -#define IS_GLADE_WIDGET_EVENT(event) \ - ((event) == GDK_BUTTON_PRESS || \ - (event) == GDK_BUTTON_RELEASE || \ - (event) == GDK_MOTION_NOTIFY) +#define IS_GLADE_WIDGET_EVENT(event) \ + ((event) == GDK_BUTTON_PRESS || \ + (event) == GDK_BUTTON_RELEASE || \ + (event) == GDK_MOTION_NOTIFY) /******************************************************************************* General api *******************************************************************************/ -GType glade_widget_get_type (void); +GType glade_widget_get_type (void); GladeWidget *glade_widget_get_from_gobject (gpointer object); gboolean glade_widget_add_verify (GladeWidget *parent, - GladeWidget *child, - gboolean user_feedback); + GladeWidget *child, + gboolean user_feedback); void glade_widget_add_child (GladeWidget *parent, - GladeWidget *child, - gboolean at_mouse); + GladeWidget *child, + gboolean at_mouse); void glade_widget_remove_child (GladeWidget *parent, - GladeWidget *child); + GladeWidget *child); void glade_widget_replace (GladeWidget *parent, - GObject *old_object, - GObject *new_object); + GObject *old_object, + GObject *new_object); void glade_widget_rebuild (GladeWidget *gwidget); GladeWidget *glade_widget_dup (GladeWidget *template_widget, - gboolean exact); + gboolean exact); GList *glade_widget_get_signal_list (GladeWidget *widget); void glade_widget_copy_signals (GladeWidget *widget, - GladeWidget *template_widget); + GladeWidget *template_widget); void glade_widget_copy_properties (GladeWidget *widget, - GladeWidget *template_widget, - gboolean copy_parentless, - gboolean exact); + GladeWidget *template_widget, + gboolean copy_parentless, + gboolean exact); void glade_widget_set_packing_properties (GladeWidget *widget, - GladeWidget *container); + GladeWidget *container); GList *glade_widget_get_properties (GladeWidget *widget); GList *glade_widget_get_packing_properties (GladeWidget *widget); GladeProperty *glade_widget_get_property (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); GladeProperty *glade_widget_get_pack_property (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); GList *glade_widget_dup_properties (GladeWidget *dest_widget, - GList *template_props, + GList *template_props, gboolean as_load, - gboolean copy_parentless, - gboolean exact); + gboolean copy_parentless, + gboolean exact); void glade_widget_remove_property (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); void glade_widget_show (GladeWidget *widget); void glade_widget_hide (GladeWidget *widget); void glade_widget_add_signal_handler (GladeWidget *widget, - const GladeSignal *signal_handler); + const GladeSignal *signal_handler); void glade_widget_remove_signal_handler (GladeWidget *widget, - const GladeSignal *signal_handler); + const GladeSignal *signal_handler); void glade_widget_change_signal_handler (GladeWidget *widget, - const GladeSignal *old_signal_handler, - const GladeSignal *new_signal_handler); + const GladeSignal *old_signal_handler, + const GladeSignal *new_signal_handler); GPtrArray * glade_widget_list_signal_handlers (GladeWidget *widget, - const gchar *signal_name); + const gchar *signal_name); gboolean glade_widget_has_decendant (GladeWidget *widget, - GType type); + GType type); gboolean glade_widget_event (GladeWidget *gwidget, - GdkEvent *event); + GdkEvent *event); gboolean glade_widget_placeholder_relation (GladeWidget *parent, - GladeWidget *widget); + GladeWidget *widget); GladeWidgetAction *glade_widget_get_action (GladeWidget *widget, - const gchar *action_path); + const gchar *action_path); GladeWidgetAction *glade_widget_get_pack_action (GladeWidget *widget, - const gchar *action_path); + const gchar *action_path); GList *glade_widget_get_actions (GladeWidget *widget); GList *glade_widget_get_pack_actions (GladeWidget *widget); gboolean glade_widget_set_action_sensitive (GladeWidget *widget, - const gchar *action_path, - gboolean sensitive); + const gchar *action_path, + gboolean sensitive); gboolean glade_widget_set_pack_action_sensitive (GladeWidget *widget, - const gchar *action_path, - gboolean sensitive); + const gchar *action_path, + gboolean sensitive); gboolean glade_widget_set_action_visible (GladeWidget *widget, - const gchar *action_path, - gboolean sensitive); + const gchar *action_path, + gboolean sensitive); gboolean glade_widget_set_pack_action_visible (GladeWidget *widget, - const gchar *action_path, - gboolean sensitive); + const gchar *action_path, + gboolean sensitive); void glade_widget_write (GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_write_child (GladeWidget *widget, - GladeWidget *child, - GladeXmlContext *context, - GladeXmlNode *node); + GladeWidget *child, + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_write_signals (GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node); + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_write_placeholder (GladeWidget *parent, - GObject *object, - GladeXmlContext *context, - GladeXmlNode *node); - + GObject *object, + GladeXmlContext *context, + GladeXmlNode *node); + GladeWidget *glade_widget_read (GladeProject *project, - GladeWidget *parent, - GladeXmlNode *node, - const gchar *internal); + GladeWidget *parent, + GladeXmlNode *node, + const gchar *internal); void glade_widget_read_child (GladeWidget *widget, - GladeXmlNode *node); + GladeXmlNode *node); void glade_widget_write_special_child_prop (GladeWidget *parent, - GObject *object, - GladeXmlContext *context, - GladeXmlNode *node); + GObject *object, + GladeXmlContext *context, + GladeXmlNode *node); void glade_widget_set_child_type_from_node (GladeWidget *parent, - GObject *child, - GladeXmlNode *node); + GObject *child, + GladeXmlNode *node); GladeEditorProperty *glade_widget_create_editor_property (GladeWidget *widget, - const gchar *property, - gboolean packing, - gboolean use_command); + const gchar *property, + gboolean packing, + gboolean use_command); gchar *glade_widget_generate_path_name (GladeWidget *widget); gboolean glade_widget_is_ancestor (GladeWidget *widget, - GladeWidget *ancestor); + GladeWidget *ancestor); G_DEPRECATED gboolean glade_widget_depends (GladeWidget *widget, - GladeWidget *other); + GladeWidget *other); GdkDevice *glade_widget_get_device_from_event (GdkEvent *event); void glade_widget_ensure_name (GladeWidget *widget, - GladeProject *project, - gboolean use_command); + GladeProject *project, + gboolean use_command); /******************************************************************************* Project, object property references *******************************************************************************/ void glade_widget_add_prop_ref (GladeWidget *widget, - GladeProperty *property); + GladeProperty *property); void glade_widget_remove_prop_ref (GladeWidget *widget, - GladeProperty *property); + GladeProperty *property); GList *glade_widget_list_prop_refs (GladeWidget *widget); gboolean glade_widget_has_prop_refs (GladeWidget *widget); @@ -254,124 +254,124 @@ GList *glade_widget_get_parentless_reffed_widgets (GladeWidget *******************************************************************************/ void glade_widget_object_set_property (GladeWidget *widget, - const gchar *property_name, - const GValue *value); + const gchar *property_name, + const GValue *value); void glade_widget_object_get_property (GladeWidget *widget, - const gchar *property_name, - GValue *value); + const gchar *property_name, + GValue *value); void glade_widget_child_set_property (GladeWidget *widget, - GladeWidget *child, - const gchar *property_name, - const GValue *value); + GladeWidget *child, + const gchar *property_name, + const GValue *value); void glade_widget_child_get_property (GladeWidget *widget, - GladeWidget *child, - const gchar *property_name, - GValue *value); + GladeWidget *child, + const gchar *property_name, + GValue *value); /******************************************************************************* GladeProperty api convenience wrappers *******************************************************************************/ gboolean glade_widget_property_get (GladeWidget *widget, - const gchar *id_property, - ...); + const gchar *id_property, + ...); gboolean glade_widget_property_set (GladeWidget *widget, - const gchar *id_property, - ...); + const gchar *id_property, + ...); gboolean glade_widget_pack_property_get (GladeWidget *widget, - const gchar *id_property, - ...); + const gchar *id_property, + ...); gboolean glade_widget_pack_property_set (GladeWidget *widget, - const gchar *id_property, - ...); + const gchar *id_property, + ...); gboolean glade_widget_property_reset (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); gboolean glade_widget_pack_property_reset (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); gboolean glade_widget_property_default (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); gboolean glade_widget_property_original_default (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); gboolean glade_widget_pack_property_default (GladeWidget *widget, - const gchar *id_property); + const gchar *id_property); gboolean glade_widget_property_set_sensitive (GladeWidget *widget, - const gchar *id_property, - gboolean sensitive, - const gchar *reason); + const gchar *id_property, + gboolean sensitive, + const gchar *reason); gboolean glade_widget_pack_property_set_sensitive (GladeWidget *widget, - const gchar *id_property, - gboolean sensitive, - const gchar *reason); + const gchar *id_property, + gboolean sensitive, + const gchar *reason); gboolean glade_widget_property_set_enabled (GladeWidget *widget, - const gchar *id_property, - gboolean enabled); + const gchar *id_property, + gboolean enabled); gboolean glade_widget_pack_property_set_enabled (GladeWidget *widget, - const gchar *id_property, - gboolean enabled); + const gchar *id_property, + gboolean enabled); gboolean glade_widget_property_set_save_always (GladeWidget *widget, - const gchar *id_property, - gboolean setting); + const gchar *id_property, + gboolean setting); gboolean glade_widget_pack_property_set_save_always (GladeWidget *widget, - const gchar *id_property, - gboolean setting); + const gchar *id_property, + gboolean setting); gchar *glade_widget_property_string (GladeWidget *widget, - const gchar *id_property, - const GValue *value); + const gchar *id_property, + const GValue *value); gchar *glade_widget_pack_property_string (GladeWidget *widget, - const gchar *id_property, - const GValue *value); + const gchar *id_property, + const GValue *value); /******************************************************************************* Accessors *******************************************************************************/ -void glade_widget_set_name (GladeWidget *widget, - const gchar *name); +void glade_widget_set_name (GladeWidget *widget, + const gchar *name); G_CONST_RETURN gchar *glade_widget_get_name (GladeWidget *widget); G_CONST_RETURN gchar *glade_widget_get_display_name (GladeWidget *widget); gboolean glade_widget_has_name (GladeWidget *widget); void glade_widget_set_is_composite (GladeWidget *widget, - gboolean composite); + gboolean composite); gboolean glade_widget_get_is_composite (GladeWidget *widget); -void glade_widget_set_internal (GladeWidget *widget, - const gchar *internal); +void glade_widget_set_internal (GladeWidget *widget, + const gchar *internal); G_CONST_RETURN gchar *glade_widget_get_internal (GladeWidget *widget); GObject *glade_widget_get_object (GladeWidget *widget); -void glade_widget_set_project (GladeWidget *widget, - GladeProject *project); +void glade_widget_set_project (GladeWidget *widget, + GladeProject *project); GladeProject *glade_widget_get_project (GladeWidget *widget); void glade_widget_set_in_project (GladeWidget *widget, - gboolean in_project); + gboolean in_project); gboolean glade_widget_in_project (GladeWidget *widget); GladeWidgetAdaptor *glade_widget_get_adaptor (GladeWidget *widget); @@ -379,9 +379,9 @@ GladeWidgetAdaptor *glade_widget_get_adaptor (GladeWidget *w GladeWidget *glade_widget_get_parent (GladeWidget *widget); void glade_widget_set_parent (GladeWidget *widget, - GladeWidget *parent); + GladeWidget *parent); -GList *glade_widget_get_children (GladeWidget* widget); +GList *glade_widget_get_children (GladeWidget* widget); GladeWidget *glade_widget_get_toplevel (GladeWidget *widget); @@ -393,11 +393,11 @@ void glade_widget_pop_superuser (void); void glade_widget_verify (GladeWidget *widget); void glade_widget_set_support_warning (GladeWidget *widget, - const gchar *warning); + const gchar *warning); G_CONST_RETURN gchar *glade_widget_support_warning (GladeWidget *widget); void glade_widget_lock (GladeWidget *widget, - GladeWidget *locked); + GladeWidget *locked); void glade_widget_unlock (GladeWidget *widget); GladeWidget *glade_widget_get_locker (GladeWidget *widget); diff --git a/gladeui/glade-xml-utils.c b/gladeui/glade-xml-utils.c index 10a30721..c5e41432 100644 --- a/gladeui/glade-xml-utils.c +++ b/gladeui/glade-xml-utils.c @@ -71,10 +71,10 @@ struct _GladeXmlContext * also to skip whitespace between nodes */ #define skip_text(node) if ((xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("text")) == 0) ||\ - (xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("comment")) == 0)) { \ - node = (GladeXmlNode *)((xmlNodePtr)node)->next; continue ; }; + (xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("comment")) == 0)) { \ + node = (GladeXmlNode *)((xmlNodePtr)node)->next; continue ; }; #define skip_text_libxml(node) if ((xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("text")) == 0) ||\ - (xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("comment")) == 0)) { \ + (xmlStrcmp ( ((xmlNodePtr)node)->name, BAD_CAST("comment")) == 0)) { \ node = ((xmlNodePtr)node)->next; continue ; }; diff --git a/gladeui/glade-xml-utils.h b/gladeui/glade-xml-utils.h index 6b00b270..4f2ee706 100644 --- a/gladeui/glade-xml-utils.h +++ b/gladeui/glade-xml-utils.h @@ -28,10 +28,10 @@ typedef struct _GladeProject GladeProject; #define GLADE_GTKBUILDER_VERSIONING_BASE_MAJOR 2 #define GLADE_GTKBUILDER_VERSIONING_BASE_MINOR 14 -#define GLADE_GTKBUILDER_HAS_VERSIONING(maj, min) \ - ((maj) > GLADE_GTKBUILDER_VERSIONING_BASE_MAJOR || \ - ((maj) == GLADE_GTKBUILDER_VERSIONING_BASE_MAJOR && \ - (min) >= GLADE_GTKBUILDER_VERSIONING_BASE_MINOR)) +#define GLADE_GTKBUILDER_HAS_VERSIONING(maj, min) \ + ((maj) > GLADE_GTKBUILDER_VERSIONING_BASE_MAJOR || \ + ((maj) == GLADE_GTKBUILDER_VERSIONING_BASE_MAJOR && \ + (min) >= GLADE_GTKBUILDER_VERSIONING_BASE_MINOR)) /* Used for catalog tags and attributes */ @@ -188,29 +188,29 @@ typedef struct _GladeProject GladeProject; /* search child */ -GladeXmlNode * glade_xml_search_child (GladeXmlNode * node, const gchar *name); -GladeXmlNode * glade_xml_search_child_required (GladeXmlNode * tree, const gchar* name); +GladeXmlNode * glade_xml_search_child (GladeXmlNode *node, const gchar *name); +GladeXmlNode * glade_xml_search_child_required (GladeXmlNode *tree, const gchar *name); /* content */ -gchar * glade_xml_get_content (GladeXmlNode * node_in); /* Get the content of the node */ +gchar * glade_xml_get_content (GladeXmlNode *node_in); /* Get the content of the node */ void glade_xml_set_content (GladeXmlNode *node_in, const gchar *content); -gboolean glade_xml_get_value_int (GladeXmlNode * node_in, const gchar *name, int *val); -gboolean glade_xml_get_value_int_required (GladeXmlNode * node, const gchar *name, int *val); +gboolean glade_xml_get_value_int (GladeXmlNode *node_in, const gchar *name, int *val); +gboolean glade_xml_get_value_int_required (GladeXmlNode *node, const gchar *name, int *val); -gchar * glade_xml_get_value_string (GladeXmlNode * node, const gchar *name); -gchar * glade_xml_get_value_string_required (GladeXmlNode * node, - const gchar *name, - const gchar *xtra_info); +gchar * glade_xml_get_value_string (GladeXmlNode *node, const gchar *name); +gchar * glade_xml_get_value_string_required (GladeXmlNode *node, + const gchar *name, + const gchar *xtra_info); -gboolean glade_xml_get_boolean (GladeXmlNode * node, const gchar *name, gboolean _default); +gboolean glade_xml_get_boolean (GladeXmlNode *node, const gchar *name, gboolean _default); -void glade_xml_set_value (GladeXmlNode * node_in, const gchar *name, const gchar *val); +void glade_xml_set_value (GladeXmlNode *node_in, const gchar *name, const gchar *val); /* Properties */ -gchar * glade_xml_get_property_string_required (GladeXmlNode *node_in, const gchar *name, const gchar *xtra); -gchar * glade_xml_get_property_string (GladeXmlNode *node_in, const gchar *name); +gchar *glade_xml_get_property_string_required (GladeXmlNode *node_in, const gchar *name, const gchar *xtra); +gchar *glade_xml_get_property_string (GladeXmlNode *node_in, const gchar *name); gboolean glade_xml_get_property_boolean (GladeXmlNode *node_in, const gchar *name, gboolean _default); gdouble glade_xml_get_property_double (GladeXmlNode *node_in, const gchar *name, gdouble _default); gint glade_xml_get_property_int (GladeXmlNode *node_in, const gchar *name, gint _default); @@ -229,14 +229,14 @@ void glade_xml_node_delete (GladeXmlNode *node); GladeXmlNode * glade_xml_node_get_children (GladeXmlNode *node); GladeXmlNode * glade_xml_node_get_parent (GladeXmlNode *node_in); GladeXmlNode * glade_xml_node_next (GladeXmlNode *node_in); -gboolean glade_xml_node_verify (GladeXmlNode * node_in, const gchar *name); +gboolean glade_xml_node_verify (GladeXmlNode *node_in, const gchar *name); gboolean glade_xml_node_verify_silent (GladeXmlNode *node_in, const gchar *name); const gchar * glade_xml_node_get_name (GladeXmlNode *node_in); -void glade_xml_node_append_child (GladeXmlNode * node, GladeXmlNode * child); +void glade_xml_node_append_child (GladeXmlNode * node, GladeXmlNode *child); void glade_xml_node_remove (GladeXmlNode *node_in); gboolean glade_xml_node_is_comment (GladeXmlNode *node_in); GladeXmlNode * glade_xml_node_next_with_comments (GladeXmlNode *node_in); -GladeXmlNode * glade_xml_node_prev_with_comments (GladeXmlNode * node_in); +GladeXmlNode * glade_xml_node_prev_with_comments (GladeXmlNode *node_in); GladeXmlNode * glade_xml_node_get_children_with_comments (GladeXmlNode *node); GladeXmlNode * glade_xml_node_add_prev_sibling (GladeXmlNode *node, GladeXmlNode *new_node); GladeXmlNode * glade_xml_node_add_next_sibling (GladeXmlNode *node, GladeXmlNode *new_node); @@ -254,17 +254,17 @@ GladeXmlContext * glade_xml_context_new (GladeXmlDoc *doc, const gchar *name void glade_xml_context_destroy (GladeXmlContext *context); void glade_xml_context_free (GladeXmlContext *context); GladeXmlContext * glade_xml_context_new_from_path (const gchar *full_path, - const gchar *nspace, - const gchar *root_name); + const gchar *nspace, + const gchar *root_name); GladeXmlDoc * glade_xml_context_get_doc (GladeXmlContext *context); /* Dumps an xml string from a context */ gchar * glade_xml_dump_from_context (GladeXmlContext *context); gboolean glade_xml_load_sym_from_node (GladeXmlNode *node_in, - GModule *module, - gchar *tagname, - gpointer *sym_location); + GModule *module, + gchar *tagname, + gpointer *sym_location); G_END_DECLS diff --git a/plugins/gtk+/glade-about-dialog-editor.c b/plugins/gtk+/glade-about-dialog-editor.c index 8d8ab4e7..9aba7162 100644 --- a/plugins/gtk+/glade-about-dialog-editor.c +++ b/plugins/gtk+/glade-about-dialog-editor.c @@ -29,15 +29,15 @@ static void glade_about_dialog_editor_editable_init (GladeEditableIface *iface); /* Callbacks */ static void license_type_pre_commit (GladePropertyShell *shell, - GValue *value, - GladeAboutDialogEditor *editor); + GValue *value, + GladeAboutDialogEditor *editor); static void license_type_post_commit (GladePropertyShell *shell, - GValue *value, - GladeAboutDialogEditor *editor); + GValue *value, + GladeAboutDialogEditor *editor); static void logo_file_toggled (GtkWidget *widget, - GladeAboutDialogEditor *editor); + GladeAboutDialogEditor *editor); static void logo_icon_toggled (GtkWidget *widget, - GladeAboutDialogEditor *editor); + GladeAboutDialogEditor *editor); struct _GladeAboutDialogEditorPrivate @@ -131,15 +131,15 @@ glade_about_dialog_editor_editable_init (GladeEditableIface *iface) static void license_type_pre_commit (GladePropertyShell *shell, - GValue *value, - GladeAboutDialogEditor *editor) + GValue *value, + GladeAboutDialogEditor *editor) { GladeWidget *widget = glade_editable_loaded_widget (GLADE_EDITABLE (editor)); GladeProperty *property; GtkLicense license; glade_command_push_group (_("Setting License type of %s"), - glade_widget_get_name (widget)); + glade_widget_get_name (widget)); license = g_value_get_enum (value); @@ -155,8 +155,8 @@ license_type_pre_commit (GladePropertyShell *shell, static void license_type_post_commit (GladePropertyShell *shell, - GValue *value, - GladeAboutDialogEditor *editor) + GValue *value, + GladeAboutDialogEditor *editor) { glade_command_pop_group (); } diff --git a/plugins/gtk+/glade-about-dialog-editor.h b/plugins/gtk+/glade-about-dialog-editor.h index dcf61f92..a37eeaed 100644 --- a/plugins/gtk+/glade-about-dialog-editor.h +++ b/plugins/gtk+/glade-about-dialog-editor.h @@ -26,10 +26,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ABOUT_DIALOG_EDITOR (glade_about_dialog_editor_get_type ()) -#define GLADE_ABOUT_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ABOUT_DIALOG_EDITOR, GladeAboutDialogEditor)) -#define GLADE_ABOUT_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ABOUT_DIALOG_EDITOR, GladeAboutDialogEditorClass)) -#define GLADE_IS_ABOUT_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ABOUT_DIALOG_EDITOR)) +#define GLADE_TYPE_ABOUT_DIALOG_EDITOR (glade_about_dialog_editor_get_type ()) +#define GLADE_ABOUT_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ABOUT_DIALOG_EDITOR, GladeAboutDialogEditor)) +#define GLADE_ABOUT_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ABOUT_DIALOG_EDITOR, GladeAboutDialogEditorClass)) +#define GLADE_IS_ABOUT_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ABOUT_DIALOG_EDITOR)) #define GLADE_IS_ABOUT_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ABOUT_DIALOG_EDITOR)) #define GLADE_ABOUT_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ABOUT_DIALOG_EDITOR, GladeAboutDialogEditorClass)) diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c index 5e0e486b..ea8f391f 100644 --- a/plugins/gtk+/glade-accels.c +++ b/plugins/gtk+/glade-accels.c @@ -429,15 +429,15 @@ glade_eprop_accel_view (GladeEditorProperty * eprop) eprop_accel->model = (GtkTreeModel *) gtk_tree_store_new (ACCEL_NUM_COLUMNS, G_TYPE_STRING, /* The GSignal name formatted for display */ - G_TYPE_STRING, /* The GSignal name */ - G_TYPE_STRING, /* The text to show in the accelerator cell */ - G_TYPE_INT, /* PangoWeight attribute for bold headers */ - G_TYPE_INT, /* PangoStyle attribute for italic grey unset items */ - G_TYPE_STRING, /* Foreground colour for italic grey unset items */ - G_TYPE_BOOLEAN, /* Visible attribute to hide items for header entries */ - G_TYPE_BOOLEAN, /* Whether the key has been entered for this row */ - G_TYPE_UINT, /* Hardware keycode */ - G_TYPE_INT); /* GdkModifierType */ + G_TYPE_STRING, /* The GSignal name */ + G_TYPE_STRING, /* The text to show in the accelerator cell */ + G_TYPE_INT, /* PangoWeight attribute for bold headers */ + G_TYPE_INT, /* PangoStyle attribute for italic grey unset items */ + G_TYPE_STRING, /* Foreground colour for italic grey unset items */ + G_TYPE_BOOLEAN, /* Visible attribute to hide items for header entries */ + G_TYPE_BOOLEAN, /* Whether the key has been entered for this row */ + G_TYPE_UINT, /* Hardware keycode */ + G_TYPE_INT); /* GdkModifierType */ view_widget = gtk_tree_view_new_with_model (eprop_accel->model); gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (view_widget), FALSE); diff --git a/plugins/gtk+/glade-accels.h b/plugins/gtk+/glade-accels.h index 0bb15485..ce15b0ef 100644 --- a/plugins/gtk+/glade-accels.h +++ b/plugins/gtk+/glade-accels.h @@ -6,7 +6,7 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ACCEL_GLIST (glade_accel_glist_get_type()) +#define GLADE_TYPE_ACCEL_GLIST (glade_accel_glist_get_type()) #define GLADE_TYPE_EPROP_ACCEL (glade_eprop_accel_get_type()) @@ -20,14 +20,14 @@ typedef struct _GladeKey GladeKey; typedef struct _GladeAccelInfo GladeAccelInfo; struct _GladeAccelInfo { - guint key; - GdkModifierType modifiers; - gchar *signal; + guint key; + GdkModifierType modifiers; + gchar *signal; }; struct _GladeKey { - guint value; - gchar *name; + guint value; + gchar *name; }; extern const GladeKey GladeKeys[]; @@ -45,20 +45,20 @@ void glade_accel_list_free (GList *accels); gchar *glade_accels_make_string (GList *accels); -GladeAccelInfo *glade_accel_read (GladeXmlNode *node, - gboolean require_signal); -GladeXmlNode *glade_accel_write (GladeAccelInfo *accel_info, - GladeXmlContext *context, - gboolean write_signal); +GladeAccelInfo *glade_accel_read (GladeXmlNode *node, + gboolean require_signal); +GladeXmlNode *glade_accel_write (GladeAccelInfo *accel_info, + GladeXmlContext *context, + gboolean write_signal); -void glade_gtk_write_accels (GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node, - gboolean write_signal); -void glade_gtk_read_accels (GladeWidget *widget, - GladeXmlNode *node, - gboolean require_signal); +void glade_gtk_write_accels (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node, + gboolean write_signal); +void glade_gtk_read_accels (GladeWidget *widget, + GladeXmlNode *node, + gboolean require_signal); G_END_DECLS diff --git a/plugins/gtk+/glade-action-bar-editor.h b/plugins/gtk+/glade-action-bar-editor.h index c69e7025..dc7c4d82 100644 --- a/plugins/gtk+/glade-action-bar-editor.h +++ b/plugins/gtk+/glade-action-bar-editor.h @@ -26,10 +26,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ACTION_BAR_EDITOR (glade_action_bar_editor_get_type ()) -#define GLADE_ACTION_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTION_BAR_EDITOR, GladeActionBarEditor)) -#define GLADE_ACTION_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTION_BAR_EDITOR, GladeActionBarEditorClass)) -#define GLADE_IS_ACTION_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTION_BAR_EDITOR)) +#define GLADE_TYPE_ACTION_BAR_EDITOR (glade_action_bar_editor_get_type ()) +#define GLADE_ACTION_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTION_BAR_EDITOR, GladeActionBarEditor)) +#define GLADE_ACTION_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTION_BAR_EDITOR, GladeActionBarEditorClass)) +#define GLADE_IS_ACTION_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTION_BAR_EDITOR)) #define GLADE_IS_ACTION_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ACTION_BAR_EDITOR)) #define GLADE_ACTION_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ACTION_BAR_EDITOR, GladeActionBarEditorClass)) diff --git a/plugins/gtk+/glade-action-editor.c b/plugins/gtk+/glade-action-editor.c index 19e4e8eb..d2971b78 100644 --- a/plugins/gtk+/glade-action-editor.c +++ b/plugins/gtk+/glade-action-editor.c @@ -87,7 +87,7 @@ glade_action_editor_grab_focus (GtkWidget * widget) static void glade_action_editor_load (GladeEditable *editable, - GladeWidget *gwidget) + GladeWidget *gwidget) { GladeActionEditor *action_editor = GLADE_ACTION_EDITOR (editable); GladeActionEditorPrivate *priv = action_editor->priv; @@ -136,8 +136,8 @@ glade_action_editor_new (void) *************************************/ void glade_action_editor_post_create (GladeWidgetAdaptor *adaptor, - GObject *editor, - GladeCreateReason reason) + GObject *editor, + GladeCreateReason reason) { GladeActionEditorPrivate *priv = GLADE_ACTION_EDITOR (editor)->priv; diff --git a/plugins/gtk+/glade-action-editor.h b/plugins/gtk+/glade-action-editor.h index c6eeac38..d0b89b90 100644 --- a/plugins/gtk+/glade-action-editor.h +++ b/plugins/gtk+/glade-action-editor.h @@ -26,10 +26,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ACTION_EDITOR (glade_action_editor_get_type ()) -#define GLADE_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTION_EDITOR, GladeActionEditor)) -#define GLADE_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTION_EDITOR, GladeActionEditorClass)) -#define GLADE_IS_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTION_EDITOR)) +#define GLADE_TYPE_ACTION_EDITOR (glade_action_editor_get_type ()) +#define GLADE_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTION_EDITOR, GladeActionEditor)) +#define GLADE_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTION_EDITOR, GladeActionEditorClass)) +#define GLADE_IS_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTION_EDITOR)) #define GLADE_IS_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ACTION_EDITOR)) #define GLADE_ACTION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ACTION_EDITOR, GladeActionEditorClass)) diff --git a/plugins/gtk+/glade-activatable-editor.c b/plugins/gtk+/glade-activatable-editor.c index 3a8d405d..dacc65a7 100644 --- a/plugins/gtk+/glade-activatable-editor.c +++ b/plugins/gtk+/glade-activatable-editor.c @@ -74,7 +74,7 @@ glade_activatable_editor_grab_focus (GtkWidget * widget) static void glade_activatable_editor_load (GladeEditable *editable, - GladeWidget *gwidget) + GladeWidget *gwidget) { GladeActivatableEditor *activatable_editor = GLADE_ACTIVATABLE_EDITOR (editable); GladeActivatableEditorPrivate *priv = activatable_editor->priv; diff --git a/plugins/gtk+/glade-activatable-editor.h b/plugins/gtk+/glade-activatable-editor.h index 2a36fa0e..02462dfe 100644 --- a/plugins/gtk+/glade-activatable-editor.h +++ b/plugins/gtk+/glade-activatable-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ACTIVATABLE_EDITOR (glade_activatable_editor_get_type ()) -#define GLADE_ACTIVATABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditor)) -#define GLADE_ACTIVATABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditorClass)) -#define GLADE_IS_ACTIVATABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR)) -#define GLADE_IS_ACTIVATABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ACTIVATABLE_EDITOR)) -#define GLADE_ACTIVATABLE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditorClass)) +#define GLADE_TYPE_ACTIVATABLE_EDITOR (glade_activatable_editor_get_type ()) +#define GLADE_ACTIVATABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditor)) +#define GLADE_ACTIVATABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditorClass)) +#define GLADE_IS_ACTIVATABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR)) +#define GLADE_IS_ACTIVATABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ACTIVATABLE_EDITOR)) +#define GLADE_ACTIVATABLE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ACTIVATABLE_EDITOR, GladeActivatableEditorClass)) typedef struct _GladeActivatableEditor GladeActivatableEditor; typedef struct _GladeActivatableEditorClass GladeActivatableEditorClass; @@ -51,7 +51,7 @@ struct _GladeActivatableEditorClass GType glade_activatable_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_activatable_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-app-chooser-button-editor.h b/plugins/gtk+/glade-app-chooser-button-editor.h index bb8c6a13..4625b78d 100644 --- a/plugins/gtk+/glade-app-chooser-button-editor.h +++ b/plugins/gtk+/glade-app-chooser-button-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR (glade_app_chooser_button_editor_get_type ()) -#define GLADE_APP_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditor)) -#define GLADE_APP_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditorClass)) -#define GLADE_IS_APP_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR)) -#define GLADE_IS_APP_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR)) -#define GLADE_APP_CHOOSER_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditorClass)) +#define GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR (glade_app_chooser_button_editor_get_type ()) +#define GLADE_APP_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditor)) +#define GLADE_APP_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditorClass)) +#define GLADE_IS_APP_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR)) +#define GLADE_IS_APP_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR)) +#define GLADE_APP_CHOOSER_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_APP_CHOOSER_BUTTON_EDITOR, GladeAppChooserButtonEditorClass)) typedef struct _GladeAppChooserButtonEditor GladeAppChooserButtonEditor; typedef struct _GladeAppChooserButtonEditorClass GladeAppChooserButtonEditorClass; diff --git a/plugins/gtk+/glade-app-chooser-widget-editor.h b/plugins/gtk+/glade-app-chooser-widget-editor.h index bf19ec97..80f081a1 100644 --- a/plugins/gtk+/glade-app-chooser-widget-editor.h +++ b/plugins/gtk+/glade-app-chooser-widget-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR (glade_app_chooser_widget_editor_get_type ()) -#define GLADE_APP_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditor)) -#define GLADE_APP_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditorClass)) -#define GLADE_IS_APP_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR)) -#define GLADE_IS_APP_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR)) -#define GLADE_APP_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditorClass)) +#define GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR (glade_app_chooser_widget_editor_get_type ()) +#define GLADE_APP_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditor)) +#define GLADE_APP_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditorClass)) +#define GLADE_IS_APP_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR)) +#define GLADE_IS_APP_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR)) +#define GLADE_APP_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_APP_CHOOSER_WIDGET_EDITOR, GladeAppChooserWidgetEditorClass)) typedef struct _GladeAppChooserWidgetEditor GladeAppChooserWidgetEditor; typedef struct _GladeAppChooserWidgetEditorClass GladeAppChooserWidgetEditorClass; diff --git a/plugins/gtk+/glade-arrow-editor.h b/plugins/gtk+/glade-arrow-editor.h index 0bd14f90..a3097a71 100644 --- a/plugins/gtk+/glade-arrow-editor.h +++ b/plugins/gtk+/glade-arrow-editor.h @@ -25,10 +25,10 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ARROW_EDITOR (glade_arrow_editor_get_type ()) -#define GLADE_ARROW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ARROW_EDITOR, GladeArrowEditor)) -#define GLADE_ARROW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ARROW_EDITOR, GladeArrowEditorClass)) -#define GLADE_IS_ARROW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ARROW_EDITOR)) +#define GLADE_TYPE_ARROW_EDITOR (glade_arrow_editor_get_type ()) +#define GLADE_ARROW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ARROW_EDITOR, GladeArrowEditor)) +#define GLADE_ARROW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ARROW_EDITOR, GladeArrowEditorClass)) +#define GLADE_IS_ARROW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ARROW_EDITOR)) #define GLADE_IS_ARROW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ARROW_EDITOR)) #define GLADE_ARROW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ARROW_EDITOR, GladeArrowEditorClass)) diff --git a/plugins/gtk+/glade-attributes.c b/plugins/gtk+/glade-attributes.c index fb8fc6d8..7ca23858 100644 --- a/plugins/gtk+/glade-attributes.c +++ b/plugins/gtk+/glade-attributes.c @@ -143,10 +143,10 @@ typedef enum EDIT_INVALID } AttrEditType; -#define ACTIVATE_COLUMN_FROM_TYPE(type) \ - ((type) == EDIT_TOGGLE ? COLUMN_TOGGLE_ACTIVE : \ - (type) == EDIT_SPIN ? COLUMN_SPIN_ACTIVE : \ - (type) == EDIT_COMBO ? COLUMN_COMBO_ACTIVE: COLUMN_BUTTON_ACTIVE) +#define ACTIVATE_COLUMN_FROM_TYPE(type) \ + ((type) == EDIT_TOGGLE ? COLUMN_TOGGLE_ACTIVE : \ + (type) == EDIT_SPIN ? COLUMN_SPIN_ACTIVE : \ + (type) == EDIT_COMBO ? COLUMN_COMBO_ACTIVE: COLUMN_BUTTON_ACTIVE) static GtkListStore * @@ -300,7 +300,7 @@ append_empty_row (GtkListStore *store, PangoAttrType type) case PANGO_ATTR_FONT_DESC: edit_type = EDIT_FONT; name = C_ ("textattr", "Font Description"); - break; + break; case PANGO_ATTR_INVALID: case PANGO_ATTR_LETTER_SPACING: @@ -664,7 +664,7 @@ sync_object (GladeEPropAttrs *eprop_attrs, gboolean use_command) else { GladeProperty *property = - glade_editor_property_get_property (GLADE_EDITOR_PROPERTY (eprop_attrs)); + glade_editor_property_get_property (GLADE_EDITOR_PROPERTY (eprop_attrs)); glade_property_set (property, g_list_reverse (attributes)); glade_attr_list_free (attributes); @@ -715,7 +715,7 @@ value_icon_activate (GtkCellRendererToggle *cell_renderer, gtk_tree_model_get (eprop_attrs->model, &iter, COLUMN_TEXT, &text, COLUMN_TYPE, &type, - COLUMN_EDIT_TYPE, &edit_type, -1); + COLUMN_EDIT_TYPE, &edit_type, -1); /* Launch dialog etc. */ switch (edit_type) @@ -863,25 +863,25 @@ glade_eprop_attrs_view (GladeEditorProperty *eprop) eprop_attrs->model = (GtkTreeModel *) gtk_list_store_new (NUM_COLUMNS, - /* Main Data */ - G_TYPE_STRING, // COLUMN_NAME - G_TYPE_INT, // COLUMN_NAME_WEIGHT - G_TYPE_INT, // COLUMN_TYPE - G_TYPE_INT, // COLUMN_EDIT_TYPE - G_TYPE_POINTER, // COLUMN_VALUE - G_TYPE_UINT, // COLUMN_START - G_TYPE_UINT, // COLUMN_END - /* Editor renderer related */ - G_TYPE_BOOLEAN, // COLUMN_TOGGLE_ACTIVE - G_TYPE_BOOLEAN, // COLUMN_TOGGLE_DOWN - G_TYPE_BOOLEAN, // COLUMN_BUTTON_ACTIVE - G_TYPE_STRING, // COLUMN_TEXT - G_TYPE_INT, // COLUMN_TEXT_STYLE - G_TYPE_STRING, // COLUMN_TEXT_FG - G_TYPE_BOOLEAN, // COLUMN_COMBO_ACTIVE - GTK_TYPE_LIST_STORE, // COLUMN_COMBO_MODEL - G_TYPE_BOOLEAN, // COLUMN_SPIN_ACTIVE - G_TYPE_UINT); // COLUMN_SPIN_DIGITS + /* Main Data */ + G_TYPE_STRING, // COLUMN_NAME + G_TYPE_INT, // COLUMN_NAME_WEIGHT + G_TYPE_INT, // COLUMN_TYPE + G_TYPE_INT, // COLUMN_EDIT_TYPE + G_TYPE_POINTER, // COLUMN_VALUE + G_TYPE_UINT, // COLUMN_START + G_TYPE_UINT, // COLUMN_END + /* Editor renderer related */ + G_TYPE_BOOLEAN, // COLUMN_TOGGLE_ACTIVE + G_TYPE_BOOLEAN, // COLUMN_TOGGLE_DOWN + G_TYPE_BOOLEAN, // COLUMN_BUTTON_ACTIVE + G_TYPE_STRING, // COLUMN_TEXT + G_TYPE_INT, // COLUMN_TEXT_STYLE + G_TYPE_STRING, // COLUMN_TEXT_FG + G_TYPE_BOOLEAN, // COLUMN_COMBO_ACTIVE + GTK_TYPE_LIST_STORE, // COLUMN_COMBO_MODEL + G_TYPE_BOOLEAN, // COLUMN_SPIN_ACTIVE + G_TYPE_UINT); // COLUMN_SPIN_DIGITS view_widget = gtk_tree_view_new_with_model (eprop_attrs->model); gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (view_widget), FALSE); diff --git a/plugins/gtk+/glade-attributes.h b/plugins/gtk+/glade-attributes.h index c48ce1c0..3a848499 100644 --- a/plugins/gtk+/glade-attributes.h +++ b/plugins/gtk+/glade-attributes.h @@ -8,7 +8,7 @@ G_BEGIN_DECLS #define GLADE_TYPE_EPROP_ATTRS (glade_eprop_attrs_get_type()) -#define GLADE_TYPE_ATTR_GLIST (glade_attr_glist_get_type()) +#define GLADE_TYPE_ATTR_GLIST (glade_attr_glist_get_type()) /* The GladeParamSpecAttributes is a GList * of GladeAttribute structs */ typedef struct _GladeAttribute GladeAttribute; @@ -27,7 +27,7 @@ GType glade_eprop_attrs_get_type (void) G_GNUC_CONST; GType glade_attr_glist_get_type (void) G_GNUC_CONST; GladeAttribute *glade_gtk_attribute_from_string (PangoAttrType type, - const gchar *strval); + const gchar *strval); gchar *glade_gtk_string_from_attr (GladeAttribute *gattr); void glade_attr_list_free (GList *attrs); diff --git a/plugins/gtk+/glade-box-editor.h b/plugins/gtk+/glade-box-editor.h index 69549e57..f923eb95 100644 --- a/plugins/gtk+/glade-box-editor.h +++ b/plugins/gtk+/glade-box-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_BOX_EDITOR (glade_box_editor_get_type ()) -#define GLADE_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_BOX_EDITOR, GladeBoxEditor)) -#define GLADE_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_BOX_EDITOR, GladeBoxEditorClass)) -#define GLADE_IS_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_BOX_EDITOR)) -#define GLADE_IS_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_BOX_EDITOR)) -#define GLADE_BOX_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_BOX_EDITOR, GladeBoxEditorClass)) +#define GLADE_TYPE_BOX_EDITOR (glade_box_editor_get_type ()) +#define GLADE_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_BOX_EDITOR, GladeBoxEditor)) +#define GLADE_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_BOX_EDITOR, GladeBoxEditorClass)) +#define GLADE_IS_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_BOX_EDITOR)) +#define GLADE_IS_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_BOX_EDITOR)) +#define GLADE_BOX_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_BOX_EDITOR, GladeBoxEditorClass)) typedef struct _GladeBoxEditor GladeBoxEditor; typedef struct _GladeBoxEditorClass GladeBoxEditorClass; diff --git a/plugins/gtk+/glade-button-editor.c b/plugins/gtk+/glade-button-editor.c index e44a14f0..99037f62 100644 --- a/plugins/gtk+/glade-button-editor.c +++ b/plugins/gtk+/glade-button-editor.c @@ -62,14 +62,14 @@ struct _GladeButtonEditorPrivate /* Available in standard mode: */ GtkWidget *stock_radio; /* Create the button using the stock (Available: stock, image-position) */ GtkWidget *label_radio; /* Create the button with a custom label - * (Available: label, use-underline, image, image-position */ + * (Available: label, use-underline, image, image-position */ GtkWidget *standard_frame; /* Contains all the button configurations - */ + */ GtkWidget *stock_frame; /* Contains stock and image-position properties - */ + */ GtkWidget *label_frame; /* Contains label, use-underline, image and image-position properties - */ + */ }; static GladeEditableIface *parent_editable_iface; @@ -142,9 +142,9 @@ glade_button_editor_load (GladeEditable * editable, GladeWidget * widget) gboolean modify_content = TRUE; if (GTK_IS_MENU_BUTTON (button) || - GTK_IS_LINK_BUTTON (button) || - GTK_IS_SCALE_BUTTON (button)) - modify_content = FALSE; + GTK_IS_LINK_BUTTON (button) || + GTK_IS_SCALE_BUTTON (button)) + modify_content = FALSE; gtk_widget_set_visible (priv->active_shell, is_toggle); gtk_widget_set_visible (priv->inconsistent_shell, is_toggle); @@ -239,7 +239,7 @@ custom_toggled (GtkWidget * widget, GladeButtonEditor * button_editor) if (active) { glade_command_push_group (_("Setting %s to use a custom child"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* clear out some things... */ property = glade_widget_get_property (gwidget, "image"); @@ -267,20 +267,20 @@ custom_toggled (GtkWidget * widget, GladeButtonEditor * button_editor) GValue value = { 0, }; glade_command_push_group (_("Setting %s to use standard configuration"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* If theres a widget customly inside... command remove it first... */ button = GTK_WIDGET (glade_widget_get_object (gwidget)); child = gtk_bin_get_child (GTK_BIN (button)); if (child) - gchild = glade_widget_get_from_gobject (child); + gchild = glade_widget_get_from_gobject (child); if (gchild && glade_widget_get_parent (gchild) == gwidget) - { - GList widgets = { 0, }; - widgets.data = gchild; - glade_command_delete (&widgets); - } + { + GList widgets = { 0, }; + widgets.data = gchild; + glade_command_delete (&widgets); + } property = glade_widget_get_property (gwidget, "custom-child"); glade_command_set_property (property, FALSE); @@ -394,8 +394,8 @@ glade_button_editor_new (void) *************************************/ void glade_button_editor_post_create (GladeWidgetAdaptor *adaptor, - GObject *editor, - GladeCreateReason reason) + GObject *editor, + GladeCreateReason reason) { GladeButtonEditorPrivate *priv = GLADE_BUTTON_EDITOR (editor)->priv; diff --git a/plugins/gtk+/glade-button-editor.h b/plugins/gtk+/glade-button-editor.h index a5bf1f17..d76b277e 100644 --- a/plugins/gtk+/glade-button-editor.h +++ b/plugins/gtk+/glade-button-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_BUTTON_EDITOR (glade_button_editor_get_type ()) -#define GLADE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditor)) -#define GLADE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditorClass)) -#define GLADE_IS_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_BUTTON_EDITOR)) -#define GLADE_IS_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_BUTTON_EDITOR)) -#define GLADE_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditorClass)) +#define GLADE_TYPE_BUTTON_EDITOR (glade_button_editor_get_type ()) +#define GLADE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditor)) +#define GLADE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditorClass)) +#define GLADE_IS_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_BUTTON_EDITOR)) +#define GLADE_IS_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_BUTTON_EDITOR)) +#define GLADE_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_BUTTON_EDITOR, GladeButtonEditorClass)) typedef struct _GladeButtonEditor GladeButtonEditor; typedef struct _GladeButtonEditorClass GladeButtonEditorClass; diff --git a/plugins/gtk+/glade-cell-renderer-editor.c b/plugins/gtk+/glade-cell-renderer-editor.c index 67d48b4c..bec12d8e 100644 --- a/plugins/gtk+/glade-cell-renderer-editor.c +++ b/plugins/gtk+/glade-cell-renderer-editor.c @@ -73,7 +73,7 @@ static void glade_cell_renderer_editor_init (GladeCellRendererEditor * self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); } static void @@ -324,8 +324,8 @@ glade_cell_renderer_editor_new (GladeWidgetAdaptor * adaptor, /* "stock-size" is a normal property, but we virtualize it to use the GtkIconSize enumeration */ if (glade_property_class_get_virtual (pclass) && - strcmp (glade_property_class_id (pclass), "stock-size") != 0) - continue; + strcmp (glade_property_class_id (pclass), "stock-size") != 0) + continue; attr_name = g_strdup_printf ("attr-%s", glade_property_class_id (pclass)); use_attr_name = g_strdup_printf ("use-attr-%s", glade_property_class_id (pclass)); @@ -338,9 +338,9 @@ glade_cell_renderer_editor_new (GladeWidgetAdaptor * adaptor, if (attr_pclass && use_attr_pclass) { CheckTab *tab = g_new0 (CheckTab, 1); - GParamSpec *pspec; + GParamSpec *pspec; - pspec = glade_property_class_get_pspec (pclass); + pspec = glade_property_class_get_pspec (pclass); tab->editor = renderer_editor; tab->pclass = pclass; diff --git a/plugins/gtk+/glade-cell-renderer-editor.h b/plugins/gtk+/glade-cell-renderer-editor.h index 6845d820..957d02e8 100644 --- a/plugins/gtk+/glade-cell-renderer-editor.h +++ b/plugins/gtk+/glade-cell-renderer-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_CELL_RENDERER_EDITOR (glade_cell_renderer_editor_get_type ()) -#define GLADE_CELL_RENDERER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditor)) -#define GLADE_CELL_RENDERER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditorClass)) -#define GLADE_IS_CELL_RENDERER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR)) -#define GLADE_IS_CELL_RENDERER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_EDITOR)) -#define GLADE_CELL_RENDERER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditorClass)) +#define GLADE_TYPE_CELL_RENDERER_EDITOR (glade_cell_renderer_editor_get_type ()) +#define GLADE_CELL_RENDERER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditor)) +#define GLADE_CELL_RENDERER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditorClass)) +#define GLADE_IS_CELL_RENDERER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR)) +#define GLADE_IS_CELL_RENDERER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_EDITOR)) +#define GLADE_CELL_RENDERER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_CELL_RENDERER_EDITOR, GladeCellRendererEditorClass)) #define GLADE_TYPE_EPROP_CELL_ATTRIBUTE (glade_eprop_cell_attribute_get_type()) @@ -41,25 +41,25 @@ typedef struct _GladeCellRendererEditorClass GladeCellRendererEditorClass; struct _GladeCellRendererEditor { - GtkBox parent; + GtkBox parent; - GtkWidget *embed; /* Embedded parent class editor */ + GtkWidget *embed; /* Embedded parent class editor */ - GList *checks; /* A list of radio buttons for each property/attribute pair */ + GList *checks; /* A list of radio buttons for each property/attribute pair */ - GList *properties; /* A list of eprops to update at load() time */ + GList *properties; /* A list of eprops to update at load() time */ }; struct _GladeCellRendererEditorClass { - GtkBoxClass parent; + GtkBoxClass parent; }; GType glade_eprop_cell_attribute_get_type (void) G_GNUC_CONST; GType glade_cell_renderer_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_cell_renderer_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type, - GladeEditable *editable); + GladeEditorPageType type, + GladeEditable *editable); GladeWidget *glade_cell_renderer_get_model (GladeWidget *renderer); diff --git a/plugins/gtk+/glade-column-types.c b/plugins/gtk+/glade-column-types.c index 7bc94859..38df1330 100644 --- a/plugins/gtk+/glade-column-types.c +++ b/plugins/gtk+/glade-column-types.c @@ -67,7 +67,7 @@ column_types_store_populate_enums_flags (GtkListStore * store, gboolean enums) for (l = glade_widget_adaptor_get_properties (adaptor); l; l = l->next) { pclass = l->data; - pspec = glade_property_class_get_pspec (pclass); + pspec = glade_property_class_get_pspec (pclass); /* special case out a few of these... */ if (strcmp (g_type_name (pspec->value_type), @@ -328,7 +328,7 @@ eprop_column_adjust_rows (GladeEditorProperty * eprop, GList * columns) static void eprop_column_append (GladeEditorProperty *eprop, const gchar *type_name, - const gchar *column_name) + const gchar *column_name) { GladeEPropColumnTypes *eprop_types = GLADE_EPROP_COLUMN_TYPES (eprop); GList *columns = NULL; @@ -365,7 +365,7 @@ eprop_column_append (GladeEditorProperty *eprop, static gboolean eprop_treeview_key_press (GtkWidget *treeview, GdkEventKey *event, - GladeEditorProperty *eprop) + GladeEditorProperty *eprop) { /* Remove from list and commit value, dont touch the liststore except in load() */ GladeEPropColumnTypes *eprop_types = GLADE_EPROP_COLUMN_TYPES (eprop); @@ -810,7 +810,7 @@ glade_eprop_column_types_create_input (GladeEditorProperty * eprop) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); -/* hbox = gtk_hbox_new (FALSE, 4); */ +/* hbox = gtk_hbox_new (FALSE, 4); */ if (!types_model) { diff --git a/plugins/gtk+/glade-column-types.h b/plugins/gtk+/glade-column-types.h index 258b52de..2638c3c8 100644 --- a/plugins/gtk+/glade-column-types.h +++ b/plugins/gtk+/glade-column-types.h @@ -27,11 +27,11 @@ G_BEGIN_DECLS typedef struct { - gchar *type_name; - gchar *column_name; + gchar *type_name; + gchar *column_name; } GladeColumnType; -#define GLADE_TYPE_COLUMN_TYPE_LIST (glade_column_type_list_get_type()) +#define GLADE_TYPE_COLUMN_TYPE_LIST (glade_column_type_list_get_type()) #define GLADE_TYPE_EPROP_COLUMN_TYPES (glade_eprop_column_types_get_type()) GType glade_column_type_list_get_type (void) G_GNUC_CONST; @@ -41,7 +41,7 @@ void glade_column_list_free (GList *list); GList *glade_column_list_copy (GList *list); GladeColumnType *glade_column_type_new (const gchar *type_name, - const gchar *column_name); + const gchar *column_name); void glade_column_type_free (GladeColumnType *column); GladeColumnType *glade_column_list_find_column (GList *list, const gchar *column_name); diff --git a/plugins/gtk+/glade-combo-box-editor.h b/plugins/gtk+/glade-combo-box-editor.h index c177ace5..331a1cf1 100644 --- a/plugins/gtk+/glade-combo-box-editor.h +++ b/plugins/gtk+/glade-combo-box-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_COMBO_BOX_EDITOR (glade_combo_box_editor_get_type ()) -#define GLADE_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditor)) -#define GLADE_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass)) -#define GLADE_IS_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_COMBO_BOX_EDITOR)) -#define GLADE_IS_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_COMBO_BOX_EDITOR)) -#define GLADE_COMBO_BOX_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass)) +#define GLADE_TYPE_COMBO_BOX_EDITOR (glade_combo_box_editor_get_type ()) +#define GLADE_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditor)) +#define GLADE_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass)) +#define GLADE_IS_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_COMBO_BOX_EDITOR)) +#define GLADE_IS_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_COMBO_BOX_EDITOR)) +#define GLADE_COMBO_BOX_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass)) typedef struct _GladeComboBoxEditor GladeComboBoxEditor; typedef struct _GladeComboBoxEditorClass GladeComboBoxEditorClass; diff --git a/plugins/gtk+/glade-combo-box-text-editor.h b/plugins/gtk+/glade-combo-box-text-editor.h index 85799735..8b4a2985 100644 --- a/plugins/gtk+/glade-combo-box-text-editor.h +++ b/plugins/gtk+/glade-combo-box-text-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_COMBO_BOX_TEXT_EDITOR (glade_combo_box_text_editor_get_type ()) -#define GLADE_COMBO_BOX_TEXT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditor)) -#define GLADE_COMBO_BOX_TEXT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditorClass)) -#define GLADE_IS_COMBO_BOX_TEXT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR)) -#define GLADE_IS_COMBO_BOX_TEXT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR)) -#define GLADE_COMBO_BOX_TEXT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditorClass)) +#define GLADE_TYPE_COMBO_BOX_TEXT_EDITOR (glade_combo_box_text_editor_get_type ()) +#define GLADE_COMBO_BOX_TEXT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditor)) +#define GLADE_COMBO_BOX_TEXT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditorClass)) +#define GLADE_IS_COMBO_BOX_TEXT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR)) +#define GLADE_IS_COMBO_BOX_TEXT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR)) +#define GLADE_COMBO_BOX_TEXT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_COMBO_BOX_TEXT_EDITOR, GladeComboBoxTextEditorClass)) typedef struct _GladeComboBoxTextEditor GladeComboBoxTextEditor; typedef struct _GladeComboBoxTextEditorClass GladeComboBoxTextEditorClass; diff --git a/plugins/gtk+/glade-entry-editor.c b/plugins/gtk+/glade-entry-editor.c index 798d84fc..31223e7f 100644 --- a/plugins/gtk+/glade-entry-editor.c +++ b/plugins/gtk+/glade-entry-editor.c @@ -191,15 +191,15 @@ glade_entry_editor_load (GladeEditable * editable, GladeWidget * widget) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->primary_tooltip_markup_check), primary_markup); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->primary_tooltip_notebook), - primary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + primary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->primary_tooltip_editor_notebook), - primary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + primary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->secondary_tooltip_markup_check), secondary_markup); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->secondary_tooltip_notebook), - secondary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + secondary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->secondary_tooltip_editor_notebook), - secondary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + secondary_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); } } @@ -512,8 +512,8 @@ secondary_pixbuf_toggled (GtkWidget * widget, GladeEntryEditor * entry_editor) static void transfer_text_property (GladeWidget *gwidget, - const gchar *from, - const gchar *to) + const gchar *from, + const gchar *to) { gchar *value = NULL; gchar *comment = NULL, *context = NULL; @@ -551,8 +551,8 @@ transfer_text_property (GladeWidget *gwidget, static void toggle_tooltip_markup (GladeEntryEditor *entry_editor, - GtkWidget *widget, - gboolean primary) + GtkWidget *widget, + gboolean primary) { GladeProperty *property; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (entry_editor)); @@ -568,11 +568,11 @@ toggle_tooltip_markup (GladeEntryEditor *entry_editor, if (active) { if (primary) - glade_command_push_group (_("Setting primary icon of %s to use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_command_push_group (_("Setting primary icon of %s to use tooltip markup"), + glade_widget_get_name (gwidget)); else - glade_command_push_group (_("Setting secondary icon of %s to use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_command_push_group (_("Setting secondary icon of %s to use tooltip markup"), + glade_widget_get_name (gwidget)); transfer_text_property (gwidget, TOOLTIP_TEXT_NAME (primary), TOOLTIP_MARKUP_NAME (primary)); @@ -584,11 +584,11 @@ toggle_tooltip_markup (GladeEntryEditor *entry_editor, else { if (primary) - glade_command_push_group (_("Setting primary icon of %s to not use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_command_push_group (_("Setting primary icon of %s to not use tooltip markup"), + glade_widget_get_name (gwidget)); else - glade_command_push_group (_("Setting secondary icon of %s to not use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_command_push_group (_("Setting secondary icon of %s to not use tooltip markup"), + glade_widget_get_name (gwidget)); transfer_text_property (gwidget, TOOLTIP_MARKUP_NAME (primary), TOOLTIP_TEXT_NAME (primary)); @@ -606,14 +606,14 @@ toggle_tooltip_markup (GladeEntryEditor *entry_editor, static void primary_tooltip_markup_toggled (GtkWidget *widget, - GladeEntryEditor *entry_editor) + GladeEntryEditor *entry_editor) { toggle_tooltip_markup (entry_editor, widget, TRUE); } static void secondary_tooltip_markup_toggled (GtkWidget *widget, - GladeEntryEditor *entry_editor) + GladeEntryEditor *entry_editor) { toggle_tooltip_markup (entry_editor, widget, FALSE); } @@ -629,8 +629,8 @@ glade_entry_editor_new (void) *************************************/ void glade_entry_editor_post_create (GladeWidgetAdaptor *adaptor, - GObject *editor, - GladeCreateReason reason) + GObject *editor, + GladeCreateReason reason) { GladeEntryEditorPrivate *priv = GLADE_ENTRY_EDITOR (editor)->priv; diff --git a/plugins/gtk+/glade-entry-editor.h b/plugins/gtk+/glade-entry-editor.h index efd1329a..8561bca6 100644 --- a/plugins/gtk+/glade-entry-editor.h +++ b/plugins/gtk+/glade-entry-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ENTRY_EDITOR (glade_entry_editor_get_type ()) -#define GLADE_ENTRY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditor)) -#define GLADE_ENTRY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditorClass)) -#define GLADE_IS_ENTRY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ENTRY_EDITOR)) -#define GLADE_IS_ENTRY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ENTRY_EDITOR)) -#define GLADE_ENTRY_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditorClass)) +#define GLADE_TYPE_ENTRY_EDITOR (glade_entry_editor_get_type ()) +#define GLADE_ENTRY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditor)) +#define GLADE_ENTRY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditorClass)) +#define GLADE_IS_ENTRY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ENTRY_EDITOR)) +#define GLADE_IS_ENTRY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ENTRY_EDITOR)) +#define GLADE_ENTRY_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ENTRY_EDITOR, GladeEntryEditorClass)) typedef struct _GladeEntryEditor GladeEntryEditor; typedef struct _GladeEntryEditorClass GladeEntryEditorClass; diff --git a/plugins/gtk+/glade-eprop-enum-int.c b/plugins/gtk+/glade-eprop-enum-int.c index e7bb65d5..be281c94 100644 --- a/plugins/gtk+/glade-eprop-enum-int.c +++ b/plugins/gtk+/glade-eprop-enum-int.c @@ -15,9 +15,9 @@ static void glade_eprop_enum_int_init (GladeEPropEnumInt *ep static void glade_eprop_enum_int_class_init (GladeEPropEnumIntClass *klass); static void glade_eprop_enum_int_finalize (GObject *object); static void glade_eprop_enum_int_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); + guint property_id, + const GValue *value, + GParamSpec *pspec); /* GladeEditorPropertyClass */ static void glade_eprop_enum_int_load (GladeEditorProperty *eprop, GladeProperty *property); @@ -44,8 +44,8 @@ enum { }; G_DEFINE_TYPE_WITH_PRIVATE (GladeEPropEnumInt, - glade_eprop_enum_int, - GLADE_TYPE_EDITOR_PROPERTY); + glade_eprop_enum_int, + GLADE_TYPE_EDITOR_PROPERTY); static void glade_eprop_enum_int_init (GladeEPropEnumInt *eprop) @@ -96,13 +96,13 @@ glade_eprop_enum_int_load (GladeEditorProperty *eprop, GladeProperty *property) * set the entry text */ for (i = 0; i < enum_class->n_values; i++) - { - if (enum_class->values[i].value == value) - { - found = TRUE; - break; - } - } + { + if (enum_class->values[i].value == value) + { + found = TRUE; + break; + } + } if (found) { @@ -132,17 +132,17 @@ string_from_value (GType etype, gint val) { if (val == eclass->values[i].value) { - if (glade_type_has_displayable_values (etype)) - { - if (!glade_displayable_value_is_disabled (etype, eclass->values[i].value_nick)) - string = glade_get_displayable_value (etype, eclass->values[i].value_nick); - } - else - { - string = eclass->values[i].value_nick; - } - - break; + if (glade_type_has_displayable_values (etype)) + { + if (!glade_displayable_value_is_disabled (etype, eclass->values[i].value_nick)) + string = glade_get_displayable_value (etype, eclass->values[i].value_nick); + } + else + { + string = eclass->values[i].value_nick; + } + + break; } } g_type_class_unref (eclass); @@ -169,31 +169,31 @@ value_from_string (GType etype, const gchar *string, gint *value) eclass = g_type_class_ref (etype); ev = g_enum_get_value_by_name (eclass, string); if (!ev) - ev = g_enum_get_value_by_nick (eclass, string); + ev = g_enum_get_value_by_nick (eclass, string); if (ev) - { - val = ev->value; - found = TRUE; - } + { + val = ev->value; + found = TRUE; + } if (!found && string && string[0]) - { - /* Try Displayables */ - string = glade_get_value_from_displayable (etype, string); - if (string) - { - ev = g_enum_get_value_by_name (eclass, string); - if (!ev) - ev = g_enum_get_value_by_nick (eclass, string); - - if (ev) - { - val = ev->value; - found = TRUE; - } - } - } + { + /* Try Displayables */ + string = glade_get_value_from_displayable (etype, string); + if (string) + { + ev = g_enum_get_value_by_name (eclass, string); + if (!ev) + ev = g_enum_get_value_by_nick (eclass, string); + + if (ev) + { + val = ev->value; + found = TRUE; + } + } + } g_type_class_unref (eclass); } @@ -223,15 +223,15 @@ glade_eprop_enum_int_changed_combo (GtkWidget *combo_box, GladeEditorProperty *e if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter)) { gtk_tree_model_get (tree_model, &iter, - COLUMN_VALUE_INT, &ival, - -1); + COLUMN_VALUE_INT, &ival, + -1); } else { const char *text = gtk_entry_get_text (GTK_ENTRY (priv->entry)); if (!value_from_string (priv->type, text, &ival)) - error = TRUE; + error = TRUE; } if (error) @@ -255,8 +255,8 @@ glade_eprop_enum_int_changed_combo (GtkWidget *combo_box, GladeEditorProperty *e static gchar * glade_eprop_enum_int_format_entry_cb (GtkComboBox *combo, - const gchar *path, - GladeEPropEnumInt *eprop_enum) + const gchar *path, + GladeEPropEnumInt *eprop_enum) { GladeEPropEnumIntPrivate *priv = glade_eprop_enum_int_get_instance_private (eprop_enum); GtkTreeIter iter; @@ -326,8 +326,8 @@ glade_eprop_enum_int_focus_out_idle (gpointer user_data) static gboolean glade_eprop_enum_int_entry_focus_out (GtkWidget *widget, - GdkEvent *event, - GladeEPropEnumInt *eprop_enum) + GdkEvent *event, + GladeEPropEnumInt *eprop_enum) { GladeEPropEnumIntPrivate *priv = glade_eprop_enum_int_get_instance_private (eprop_enum); @@ -352,8 +352,8 @@ glade_eprop_enum_int_create_input (GladeEditorProperty *eprop) enum_class = g_type_class_ref (priv->type); list_store = gtk_list_store_new (N_COLUMNS, - G_TYPE_STRING, /* COLUMN_ENUM_TEXT */ - G_TYPE_INT); /* COLUMN_VALUE_INT */ + G_TYPE_STRING, /* COLUMN_ENUM_TEXT */ + G_TYPE_INT); /* COLUMN_VALUE_INT */ if (!glade_type_has_displayable_values (priv->type)) g_warning ("No displayable value found for type %s", g_type_name (priv->type)); @@ -366,9 +366,9 @@ glade_eprop_enum_int_create_input (GladeEditorProperty *eprop) gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, - COLUMN_ENUM_TEXT, string_from_value (priv->type, enum_class->values[i].value), - COLUMN_VALUE_INT, enum_class->values[i].value, - -1); + COLUMN_ENUM_TEXT, string_from_value (priv->type, enum_class->values[i].value), + COLUMN_VALUE_INT, enum_class->values[i].value, + -1); } priv->combo_box = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL (list_store)); @@ -385,7 +385,7 @@ glade_eprop_enum_int_create_input (GladeEditorProperty *eprop) G_CALLBACK (glade_eprop_enum_int_format_entry_cb), eprop); g_signal_connect_after (G_OBJECT (priv->entry), "focus-out-event", - G_CALLBACK (glade_eprop_enum_int_entry_focus_out), eprop); + G_CALLBACK (glade_eprop_enum_int_entry_focus_out), eprop); glade_util_remove_scroll_events (priv->combo_box); diff --git a/plugins/gtk+/glade-eprop-enum-int.h b/plugins/gtk+/glade-eprop-enum-int.h index b5df6a14..dcf63386 100644 --- a/plugins/gtk+/glade-eprop-enum-int.h +++ b/plugins/gtk+/glade-eprop-enum-int.h @@ -19,12 +19,12 @@ typedef struct } GladeEPropEnumInt; typedef struct { - GladeEditorPropertyClass eprop_class; + GladeEditorPropertyClass eprop_class; } GladeEPropEnumIntClass; GladeEditorProperty *glade_eprop_enum_int_new (GladePropertyClass *pclass, - GType type, - gboolean use_command); + GType type, + gboolean use_command); G_END_DECLS diff --git a/plugins/gtk+/glade-file-chooser-button-editor.h b/plugins/gtk+/glade-file-chooser-button-editor.h index 55e040a8..dbcf8be4 100644 --- a/plugins/gtk+/glade-file-chooser-button-editor.h +++ b/plugins/gtk+/glade-file-chooser-button-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR (glade_file_chooser_button_editor_get_type ()) -#define GLADE_FILE_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditor)) -#define GLADE_FILE_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditorClass)) -#define GLADE_IS_FILE_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR)) -#define GLADE_IS_FILE_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR)) -#define GLADE_FILE_CHOOSER_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditorClass)) +#define GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR (glade_file_chooser_button_editor_get_type ()) +#define GLADE_FILE_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditor)) +#define GLADE_FILE_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditorClass)) +#define GLADE_IS_FILE_CHOOSER_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR)) +#define GLADE_IS_FILE_CHOOSER_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR)) +#define GLADE_FILE_CHOOSER_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_BUTTON_EDITOR, GladeFileChooserButtonEditorClass)) typedef struct _GladeFileChooserButtonEditor GladeFileChooserButtonEditor; typedef struct _GladeFileChooserButtonEditorClass GladeFileChooserButtonEditorClass; diff --git a/plugins/gtk+/glade-file-chooser-dialog-editor.h b/plugins/gtk+/glade-file-chooser-dialog-editor.h index 0a961358..281bf19c 100644 --- a/plugins/gtk+/glade-file-chooser-dialog-editor.h +++ b/plugins/gtk+/glade-file-chooser-dialog-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR (glade_file_chooser_dialog_editor_get_type ()) -#define GLADE_FILE_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditor)) -#define GLADE_FILE_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditorClass)) -#define GLADE_IS_FILE_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR)) -#define GLADE_IS_FILE_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR)) -#define GLADE_FILE_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditorClass)) +#define GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR (glade_file_chooser_dialog_editor_get_type ()) +#define GLADE_FILE_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditor)) +#define GLADE_FILE_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditorClass)) +#define GLADE_IS_FILE_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR)) +#define GLADE_IS_FILE_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR)) +#define GLADE_FILE_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_DIALOG_EDITOR, GladeFileChooserDialogEditorClass)) typedef struct _GladeFileChooserDialogEditor GladeFileChooserDialogEditor; typedef struct _GladeFileChooserDialogEditorClass GladeFileChooserDialogEditorClass; diff --git a/plugins/gtk+/glade-file-chooser-editor.h b/plugins/gtk+/glade-file-chooser-editor.h index dc50c24d..b26f3df7 100644 --- a/plugins/gtk+/glade-file-chooser-editor.h +++ b/plugins/gtk+/glade-file-chooser-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FILE_CHOOSER_EDITOR (glade_file_chooser_editor_get_type ()) -#define GLADE_FILE_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditor)) -#define GLADE_FILE_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditorClass)) -#define GLADE_IS_FILE_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR)) -#define GLADE_IS_FILE_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_EDITOR)) -#define GLADE_FILE_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditorClass)) +#define GLADE_TYPE_FILE_CHOOSER_EDITOR (glade_file_chooser_editor_get_type ()) +#define GLADE_FILE_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditor)) +#define GLADE_FILE_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditorClass)) +#define GLADE_IS_FILE_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR)) +#define GLADE_IS_FILE_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_EDITOR)) +#define GLADE_FILE_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_EDITOR, GladeFileChooserEditorClass)) typedef struct _GladeFileChooserEditor GladeFileChooserEditor; typedef struct _GladeFileChooserEditorClass GladeFileChooserEditorClass; diff --git a/plugins/gtk+/glade-file-chooser-widget-editor.h b/plugins/gtk+/glade-file-chooser-widget-editor.h index bbfb5c9a..8af63499 100644 --- a/plugins/gtk+/glade-file-chooser-widget-editor.h +++ b/plugins/gtk+/glade-file-chooser-widget-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR (glade_file_chooser_widget_editor_get_type ()) -#define GLADE_FILE_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditor)) -#define GLADE_FILE_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditorClass)) -#define GLADE_IS_FILE_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR)) -#define GLADE_IS_FILE_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR)) -#define GLADE_FILE_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditorClass)) +#define GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR (glade_file_chooser_widget_editor_get_type ()) +#define GLADE_FILE_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditor)) +#define GLADE_FILE_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditorClass)) +#define GLADE_IS_FILE_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR)) +#define GLADE_IS_FILE_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR)) +#define GLADE_FILE_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FILE_CHOOSER_WIDGET_EDITOR, GladeFileChooserWidgetEditorClass)) typedef struct _GladeFileChooserWidgetEditor GladeFileChooserWidgetEditor; typedef struct _GladeFileChooserWidgetEditorClass GladeFileChooserWidgetEditorClass; diff --git a/plugins/gtk+/glade-fixed.c b/plugins/gtk+/glade-fixed.c index c4186984..7388f635 100644 --- a/plugins/gtk+/glade-fixed.c +++ b/plugins/gtk+/glade-fixed.c @@ -99,9 +99,9 @@ G_DEFINE_TYPE (GladeFixed, glade_fixed, GLADE_TYPE_WIDGET); /* From gtkmain.c */ static gboolean glade_fixed_boolean_handled_accumulator (GSignalInvocationHint * ihint, - GValue * return_accu, - const GValue * handler_return, - gpointer dummy) + GValue * return_accu, + const GValue * handler_return, + gpointer dummy) { gboolean continue_emission; gboolean signal_handled; @@ -133,11 +133,11 @@ save_expand_data (GtkWidget *widget) gboolean v_expand_set; g_object_get (G_OBJECT (widget), - "hexpand-set", &h_expand_set, - "vexpand-set", &v_expand_set, - "hexpand", &h_expand, - "vexpand", &v_expand, - NULL); + "hexpand-set", &h_expand_set, + "vexpand-set", &v_expand_set, + "hexpand", &h_expand, + "vexpand", &v_expand, + NULL); flags = (h_expand_set ? HEXPAND_SET_FLAG : 0) | @@ -156,11 +156,11 @@ restore_expand_data (GtkWidget *widget) flags = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "glade-gtk-box-child-expand")); g_object_set (G_OBJECT (widget), - "hexpand", ((flags & HEXPAND_FLAG) != 0), - "vexpand", ((flags & VEXPAND_FLAG) != 0), - "hexpand-set", ((flags & HEXPAND_SET_FLAG) != 0), - "vexpand-set", ((flags & VEXPAND_SET_FLAG) != 0), - NULL); + "hexpand", ((flags & HEXPAND_FLAG) != 0), + "vexpand", ((flags & VEXPAND_FLAG) != 0), + "hexpand-set", ((flags & HEXPAND_SET_FLAG) != 0), + "vexpand-set", ((flags & VEXPAND_SET_FLAG) != 0), + NULL); } static void @@ -260,8 +260,8 @@ glade_fixed_save_state (GladeFixed *fixed, GladeWidget *child, GdkDevice *device child_widget = GTK_WIDGET (glade_widget_get_object (child)); glade_utils_get_pointer (widget, gtk_widget_get_window (widget), device, - &(GLADE_FIXED (fixed)->pointer_x_origin), - &(GLADE_FIXED (fixed)->pointer_y_origin)); + &(GLADE_FIXED (fixed)->pointer_x_origin), + &(GLADE_FIXED (fixed)->pointer_y_origin)); gtk_widget_translate_coordinates (child_widget, widget, 0, 0, &(fixed->child_x_origin), @@ -622,7 +622,7 @@ glade_fixed_configure_end_impl (GladeFixed *fixed, GladeWidget *child) glade_command_push_group (_("Placing %s inside %s"), glade_widget_get_name (child), - glade_widget_get_name (GLADE_WIDGET (fixed))); + glade_widget_get_name (GLADE_WIDGET (fixed))); /* whew, all that for this call ! */ @@ -692,8 +692,8 @@ glade_fixed_handle_child_event (GladeFixed *fixed, device = gdk_event_get_device (event); glade_utils_get_pointer (fixed_widget, - window, - device, &fixed_x, &fixed_y); + window, + device, &fixed_x, &fixed_y); /* Container widgets are trustable to have widget->window occupying * the entire widget allocation (gtk_widget_get_pointer broken on GtkEntry). @@ -731,9 +731,9 @@ glade_fixed_handle_child_event (GladeFixed *fixed, else if (fixed->configuring) { /* Need to update mouse for configures. */ - glade_utils_get_pointer (fixed_widget, - window, gdk_event_get_device (event), - &fixed->mouse_x, &fixed->mouse_y); + glade_utils_get_pointer (fixed_widget, + window, gdk_event_get_device (event), + &fixed->mouse_x, &fixed->mouse_y); glade_fixed_configure_widget (fixed, child, event->motion.device); glade_cursor_set (project, window, fixed->operation); @@ -750,14 +750,14 @@ glade_fixed_handle_child_event (GladeFixed *fixed, { - expand_all_children (GLADE_WIDGET (fixed)); + expand_all_children (GLADE_WIDGET (fixed)); - /* Spin the main loop so that the GladeFixed - * widget gets reallocated before storing - * the allocation sizes - */ - while (gtk_events_pending ()) - gtk_main_iteration (); + /* Spin the main loop so that the GladeFixed + * widget gets reallocated before storing + * the allocation sizes + */ + while (gtk_events_pending ()) + gtk_main_iteration (); @@ -838,7 +838,7 @@ glade_fixed_child_event (GladeWidget *gwidget, static void glade_fixed_add_child_impl (GladeWidget *gwidget_fixed, GladeWidget *child, - gboolean at_mouse) + gboolean at_mouse) { GladeFixed *fixed = GLADE_FIXED (gwidget_fixed); GtkAllocation allocation; @@ -855,7 +855,7 @@ glade_fixed_add_child_impl (GladeWidget *gwidget_fixed, widget = GTK_WIDGET (glade_widget_get_object (gwidget_fixed)); if (gtk_widget_get_window (widget)) glade_utils_get_pointer (widget, NULL, NULL, - &fixed->mouse_x, &fixed->mouse_y); + &fixed->mouse_x, &fixed->mouse_y); /* Chain up for the basic parenting */ GLADE_WIDGET_CLASS (glade_fixed_parent_class)->add_child @@ -960,7 +960,7 @@ glade_fixed_event (GladeWidget *gwidget_fixed, GdkEvent *event) { /* Need to update mouse for configures. */ glade_utils_get_pointer (GTK_WIDGET (glade_widget_get_object (gwidget_fixed)), - window, device, &fixed->mouse_x, &fixed->mouse_y); + window, device, &fixed->mouse_x, &fixed->mouse_y); if (fixed->configuring) { @@ -990,7 +990,7 @@ glade_fixed_event (GladeWidget *gwidget_fixed, GdkEvent *event) glade_widget_get_project (GLADE_WIDGET (fixed))); fixed->creating = FALSE; - glade_project_set_add_item (project, NULL); + glade_project_set_add_item (project, NULL); handled = TRUE; } @@ -1166,17 +1166,17 @@ glade_fixed_class_init (GladeFixedClass *fixed_class) _("Whether this container supports resizes of child widgets"), TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - /** - * GladeFixed::configure-child: - * @gladewidget: the #GladeFixed which received the signal. - * @arg1: the child #GladeWidget - * @arg2: a pointer to a #GdkRectange describing the new size. - * - * Delegates the Drag/Resize job. - * - * Returns: %TRUE means you have handled the event and cancels the - * default handler from being triggered. - */ + /** + * GladeFixed::configure-child: + * @gladewidget: the #GladeFixed which received the signal. + * @arg1: the child #GladeWidget + * @arg2: a pointer to a #GdkRectange describing the new size. + * + * Delegates the Drag/Resize job. + * + * Returns: %TRUE means you have handled the event and cancels the + * default handler from being triggered. + */ glade_fixed_signals[CONFIGURE_CHILD] = g_signal_new ("configure-child", G_TYPE_FROM_CLASS (gobject_class), @@ -1187,16 +1187,16 @@ glade_fixed_class_init (GladeFixedClass *fixed_class) glade_gtk_marshal_BOOLEAN__OBJECT_POINTER, G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_POINTER); - /** - * GladeFixed::configure-begin: - * @gladewidget: the #GladeFixed which received the signal. - * @arg1: the child #GladeWidget - * - * Signals the beginning of a Drag/Resize - * - * Returns: %TRUE means you have handled the event and cancels the - * default handler from being triggered. - */ + /** + * GladeFixed::configure-begin: + * @gladewidget: the #GladeFixed which received the signal. + * @arg1: the child #GladeWidget + * + * Signals the beginning of a Drag/Resize + * + * Returns: %TRUE means you have handled the event and cancels the + * default handler from being triggered. + */ glade_fixed_signals[CONFIGURE_BEGIN] = g_signal_new ("configure-begin", G_TYPE_FROM_CLASS (gobject_class), @@ -1207,16 +1207,16 @@ glade_fixed_class_init (GladeFixedClass *fixed_class) glade_gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT); - /** - * GladeFixed::configure-end: - * @gladewidget: the #GladeFixed which received the signal. - * @arg1: the child #GladeWidget - * - * Signals the end of a Drag/Resize - * - * Returns: %TRUE means you have handled the event and cancels the - * default handler from being triggered. - */ + /** + * GladeFixed::configure-end: + * @gladewidget: the #GladeFixed which received the signal. + * @arg1: the child #GladeWidget + * + * Signals the end of a Drag/Resize + * + * Returns: %TRUE means you have handled the event and cancels the + * default handler from being triggered. + */ glade_fixed_signals[CONFIGURE_END] = g_signal_new ("configure-end", G_TYPE_FROM_CLASS (gobject_class), diff --git a/plugins/gtk+/glade-fixed.h b/plugins/gtk+/glade-fixed.h index f7872916..d29d581c 100644 --- a/plugins/gtk+/glade-fixed.h +++ b/plugins/gtk+/glade-fixed.h @@ -18,69 +18,69 @@ G_BEGIN_DECLS /* Convenience macros used in pointer events. */ #define GLADE_FIXED_CURSOR_TOP(type) \ - ((type) == GLADE_CURSOR_RESIZE_TOP_RIGHT || \ - (type) == GLADE_CURSOR_RESIZE_TOP_LEFT || \ - (type) == GLADE_CURSOR_RESIZE_TOP) + ((type) == GLADE_CURSOR_RESIZE_TOP_RIGHT || \ + (type) == GLADE_CURSOR_RESIZE_TOP_LEFT || \ + (type) == GLADE_CURSOR_RESIZE_TOP) #define GLADE_FIXED_CURSOR_BOTTOM(type) \ - ((type) == GLADE_CURSOR_RESIZE_BOTTOM_RIGHT || \ - (type) == GLADE_CURSOR_RESIZE_BOTTOM_LEFT || \ - (type) == GLADE_CURSOR_RESIZE_BOTTOM) + ((type) == GLADE_CURSOR_RESIZE_BOTTOM_RIGHT || \ + (type) == GLADE_CURSOR_RESIZE_BOTTOM_LEFT || \ + (type) == GLADE_CURSOR_RESIZE_BOTTOM) #define GLADE_FIXED_CURSOR_RIGHT(type) \ - ((type) == GLADE_CURSOR_RESIZE_TOP_RIGHT || \ - (type) == GLADE_CURSOR_RESIZE_BOTTOM_RIGHT || \ - (type) == GLADE_CURSOR_RESIZE_RIGHT) + ((type) == GLADE_CURSOR_RESIZE_TOP_RIGHT || \ + (type) == GLADE_CURSOR_RESIZE_BOTTOM_RIGHT || \ + (type) == GLADE_CURSOR_RESIZE_RIGHT) #define GLADE_FIXED_CURSOR_LEFT(type) \ - ((type) == GLADE_CURSOR_RESIZE_TOP_LEFT || \ - (type) == GLADE_CURSOR_RESIZE_BOTTOM_LEFT || \ - (type) == GLADE_CURSOR_RESIZE_LEFT) + ((type) == GLADE_CURSOR_RESIZE_TOP_LEFT || \ + (type) == GLADE_CURSOR_RESIZE_BOTTOM_LEFT || \ + (type) == GLADE_CURSOR_RESIZE_LEFT) typedef struct _GladeFixed GladeFixed; typedef struct _GladeFixedClass GladeFixedClass; struct _GladeFixed { - GladeWidget parent_instance; - - gchar *x_prop; /* packing property names (on child widgets) used */ - gchar *y_prop; /* to obtain & configure widget coordinates */ - gchar *width_prop; /* property names (on child widgets) used to obtain */ - gchar *height_prop; /* & configure widget dimentions. */ - - gboolean can_resize; /* whether the container supports child resizes or only - * drags. - */ - - /* State machine used to commit properties at the end - * of a drag or a resize (i.e. a "configure"). - */ - gint pointer_x_origin; - gint pointer_y_origin; - gint pointer_x_child_origin; - gint pointer_y_child_origin; - gint child_x_origin; - gint child_y_origin; - gint child_width_origin; - gint child_height_origin; - - GladeWidget *configuring; - GladeCursorType operation; - gboolean creating; - gint mouse_x; - gint mouse_y; + GladeWidget parent_instance; + + gchar *x_prop; /* packing property names (on child widgets) used */ + gchar *y_prop; /* to obtain & configure widget coordinates */ + gchar *width_prop; /* property names (on child widgets) used to obtain */ + gchar *height_prop; /* & configure widget dimentions. */ + + gboolean can_resize; /* whether the container supports child resizes or only + * drags. + */ + + /* State machine used to commit properties at the end + * of a drag or a resize (i.e. a "configure"). + */ + gint pointer_x_origin; + gint pointer_y_origin; + gint pointer_x_child_origin; + gint pointer_y_child_origin; + gint child_x_origin; + gint child_y_origin; + gint child_width_origin; + gint child_height_origin; + + GladeWidget *configuring; + GladeCursorType operation; + gboolean creating; + gint mouse_x; + gint mouse_y; }; struct _GladeFixedClass { - GladeWidgetClass parent_class; + GladeWidgetClass parent_class; - gboolean (* configure_child) (GladeFixed *, GladeWidget *, GdkRectangle *); - gboolean (* configure_begin) (GladeFixed *, GladeWidget *); - gboolean (* configure_end) (GladeFixed *, GladeWidget *); + gboolean (* configure_child) (GladeFixed *, GladeWidget *, GdkRectangle *); + gboolean (* configure_begin) (GladeFixed *, GladeWidget *); + gboolean (* configure_end) (GladeFixed *, GladeWidget *); - /* Signal handler for child widgets - */ - gint (* child_event) (GladeWidget *, GdkEvent *, GladeFixed *); + /* Signal handler for child widgets + */ + gint (* child_event) (GladeWidget *, GdkEvent *, GladeFixed *); }; diff --git a/plugins/gtk+/glade-font-button-editor.h b/plugins/gtk+/glade-font-button-editor.h index 9e146c82..b9c78a31 100644 --- a/plugins/gtk+/glade-font-button-editor.h +++ b/plugins/gtk+/glade-font-button-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FONT_BUTTON_EDITOR (glade_font_button_editor_get_type ()) -#define GLADE_FONT_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditor)) -#define GLADE_FONT_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditorClass)) -#define GLADE_IS_FONT_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR)) -#define GLADE_IS_FONT_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_BUTTON_EDITOR)) -#define GLADE_FONT_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditorClass)) +#define GLADE_TYPE_FONT_BUTTON_EDITOR (glade_font_button_editor_get_type ()) +#define GLADE_FONT_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditor)) +#define GLADE_FONT_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditorClass)) +#define GLADE_IS_FONT_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR)) +#define GLADE_IS_FONT_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_BUTTON_EDITOR)) +#define GLADE_FONT_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_BUTTON_EDITOR, GladeFontButtonEditorClass)) typedef struct _GladeFontButtonEditor GladeFontButtonEditor; typedef struct _GladeFontButtonEditorClass GladeFontButtonEditorClass; diff --git a/plugins/gtk+/glade-font-chooser-dialog-editor.h b/plugins/gtk+/glade-font-chooser-dialog-editor.h index c91f8a2b..8bae4ff5 100644 --- a/plugins/gtk+/glade-font-chooser-dialog-editor.h +++ b/plugins/gtk+/glade-font-chooser-dialog-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR (glade_font_chooser_dialog_editor_get_type ()) -#define GLADE_FONT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditor)) -#define GLADE_FONT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditorClass)) -#define GLADE_IS_FONT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR)) -#define GLADE_IS_FONT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR)) -#define GLADE_FONT_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditorClass)) +#define GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR (glade_font_chooser_dialog_editor_get_type ()) +#define GLADE_FONT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditor)) +#define GLADE_FONT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditorClass)) +#define GLADE_IS_FONT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR)) +#define GLADE_IS_FONT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR)) +#define GLADE_FONT_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_DIALOG_EDITOR, GladeFontChooserDialogEditorClass)) typedef struct _GladeFontChooserDialogEditor GladeFontChooserDialogEditor; typedef struct _GladeFontChooserDialogEditorClass GladeFontChooserDialogEditorClass; diff --git a/plugins/gtk+/glade-font-chooser-editor.h b/plugins/gtk+/glade-font-chooser-editor.h index aa5709a7..60920e98 100644 --- a/plugins/gtk+/glade-font-chooser-editor.h +++ b/plugins/gtk+/glade-font-chooser-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FONT_CHOOSER_EDITOR (glade_font_chooser_editor_get_type ()) -#define GLADE_FONT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditor)) -#define GLADE_FONT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditorClass)) -#define GLADE_IS_FONT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR)) -#define GLADE_IS_FONT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_EDITOR)) -#define GLADE_FONT_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditorClass)) +#define GLADE_TYPE_FONT_CHOOSER_EDITOR (glade_font_chooser_editor_get_type ()) +#define GLADE_FONT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditor)) +#define GLADE_FONT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditorClass)) +#define GLADE_IS_FONT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR)) +#define GLADE_IS_FONT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_EDITOR)) +#define GLADE_FONT_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_EDITOR, GladeFontChooserEditorClass)) typedef struct _GladeFontChooserEditor GladeFontChooserEditor; typedef struct _GladeFontChooserEditorClass GladeFontChooserEditorClass; diff --git a/plugins/gtk+/glade-font-chooser-widget-editor.h b/plugins/gtk+/glade-font-chooser-widget-editor.h index 5e9e09e4..66a5d353 100644 --- a/plugins/gtk+/glade-font-chooser-widget-editor.h +++ b/plugins/gtk+/glade-font-chooser-widget-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR (glade_font_chooser_widget_editor_get_type ()) -#define GLADE_FONT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditor)) -#define GLADE_FONT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditorClass)) -#define GLADE_IS_FONT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR)) -#define GLADE_IS_FONT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR)) -#define GLADE_FONT_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditorClass)) +#define GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR (glade_font_chooser_widget_editor_get_type ()) +#define GLADE_FONT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditor)) +#define GLADE_FONT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditorClass)) +#define GLADE_IS_FONT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR)) +#define GLADE_IS_FONT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR)) +#define GLADE_FONT_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_FONT_CHOOSER_WIDGET_EDITOR, GladeFontChooserWidgetEditorClass)) typedef struct _GladeFontChooserWidgetEditor GladeFontChooserWidgetEditor; typedef struct _GladeFontChooserWidgetEditorClass GladeFontChooserWidgetEditorClass; diff --git a/plugins/gtk+/glade-grid-editor.h b/plugins/gtk+/glade-grid-editor.h index 0e5b6e4d..703a5c4d 100644 --- a/plugins/gtk+/glade-grid-editor.h +++ b/plugins/gtk+/glade-grid-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_GRID_EDITOR (glade_grid_editor_get_type ()) -#define GLADE_GRID_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_GRID_EDITOR, GladeGridEditor)) -#define GLADE_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_GRID_EDITOR, GladeGridEditorClass)) -#define GLADE_IS_GRID_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_GRID_EDITOR)) -#define GLADE_IS_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_GRID_EDITOR)) -#define GLADE_GRID_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_GRID_EDITOR, GladeGridEditorClass)) +#define GLADE_TYPE_GRID_EDITOR (glade_grid_editor_get_type ()) +#define GLADE_GRID_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_GRID_EDITOR, GladeGridEditor)) +#define GLADE_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_GRID_EDITOR, GladeGridEditorClass)) +#define GLADE_IS_GRID_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_GRID_EDITOR)) +#define GLADE_IS_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_GRID_EDITOR)) +#define GLADE_GRID_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_GRID_EDITOR, GladeGridEditorClass)) typedef struct _GladeGridEditor GladeGridEditor; typedef struct _GladeGridEditorClass GladeGridEditorClass; diff --git a/plugins/gtk+/glade-gtk-about-dialog.c b/plugins/gtk+/glade-gtk-about-dialog.c index 92d80574..17918e8c 100644 --- a/plugins/gtk+/glade-gtk-about-dialog.c +++ b/plugins/gtk+/glade-gtk-about-dialog.c @@ -70,11 +70,11 @@ glade_gtk_about_dialog_construct_object (GladeWidgetAdaptor *adaptor, void glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, + GladeWidget *widget, GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -89,8 +89,8 @@ glade_gtk_about_dialog_read_widget (GladeWidgetAdaptor *adaptor, void glade_gtk_about_dialog_set_property (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *id, + GObject *object, + const gchar *id, const GValue *value) { if (!strcmp (id, "glade-logo-as-file")) diff --git a/plugins/gtk+/glade-gtk-action-bar.c b/plugins/gtk+/glade-gtk-action-bar.c index 7743ad01..4168e6ee 100644 --- a/plugins/gtk+/glade-gtk-action-bar.c +++ b/plugins/gtk+/glade-gtk-action-bar.c @@ -202,7 +202,7 @@ glade_gtk_action_bar_get_property (GladeWidgetAdaptor * adaptor, if (!strcmp (id, "use-center-child")) { g_value_reset (value); - g_value_set_boolean (value, gtk_action_bar_get_center_widget (GTK_ACTION_BAR (object)) != NULL); + g_value_set_boolean (value, gtk_action_bar_get_center_widget (GTK_ACTION_BAR (object)) != NULL); } else if (!strcmp (id, "size")) { @@ -236,9 +236,9 @@ glade_gtk_action_bar_get_first_blank (GtkActionBar * box) GladeProperty *property = glade_widget_get_pack_property (gwidget, "position"); - /* property can be NULL here when project is closing */ - if (property) - gwidget_position = g_value_get_int (glade_property_inline_value (property)); + /* property can be NULL here when project is closing */ + if (property) + gwidget_position = g_value_get_int (glade_property_inline_value (property)); if (gwidget_position > position) break; diff --git a/plugins/gtk+/glade-gtk-action-group.c b/plugins/gtk+/glade-gtk-action-group.c index 7ccde397..16b0a395 100644 --- a/plugins/gtk+/glade-gtk-action-group.c +++ b/plugins/gtk+/glade-gtk-action-group.c @@ -30,26 +30,26 @@ gboolean glade_gtk_action_group_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (!GTK_IS_ACTION (child)) G_GNUC_END_IGNORE_DEPRECATIONS { if (user_feedback) - { + { G_GNUC_BEGIN_IGNORE_DEPRECATIONS - GladeWidgetAdaptor *action_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_ACTION); + GladeWidgetAdaptor *action_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_ACTION); G_GNUC_END_IGNORE_DEPRECATIONS - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (action_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (action_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -58,8 +58,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_action_group_add_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_action_group_add_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (GTK_IS_ACTION (child)) @@ -83,8 +84,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_action_group_remove_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_action_group_remove_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (GTK_IS_ACTION (child)) @@ -103,23 +105,24 @@ G_GNUC_END_IGNORE_DEPRECATIONS (GDestroyNotify) g_list_free); glade_widget_property_set_sensitive (gaction, "accelerator", FALSE, - ACTION_ACCEL_INSENSITIVE_MSG); + ACTION_ACCEL_INSENSITIVE_MSG); glade_widget_set_action_sensitive (gaction, "launch_editor", FALSE); } } void -glade_gtk_action_group_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_action) +glade_gtk_action_group_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_action) { glade_gtk_action_group_remove_child (adaptor, container, current); glade_gtk_action_group_add_child (adaptor, container, new_action); } GList * -glade_gtk_action_group_get_children (GladeWidgetAdaptor * adaptor, - GObject * container) +glade_gtk_action_group_get_children (GladeWidgetAdaptor *adaptor, + GObject *container) { GladeWidget *ggroup = glade_widget_get_from_gobject (container); GList *actions = g_object_get_data (G_OBJECT (ggroup), "glade-actions"); @@ -129,8 +132,9 @@ glade_gtk_action_group_get_children (GladeWidgetAdaptor * adaptor, void -glade_gtk_action_group_read_child (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_action_group_read_child (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GladeXmlNode *widget_node; GladeWidget *child_widget; @@ -155,10 +159,10 @@ glade_gtk_action_group_read_child (GladeWidgetAdaptor * adaptor, void -glade_gtk_action_group_write_child (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_action_group_write_child (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *child_node; @@ -174,23 +178,23 @@ glade_gtk_action_group_write_child (GladeWidgetAdaptor * adaptor, static void glade_gtk_action_child_selected (GladeBaseEditor *editor, - GladeWidget *gchild, - gpointer data) + GladeWidget *gchild, + gpointer data) { glade_base_editor_add_label (editor, _("Action")); - + glade_base_editor_add_default_properties (editor, gchild); - + glade_base_editor_add_label (editor, _("Properties")); glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL); } static gboolean glade_gtk_action_move_child (GladeBaseEditor *editor, - GladeWidget *gparent, - GladeWidget *gchild, - gpointer data) -{ + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data) +{ return FALSE; } @@ -212,25 +216,25 @@ G_GNUC_END_IGNORE_DEPRECATIONS /* Editor */ editor = glade_base_editor_new (glade_widget_get_object (widget), NULL, - _("Action"), type_action, - _("Toggle"), type_toggle_action, - _("Radio"), type_radio_action, - _("Recent"), type_recent_action, - NULL); + _("Action"), type_action, + _("Toggle"), type_toggle_action, + _("Radio"), type_radio_action, + _("Recent"), type_recent_action, + NULL); g_signal_connect (editor, "child-selected", G_CALLBACK (glade_gtk_action_child_selected), NULL); g_signal_connect (editor, "move-child", G_CALLBACK (glade_gtk_action_move_child), NULL); gtk_widget_show (GTK_WIDGET (editor)); - + window = glade_base_editor_pack_new_window (editor, _("Action Group Editor"), NULL); gtk_widget_show (window); } void glade_gtk_action_action_activate (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path) + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { diff --git a/plugins/gtk+/glade-gtk-action-widgets.h b/plugins/gtk+/glade-gtk-action-widgets.h index 33368859..82ac1d8b 100644 --- a/plugins/gtk+/glade-gtk-action-widgets.h +++ b/plugins/gtk+/glade-gtk-action-widgets.h @@ -34,16 +34,16 @@ G_BEGIN_DECLS #define GLADE_TAG_RESPONSE "response" void glade_gtk_action_widgets_ensure_names (GladeWidget *widget, - gchar *action_container); + gchar *action_container); -void glade_gtk_action_widgets_read_child (GladeWidget *widget, +void glade_gtk_action_widgets_read_child (GladeWidget *widget, GladeXmlNode *node, - gchar *action_container); + gchar *action_container); -void glade_gtk_action_widgets_write_child (GladeWidget *widget, +void glade_gtk_action_widgets_write_child (GladeWidget *widget, GladeXmlContext *context, - GladeXmlNode *node, - gchar *action_container); + GladeXmlNode *node, + gchar *action_container); G_END_DECLS #endif /* __GLADE_GTK_ACTION_WIDGETS_H__ */ diff --git a/plugins/gtk+/glade-gtk-action.c b/plugins/gtk+/glade-gtk-action.c index f510f50b..70ddbd9d 100644 --- a/plugins/gtk+/glade-gtk-action.c +++ b/plugins/gtk+/glade-gtk-action.c @@ -30,8 +30,9 @@ #include "glade-recent-action-editor.h" void -glade_gtk_action_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_action_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); @@ -47,12 +48,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS glade_widget_set_action_sensitive (gwidget, "launch_editor", FALSE); glade_widget_property_set_sensitive (gwidget, "accelerator", FALSE, - ACTION_ACCEL_INSENSITIVE_MSG); + ACTION_ACCEL_INSENSITIVE_MSG); } GladeEditable * -glade_gtk_action_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_action_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { GladeEditable *editable; G_GNUC_BEGIN_IGNORE_DEPRECATIONS @@ -64,9 +65,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS GType action_type = glade_widget_adaptor_get_object_type (adaptor); if (g_type_is_a (action_type, type_recent_action)) - editable = (GladeEditable *) glade_recent_action_editor_new (); + editable = (GladeEditable *) glade_recent_action_editor_new (); else - editable = (GladeEditable *) glade_action_editor_new (); + editable = (GladeEditable *) glade_action_editor_new (); } else editable = GWA_GET_CLASS (G_TYPE_OBJECT)->create_editable (adaptor, type); diff --git a/plugins/gtk+/glade-gtk-app-chooser-button.c b/plugins/gtk+/glade-gtk-app-chooser-button.c index 215fbe97..9155008e 100644 --- a/plugins/gtk+/glade-gtk-app-chooser-button.c +++ b/plugins/gtk+/glade-gtk-app-chooser-button.c @@ -29,8 +29,8 @@ void glade_gtk_app_chooser_button_post_create (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason) + GObject *object, + GladeCreateReason reason) { GladeWidget *gwidget; @@ -43,8 +43,8 @@ glade_gtk_app_chooser_button_post_create (GladeWidgetAdaptor *adaptor, } GladeEditable * -glade_gtk_app_chooser_button_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_app_chooser_button_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-app-chooser-widget.c b/plugins/gtk+/glade-gtk-app-chooser-widget.c index 8cf2dd9e..aaf3ac7f 100644 --- a/plugins/gtk+/glade-gtk-app-chooser-widget.c +++ b/plugins/gtk+/glade-gtk-app-chooser-widget.c @@ -28,8 +28,8 @@ #include "glade-app-chooser-widget-editor.h" GladeEditable * -glade_gtk_app_chooser_widget_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_app_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-assistant.c b/plugins/gtk+/glade-gtk-assistant.c index 30d2c6be..3c614c4f 100644 --- a/plugins/gtk+/glade-gtk-assistant.c +++ b/plugins/gtk+/glade-gtk-assistant.c @@ -26,9 +26,9 @@ #include <gladeui/glade.h> static void -glade_gtk_assistant_append_new_page (GladeWidget * parent, - GladeProject * project, - const gchar * label, +glade_gtk_assistant_append_new_page (GladeWidget *parent, + GladeProject *project, + const gchar *label, GtkAssistantPageType type) { static GladeWidgetAdaptor *adaptor = NULL; @@ -55,7 +55,7 @@ glade_gtk_assistant_append_new_page (GladeWidget * parent, update its navigation buttons! */ static void -glade_gtk_assistant_update_page_type (GtkAssistant * assistant) +glade_gtk_assistant_update_page_type (GtkAssistant *assistant) { gint i, current, pages; GtkWidget *page; @@ -92,7 +92,7 @@ glade_gtk_assistant_update_page_type (GtkAssistant * assistant) } static gint -glade_gtk_assistant_get_page (GtkAssistant * assistant, GtkWidget * page) +glade_gtk_assistant_get_page (GtkAssistant *assistant, GtkWidget *page) { gint i, pages = gtk_assistant_get_n_pages (assistant); @@ -104,7 +104,7 @@ glade_gtk_assistant_get_page (GtkAssistant * assistant, GtkWidget * page) } static void -glade_gtk_assistant_update_position (GtkAssistant * assistant) +glade_gtk_assistant_update_position (GtkAssistant *assistant) { gint i, pages = gtk_assistant_get_n_pages (assistant); @@ -118,7 +118,7 @@ glade_gtk_assistant_update_position (GtkAssistant * assistant) } static void -glade_gtk_assistant_parse_finished (GladeProject * project, GObject * object) +glade_gtk_assistant_parse_finished (GladeProject *project, GObject *object) { GtkAssistant *assistant = GTK_ASSISTANT (object); gint pages = gtk_assistant_get_n_pages (assistant); @@ -136,7 +136,7 @@ glade_gtk_assistant_parse_finished (GladeProject * project, GObject * object) GList * glade_gtk_assistant_get_children (GladeWidgetAdaptor *adaptor, - GObject *container) + GObject *container) { GtkAssistant *assist = GTK_ASSISTANT (container); gint i, n_pages = gtk_assistant_get_n_pages (assist); @@ -158,7 +158,7 @@ glade_gtk_assistant_get_children (GladeWidgetAdaptor *adaptor, static void on_assistant_project_selection_changed (GladeProject *project, - GladeWidget *gassist) + GladeWidget *gassist) { GList *selection = glade_project_selection_get (project); @@ -172,13 +172,14 @@ on_assistant_project_selection_changed (GladeProject *project, if (glade_widget_get_parent (selected) == gassist && glade_widget_property_get (selected, "position", &pos, NULL)) - gtk_assistant_set_current_page (assist, pos); + gtk_assistant_set_current_page (assist, pos); } } void -glade_gtk_assistant_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_assistant_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *parent = glade_widget_get_from_gobject (object); GladeProject *project = glade_widget_get_project (parent); @@ -210,8 +211,8 @@ glade_gtk_assistant_post_create (GladeWidgetAdaptor * adaptor, if (project) g_signal_connect (project, "selection-changed", - G_CALLBACK (on_assistant_project_selection_changed), - parent); + G_CALLBACK (on_assistant_project_selection_changed), + parent); } void @@ -232,16 +233,17 @@ assistant_remove_child (GtkAssistant *assistant, GtkWidget *child) for (i = 0; i < n; i++) { if (child == gtk_assistant_get_nth_page (assistant, i)) - { - gtk_assistant_remove_page (assistant, i); - return; - } + { + gtk_assistant_remove_page (assistant, i); + return; + } } } void -glade_gtk_assistant_remove_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_assistant_remove_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { GladeWidget *gassistant = glade_widget_get_from_gobject (container); GtkAssistant *assistant = GTK_ASSISTANT (container); @@ -253,9 +255,10 @@ glade_gtk_assistant_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_assistant_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_object) +glade_gtk_assistant_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_object) { GtkAssistant *assistant = GTK_ASSISTANT (container); GtkWidget *page = GTK_WIDGET (new_object), *old_page = GTK_WIDGET (current); @@ -272,10 +275,10 @@ glade_gtk_assistant_replace_child (GladeWidgetAdaptor * adaptor, } gboolean -glade_gtk_assistant_verify_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_assistant_verify_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "n-pages") == 0) return g_value_get_int (value) >= @@ -291,10 +294,10 @@ glade_gtk_assistant_verify_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_assistant_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_assistant_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "n-pages") == 0) { @@ -303,10 +306,9 @@ glade_gtk_assistant_set_property (GladeWidgetAdaptor * adaptor, for (i = gtk_assistant_get_n_pages (GTK_ASSISTANT (object)), size = g_value_get_int (value); i < size; i++) - { - g_message ("aaaa %d %d", i,size); - gtk_assistant_append_page (assistant, glade_placeholder_new ()); - } + { + gtk_assistant_append_page (assistant, glade_placeholder_new ()); + } glade_gtk_assistant_update_page_type (assistant); @@ -319,9 +321,10 @@ glade_gtk_assistant_set_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_assistant_get_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, GValue * value) +glade_gtk_assistant_get_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + GValue *value) { if (strcmp (property_name, "n-pages") == 0) { @@ -336,11 +339,11 @@ glade_gtk_assistant_get_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_assistant_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - const GValue * value) +glade_gtk_assistant_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "position") == 0) { @@ -379,11 +382,11 @@ glade_gtk_assistant_set_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_assistant_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_assistant_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { if (strcmp (property_name, "position") == 0) { diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c index 01758f14..2a6ea644 100644 --- a/plugins/gtk+/glade-gtk-box.c +++ b/plugins/gtk+/glade-gtk-box.c @@ -31,24 +31,24 @@ #include "glade-box-editor.h" #include "glade-gtk.h" -static gboolean glade_gtk_box_configure_child (GladeFixed * fixed, - GladeWidget * child, - GdkRectangle * rect, - GtkWidget * box); +static gboolean glade_gtk_box_configure_child (GladeFixed *fixed, + GladeWidget *child, + GdkRectangle *rect, + GtkWidget *box); -static gboolean glade_gtk_box_configure_begin (GladeFixed * fixed, - GladeWidget * child, - GtkWidget * box); +static gboolean glade_gtk_box_configure_begin (GladeFixed *fixed, + GladeWidget *child, + GtkWidget *box); -static gboolean glade_gtk_box_configure_end (GladeFixed * fixed, - GladeWidget * child, - GtkWidget * box); +static gboolean glade_gtk_box_configure_end (GladeFixed *fixed, + GladeWidget *child, + GtkWidget *box); GladeEditable * -glade_gtk_box_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_box_editor_new (); @@ -57,7 +57,7 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_box_parse_finished (GladeProject * project, GladeWidget *gbox) +glade_gtk_box_parse_finished (GladeProject *project, GladeWidget *gbox) { GObject *box = glade_widget_get_object (gbox); @@ -66,8 +66,9 @@ glade_gtk_box_parse_finished (GladeProject * project, GladeWidget *gbox) } void -glade_gtk_box_post_create (GladeWidgetAdaptor * adaptor, - GObject * container, GladeCreateReason reason) +glade_gtk_box_post_create (GladeWidgetAdaptor *adaptor, + GObject *container, + GladeCreateReason reason) { GladeWidget *gwidget = glade_widget_get_from_gobject (container); GladeProject *project = glade_widget_get_project (gwidget); @@ -94,7 +95,7 @@ glade_gtk_box_post_create (GladeWidgetAdaptor * adaptor, } static gint -sort_box_children (GtkWidget * widget_a, GtkWidget * widget_b, GtkWidget *box) +sort_box_children (GtkWidget *widget_a, GtkWidget *widget_b, GtkWidget *box) { GladeWidget *gwidget_a, *gwidget_b; gint position_a, position_b; @@ -135,8 +136,7 @@ sort_box_children (GtkWidget * widget_a, GtkWidget * widget_b, GtkWidget *box) } GList * -glade_gtk_box_get_children (GladeWidgetAdaptor * adaptor, - GObject * container) +glade_gtk_box_get_children (GladeWidgetAdaptor *adaptor, GObject *container) { GList *children; @@ -146,10 +146,11 @@ glade_gtk_box_get_children (GladeWidgetAdaptor * adaptor, } void -glade_gtk_box_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, GValue * value) +glade_gtk_box_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { GladeWidget *gbox, *gchild, *gchild_iter; GList *children, *list; @@ -259,8 +260,10 @@ glade_gtk_box_get_num_children (GObject *box) } void -glade_gtk_box_get_property (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * id, GValue * value) +glade_gtk_box_get_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + GValue *value) { if (!strcmp (id, "use-center-child")) { @@ -278,7 +281,7 @@ glade_gtk_box_get_property (GladeWidgetAdaptor * adaptor, } static gint -glade_gtk_box_get_first_blank (GtkBox * box) +glade_gtk_box_get_first_blank (GtkBox *box) { GList *child, *children; GladeWidget *gwidget; @@ -300,9 +303,9 @@ glade_gtk_box_get_first_blank (GtkBox * box) GladeProperty *property = glade_widget_get_pack_property (gwidget, "position"); - /* property can be NULL here when project is closing */ - if (property) - gwidget_position = g_value_get_int (glade_property_inline_value (property)); + /* property can be NULL here when project is closing */ + if (property) + gwidget_position = g_value_get_int (glade_property_inline_value (property)); if (gwidget_position > position) break; @@ -315,7 +318,7 @@ glade_gtk_box_get_first_blank (GtkBox * box) } static void -glade_gtk_box_set_size (GObject * object, const GValue * value) +glade_gtk_box_set_size (GObject *object, const GValue *value) { GtkBox *box; GList *child, *children; @@ -375,9 +378,10 @@ glade_gtk_box_set_size (GObject * object, const GValue * value) } void -glade_gtk_box_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_box_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "use-center-child")) { @@ -431,9 +435,10 @@ glade_gtk_box_verify_size (GObject *object, const GValue *value) gboolean -glade_gtk_box_verify_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_box_verify_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "size")) return glade_gtk_box_verify_size (object, value); @@ -446,7 +451,7 @@ glade_gtk_box_verify_property (GladeWidgetAdaptor * adaptor, static void -fix_response_id_on_child (GladeWidget * gbox, GObject * child, gboolean add) +fix_response_id_on_child (GladeWidget *gbox, GObject *child, gboolean add) { GladeWidget *gchild; const gchar *internal_name; @@ -458,17 +463,18 @@ fix_response_id_on_child (GladeWidget * gbox, GObject * child, gboolean add) { if (add && (internal_name = glade_widget_get_internal (gbox)) && !strcmp (internal_name, "action_area")) - glade_widget_property_set_sensitive (gchild, "response-id", TRUE, - NULL); + glade_widget_property_set_sensitive (gchild, "response-id", TRUE, + NULL); else - glade_widget_property_set_sensitive (gchild, "response-id", FALSE, - RESPID_INSENSITIVE_MSG); + glade_widget_property_set_sensitive (gchild, "response-id", FALSE, + RESPID_INSENSITIVE_MSG); } } void -glade_gtk_box_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_box_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GladeWidget *gbox, *gchild; gint num_children; @@ -532,8 +538,9 @@ glade_gtk_box_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_box_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_box_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GladeWidget *gbox; gint size; @@ -568,9 +575,10 @@ glade_gtk_box_remove_child (GladeWidgetAdaptor * adaptor, void -glade_gtk_box_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_widget) +glade_gtk_box_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_widget) { GladeWidget *gchild; GladeWidget *gbox; @@ -647,9 +655,10 @@ typedef struct static GList *glade_gtk_box_original_positions = NULL; static gboolean -glade_gtk_box_configure_child (GladeFixed * fixed, - GladeWidget * child, - GdkRectangle * rect, GtkWidget * box) +glade_gtk_box_configure_child (GladeFixed *fixed, + GladeWidget *child, + GdkRectangle *rect, + GtkWidget *box) { GList *list, *children; GtkWidget *bchild; @@ -749,8 +758,9 @@ glade_gtk_box_configure_child (GladeFixed * fixed, } static gboolean -glade_gtk_box_configure_begin (GladeFixed * fixed, - GladeWidget * child, GtkWidget * box) +glade_gtk_box_configure_begin (GladeFixed *fixed, + GladeWidget *child, + GtkWidget *box) { GList *list, *children; GtkWidget *bchild; diff --git a/plugins/gtk+/glade-gtk-button.c b/plugins/gtk+/glade-gtk-button.c index ae6918fb..3d846dfe 100644 --- a/plugins/gtk+/glade-gtk-button.c +++ b/plugins/gtk+/glade-gtk-button.c @@ -38,8 +38,8 @@ * glade property through the glade-command api. */ static void -glade_gtk_font_button_refresh_font_name (GtkFontButton * button, - GladeWidget * gbutton) +glade_gtk_font_button_refresh_font_name (GtkFontButton *button, + GladeWidget *gbutton) { GladeProperty *property; @@ -51,8 +51,8 @@ glade_gtk_font_button_refresh_font_name (GtkFontButton * button, /* ----------------------------- GtkColorButton ------------------------------ */ static void -glade_gtk_color_button_refresh_color (GtkColorButton * button, - GladeWidget * gbutton) +glade_gtk_color_button_refresh_color (GtkColorButton *button, + GladeWidget *gbutton) { GladeProperty *property; GdkRGBA rgba = { 0, }; @@ -62,28 +62,29 @@ glade_gtk_color_button_refresh_color (GtkColorButton * button, if ((property = glade_widget_get_property (gbutton, "color")) != NULL) { if (glade_property_get_enabled (property)) - { - GdkColor color = { 0, }; + { + GdkColor color = { 0, }; - color.red = (gint16) (rgba.red * 65535); - color.green = (gint16) (rgba.green * 65535); - color.blue = (gint16) (rgba.blue * 65535); + color.red = (gint16) (rgba.red * 65535); + color.green = (gint16) (rgba.green * 65535); + color.blue = (gint16) (rgba.blue * 65535); - glade_command_set_property (property, &color); - } + glade_command_set_property (property, &color); + } } if ((property = glade_widget_get_property (gbutton, "rgba")) != NULL) { if (glade_property_get_enabled (property)) - glade_command_set_property (property, &rgba); + glade_command_set_property (property, &rgba); } } void -glade_gtk_color_button_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_color_button_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeProperty *property; GladeWidget *gwidget = glade_widget_get_from_gobject (object); @@ -91,25 +92,25 @@ glade_gtk_color_button_set_property (GladeWidgetAdaptor * adaptor, if (!strcmp (id, "color")) { if ((property = glade_widget_get_property (gwidget, "color")) != NULL && - glade_property_get_enabled (property) && g_value_get_boxed (value)) - { - GdkColor *color = g_value_get_boxed (value); - GdkRGBA copy; - - copy.red = color->red / 65535.0; - copy.green = color->green / 65535.0; - copy.blue = color->blue / 65535.0; - copy.alpha = 1.0; - - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (object), ©); - } + glade_property_get_enabled (property) && g_value_get_boxed (value)) + { + GdkColor *color = g_value_get_boxed (value); + GdkRGBA copy; + + copy.red = color->red / 65535.0; + copy.green = color->green / 65535.0; + copy.blue = color->blue / 65535.0; + copy.alpha = 1.0; + + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (object), ©); + } } else if (!strcmp (id, "rgba")) { if ((property = glade_widget_get_property (gwidget, "rgba")) != NULL && - glade_property_get_enabled (property) && g_value_get_boxed (value)) - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (object), - (GdkRGBA *) g_value_get_boxed (value)); + glade_property_get_enabled (property) && g_value_get_boxed (value)) + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (object), + (GdkRGBA *) g_value_get_boxed (value)); } else GWA_GET_CLASS (GTK_TYPE_BUTTON)->set_property (adaptor, object, id, value); @@ -117,7 +118,7 @@ glade_gtk_color_button_set_property (GladeWidgetAdaptor * adaptor, /* ----------------------------- GtkButton ------------------------------ */ GladeEditable * -glade_gtk_button_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_button_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) @@ -125,11 +126,11 @@ glade_gtk_button_create_editable (GladeWidgetAdaptor * adaptor, GType type = glade_widget_adaptor_get_object_type (adaptor); if (g_type_is_a (type, GTK_TYPE_FONT_BUTTON)) - return (GladeEditable *) glade_font_button_editor_new (); + return (GladeEditable *) glade_font_button_editor_new (); else if (g_type_is_a (type, GTK_TYPE_SCALE_BUTTON)) - return (GladeEditable *) glade_scale_button_editor_new (); + return (GladeEditable *) glade_scale_button_editor_new (); else if (!g_type_is_a (type, GTK_TYPE_LOCK_BUTTON)) - return (GladeEditable *) glade_button_editor_new (); + return (GladeEditable *) glade_button_editor_new (); } return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type); @@ -151,8 +152,9 @@ glade_gtk_button_update_stock (GladeWidget *widget) } void -glade_gtk_button_post_create (GladeWidgetAdaptor * adaptor, - GObject * button, GladeCreateReason reason) +glade_gtk_button_post_create (GladeWidgetAdaptor *adaptor, + GObject *button, + GladeCreateReason reason) { GladeWidget *gbutton = glade_widget_get_from_gobject (button); @@ -192,9 +194,10 @@ glade_gtk_lock_button_is_own_property (GladeProperty *property) } void -glade_gtk_button_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_button_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); @@ -246,13 +249,14 @@ glade_gtk_button_set_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_button_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_button_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GObject *object; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -269,17 +273,18 @@ glade_gtk_button_read_widget (GladeWidgetAdaptor * adaptor, glade_widget_property_get (widget, "font-name", &font_prop_value); if (font_prop_value != NULL) - { - glade_widget_property_set (widget, "font", font_prop_value); - glade_widget_property_set (widget, "font-name", NULL); - } + { + glade_widget_property_set (widget, "font", font_prop_value); + glade_widget_property_set (widget, "font-name", NULL); + } } } void -glade_gtk_button_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_button_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *prop; gboolean use_stock; @@ -287,7 +292,7 @@ glade_gtk_button_write_widget (GladeWidgetAdaptor * adaptor, GObject *object; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; object = glade_widget_get_object (widget); @@ -321,9 +326,9 @@ glade_gtk_button_write_widget (GladeWidgetAdaptor * adaptor, } GladeEditorProperty * -glade_gtk_button_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - gboolean use_command) +glade_gtk_button_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; diff --git a/plugins/gtk+/glade-gtk-cell-layout.h b/plugins/gtk+/glade-gtk-cell-layout.h index fee6dcac..4e06ce02 100644 --- a/plugins/gtk+/glade-gtk-cell-layout.h +++ b/plugins/gtk+/glade-gtk-cell-layout.h @@ -26,21 +26,21 @@ G_BEGIN_DECLS -gboolean glade_gtk_cell_layout_sync_attributes (GObject * layout); +gboolean glade_gtk_cell_layout_sync_attributes (GObject *layout); /* Base editor handlers */ -gchar *glade_gtk_cell_layout_get_display_name (GladeBaseEditor * editor, - GladeWidget * gchild, - gpointer user_data); -void glade_gtk_cell_layout_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, - gpointer data); -gboolean glade_gtk_cell_layout_move_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GladeWidget * gchild, - gpointer data); -GList *glade_gtk_cell_layout_get_children (GladeWidgetAdaptor * adaptor, - GObject * container); +gchar *glade_gtk_cell_layout_get_display_name (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer user_data); +void glade_gtk_cell_layout_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data); +gboolean glade_gtk_cell_layout_move_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data); +GList *glade_gtk_cell_layout_get_children (GladeWidgetAdaptor *adaptor, + GObject *container); G_END_DECLS diff --git a/plugins/gtk+/glade-gtk-cell-renderer.c b/plugins/gtk+/glade-gtk-cell-renderer.c index 7eab9d4a..38fcb7d0 100644 --- a/plugins/gtk+/glade-gtk-cell-renderer.c +++ b/plugins/gtk+/glade-gtk-cell-renderer.c @@ -32,9 +32,9 @@ #include "glade-column-types.h" void -glade_gtk_cell_renderer_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * action_path) +glade_gtk_cell_renderer_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { @@ -42,7 +42,7 @@ glade_gtk_cell_renderer_action_activate (GladeWidgetAdaptor * adaptor, while ((w = glade_widget_get_parent (w))) { - GObject *object = glade_widget_get_object (w); + GObject *object = glade_widget_get_object (w); if (GTK_IS_TREE_VIEW (object)) { @@ -56,9 +56,9 @@ glade_gtk_cell_renderer_action_activate (GladeWidgetAdaptor * adaptor, } void -glade_gtk_cell_renderer_deep_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, - GladeCreateReason reason) +glade_gtk_cell_renderer_deep_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladePropertyClass *pclass; GladeProperty *property; @@ -82,9 +82,9 @@ glade_gtk_cell_renderer_deep_post_create (GladeWidgetAdaptor * adaptor, } GladeEditorProperty * -glade_gtk_cell_renderer_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - gboolean use_command) +glade_gtk_cell_renderer_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; @@ -100,7 +100,7 @@ glade_gtk_cell_renderer_create_eprop (GladeWidgetAdaptor * adaptor, GladeEditable * -glade_gtk_cell_renderer_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_cell_renderer_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; @@ -116,9 +116,9 @@ glade_gtk_cell_renderer_create_editable (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_cell_renderer_set_use_attribute (GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_cell_renderer_set_use_attribute (GObject *object, + const gchar *property_name, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); gchar *attr_prop_name, *prop_msg, *attr_msg; @@ -150,8 +150,8 @@ glade_gtk_cell_renderer_set_use_attribute (GObject * object, } static GladeProperty * -glade_gtk_cell_renderer_attribute_switch (GladeWidget * gwidget, - const gchar * property_name) +glade_gtk_cell_renderer_attribute_switch (GladeWidget *gwidget, + const gchar *property_name) { GladeProperty *property; gchar *use_attr_name = g_strdup_printf ("use-attr-%s", property_name); @@ -163,8 +163,8 @@ glade_gtk_cell_renderer_attribute_switch (GladeWidget * gwidget, } static gboolean -glade_gtk_cell_renderer_property_enabled (GObject * object, - const gchar * property_name) +glade_gtk_cell_renderer_property_enabled (GObject *object, + const gchar *property_name) { GladeProperty *property; GladeWidget *gwidget = glade_widget_get_from_gobject (object); @@ -180,10 +180,10 @@ glade_gtk_cell_renderer_property_enabled (GObject * object, void -glade_gtk_cell_renderer_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_cell_renderer_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { static gint use_attr_len = 0; static gint attr_len = 0; @@ -207,9 +207,9 @@ glade_gtk_cell_renderer_set_property (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_cell_renderer_write_properties (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_cell_renderer_write_properties (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *property, *prop; GladePropertyClass *pclass; @@ -237,13 +237,13 @@ glade_gtk_cell_renderer_write_properties (GladeWidget * widget, prop = glade_widget_get_property (widget, attr_name); if (!use_attr && prop) - { - /* Special case to write GtkCellRendererPixbuf:stock-size */ - if (strcmp (attr_name, "stock-size") == 0) - glade_gtk_write_icon_size (widget, context, node, "stock-size"); - else - glade_property_write (prop, context, node); - } + { + /* Special case to write GtkCellRendererPixbuf:stock-size */ + if (strcmp (attr_name, "stock-size") == 0) + glade_gtk_write_icon_size (widget, context, node, "stock-size"); + else + glade_property_write (prop, context, node); + } g_free (use_attr_str); } @@ -251,13 +251,13 @@ glade_gtk_cell_renderer_write_properties (GladeWidget * widget, } void -glade_gtk_cell_renderer_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_cell_renderer_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* Write our normal properties, then chain up to write any other normal properties, @@ -269,8 +269,8 @@ glade_gtk_cell_renderer_write_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_cell_renderer_parse_finished (GladeProject * project, - GladeWidget * widget) +glade_gtk_cell_renderer_parse_finished (GladeProject *project, + GladeWidget *widget) { GladeProperty *property; GList *l; @@ -310,11 +310,12 @@ glade_gtk_cell_renderer_parse_finished (GladeProject * project, } void -glade_gtk_cell_renderer_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_cell_renderer_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the properties... */ @@ -326,8 +327,8 @@ glade_gtk_cell_renderer_read_widget (GladeWidgetAdaptor * adaptor, } static gboolean -glade_gtk_cell_layout_has_renderer (GtkCellLayout * layout, - GtkCellRenderer * renderer) +glade_gtk_cell_layout_has_renderer (GtkCellLayout *layout, + GtkCellRenderer *renderer) { GList *cells = gtk_cell_layout_get_cells (layout); gboolean has_renderer; @@ -340,7 +341,7 @@ glade_gtk_cell_layout_has_renderer (GtkCellLayout * layout, } gboolean -glade_gtk_cell_renderer_sync_attributes (GObject * object) +glade_gtk_cell_renderer_sync_attributes (GObject *object) { GtkCellLayout *layout; @@ -398,7 +399,7 @@ glade_gtk_cell_renderer_sync_attributes (GObject * object) GladeColumnType *column_type = (GladeColumnType *) g_list_nth_data (column_list, column); GType column_gtype = g_type_from_name (column_type->type_name); - GParamSpec *pspec = glade_property_class_get_pspec (pclass); + GParamSpec *pspec = glade_property_class_get_pspec (pclass); if (column_gtype && g_value_type_transformable (column_gtype, pspec->value_type)) diff --git a/plugins/gtk+/glade-gtk-combo-box-text.c b/plugins/gtk+/glade-gtk-combo-box-text.c index 562dc96f..d1aed871 100644 --- a/plugins/gtk+/glade-gtk-combo-box-text.c +++ b/plugins/gtk+/glade-gtk-combo-box-text.c @@ -32,8 +32,8 @@ #define GLADE_TAG_ITEM "item" GladeEditable * -glade_gtk_combo_box_text_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_combo_box_text_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -45,8 +45,8 @@ glade_gtk_combo_box_text_create_editable (GladeWidgetAdaptor * adaptor, void glade_gtk_combo_box_text_post_create (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason) + GObject *object, + GladeCreateReason reason) { GladeWidget *gwidget; @@ -59,9 +59,9 @@ glade_gtk_combo_box_text_post_create (GladeWidgetAdaptor *adaptor, } GladeEditorProperty * -glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - gboolean use_command) +glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -80,9 +80,9 @@ glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GParamSpec *pspec; @@ -100,9 +100,10 @@ glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor * adaptor, } void -glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "glade-items")) { @@ -118,21 +119,21 @@ glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor * adaptor, gtk_combo_box_text_remove_all (GTK_COMBO_BOX_TEXT (object)); for (l = string_list; l; l = l->next) - { - string = l->data; + { + string = l->data; - gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (object), string->id, string->string); - } + gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (object), string->id, string->string); + } gtk_combo_box_set_active (GTK_COMBO_BOX (object), - CLAMP (active, 0, g_list_length (string_list) - 1)); + CLAMP (active, 0, g_list_length (string_list) - 1)); } else GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->set_property (adaptor, object, id, value); } static void -glade_gtk_combo_box_text_read_items (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_combo_box_text_read_items (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *items_node; GladeXmlNode *item_node; @@ -143,32 +144,32 @@ glade_gtk_combo_box_text_read_items (GladeWidget * widget, GladeXmlNode * node) { for (item_node = glade_xml_node_get_children (items_node); - item_node; item_node = glade_xml_node_next (item_node)) - { - gchar *str, *comment, *context; - gchar *id; - gboolean translatable; + item_node; item_node = glade_xml_node_next (item_node)) + { + gchar *str, *comment, *context; + gchar *id; + gboolean translatable; - if (!glade_xml_node_verify (item_node, GLADE_TAG_ITEM)) - continue; + if (!glade_xml_node_verify (item_node, GLADE_TAG_ITEM)) + continue; if ((str = glade_xml_get_content (item_node)) == NULL) - continue; + continue; - id = glade_xml_get_property_string (item_node, GLADE_TAG_ID); - context = glade_xml_get_property_string (item_node, GLADE_TAG_CONTEXT); - comment = glade_xml_get_property_string (item_node, GLADE_TAG_COMMENT); + id = glade_xml_get_property_string (item_node, GLADE_TAG_ID); + context = glade_xml_get_property_string (item_node, GLADE_TAG_CONTEXT); + comment = glade_xml_get_property_string (item_node, GLADE_TAG_COMMENT); translatable = glade_xml_get_property_boolean (item_node, GLADE_TAG_TRANSLATABLE, FALSE); - string_list = - glade_string_list_append (string_list, - str, comment, context, translatable, id); + string_list = + glade_string_list_append (string_list, + str, comment, context, translatable, id); - g_free (str); - g_free (context); - g_free (comment); - g_free (id); - } + g_free (str); + g_free (context); + g_free (comment); + g_free (id); + } glade_widget_property_set (widget, "glade-items", string_list); glade_string_list_free (string_list); @@ -176,11 +177,12 @@ glade_gtk_combo_box_text_read_items (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -190,9 +192,9 @@ glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_combo_box_text_write_items (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_combo_box_text_write_items (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *item_node; GList *string_list = NULL, *l; @@ -233,14 +235,15 @@ glade_gtk_combo_box_text_write_items (GladeWidget * widget, } void -glade_gtk_combo_box_text_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_combo_box_text_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *attrs_node; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ diff --git a/plugins/gtk+/glade-gtk-combo-box.c b/plugins/gtk+/glade-gtk-combo-box.c index fc931187..7006be16 100644 --- a/plugins/gtk+/glade-gtk-combo-box.c +++ b/plugins/gtk+/glade-gtk-combo-box.c @@ -31,8 +31,8 @@ #define NO_ENTRY_MSG _("This combo box is not configured to have an entry") GladeEditable * -glade_gtk_combo_box_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_combo_box_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -44,8 +44,8 @@ glade_gtk_combo_box_create_editable (GladeWidgetAdaptor * adaptor, void glade_gtk_combo_box_post_create (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason) + GObject *object, + GladeCreateReason reason) { GladeWidget *widget; @@ -66,9 +66,10 @@ glade_gtk_combo_box_post_create (GladeWidgetAdaptor *adaptor, } void -glade_gtk_combo_box_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_combo_box_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "entry-text-column")) { @@ -88,10 +89,10 @@ glade_gtk_combo_box_set_property (GladeWidgetAdaptor * adaptor, GladeWidget *widget = glade_widget_get_from_gobject (object); if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (widget, "tearoff-title", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "tearoff-title", TRUE, NULL); else - glade_widget_property_set_sensitive (widget, "tearoff-title", FALSE, - _("Tearoff menus are disabled")); + glade_widget_property_set_sensitive (widget, "tearoff-title", FALSE, + _("Tearoff menus are disabled")); } else GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, @@ -99,8 +100,8 @@ glade_gtk_combo_box_set_property (GladeWidgetAdaptor * adaptor, } GList * -glade_gtk_combo_box_get_children (GladeWidgetAdaptor * adaptor, - GtkComboBox * combo) +glade_gtk_combo_box_get_children (GladeWidgetAdaptor *adaptor, + GtkComboBox *combo) { GList *list = NULL; diff --git a/plugins/gtk+/glade-gtk-container.c b/plugins/gtk+/glade-gtk-container.c index 753eca69..50d600ca 100644 --- a/plugins/gtk+/glade-gtk-container.c +++ b/plugins/gtk+/glade-gtk-container.c @@ -26,8 +26,9 @@ #include <string.h> void -glade_gtk_container_post_create (GladeWidgetAdaptor * adaptor, - GObject * container, GladeCreateReason reason) +glade_gtk_container_post_create (GladeWidgetAdaptor *adaptor, + GObject *container, + GladeCreateReason reason) { GList *children; g_return_if_fail (GTK_IS_CONTAINER (container)); @@ -44,50 +45,50 @@ glade_gtk_container_post_create (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_container_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { GladeWidget *gwidget = glade_widget_get_from_gobject (container); if (GTK_IS_WINDOW (child)) { if (user_feedback) - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Cannot add a toplevel window to a container.")); + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + _("Cannot add a toplevel window to a container.")); return FALSE; } else if (GTK_IS_POPOVER (child)) { if (user_feedback) - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Cannot add a popover to a container.")); + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + _("Cannot add a popover to a container.")); return FALSE; } else if (!GTK_IS_WIDGET (child) || - GTK_IS_TOOL_ITEM (child) || - GTK_IS_MENU_ITEM (child)) + GTK_IS_TOOL_ITEM (child) || + GTK_IS_MENU_ITEM (child)) { if (user_feedback) - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Widgets of type %s can only have widgets as children."), - glade_widget_adaptor_get_title (adaptor)); + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + _("Widgets of type %s can only have widgets as children."), + glade_widget_adaptor_get_title (adaptor)); return FALSE; } else if (GWA_USE_PLACEHOLDERS (adaptor) && - glade_util_count_placeholders (gwidget) == 0) + glade_util_count_placeholders (gwidget) == 0) { if (user_feedback) - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Widgets of type %s need placeholders to add children."), - glade_widget_adaptor_get_title (adaptor)); + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + _("Widgets of type %s need placeholders to add children."), + glade_widget_adaptor_get_title (adaptor)); return FALSE; } @@ -96,9 +97,10 @@ glade_gtk_container_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_container_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_container_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { GParamSpec **param_spec; GladePropertyClass *pclass; @@ -152,8 +154,9 @@ glade_gtk_container_replace_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_container_add_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, GtkWidget * child) +glade_gtk_container_add_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *child) { GtkWidget *container_child = NULL; @@ -170,8 +173,9 @@ glade_gtk_container_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_container_remove_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, GtkWidget * child) +glade_gtk_container_remove_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *child) { GList *children; gtk_container_remove (GTK_CONTAINER (container), child); @@ -188,11 +192,11 @@ glade_gtk_container_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_container_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - const GValue * value) +glade_gtk_container_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value) { if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container)) gtk_container_child_set_property (GTK_CONTAINER (container), @@ -200,11 +204,11 @@ glade_gtk_container_set_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_container_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_container_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container)) gtk_container_child_get_property (GTK_CONTAINER (container), @@ -213,7 +217,7 @@ glade_gtk_container_get_child_property (GladeWidgetAdaptor * adaptor, GList * glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor, - GObject *container) + GObject *container) { GList *parent_children, *children; @@ -230,7 +234,7 @@ glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor, /* This is used in the XML for some derived classes */ GladeEditable * -glade_gtk_container_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_container_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type); diff --git a/plugins/gtk+/glade-gtk-entry.c b/plugins/gtk+/glade-gtk-entry.c index cd8acfd8..94098739 100644 --- a/plugins/gtk+/glade-gtk-entry.c +++ b/plugins/gtk+/glade-gtk-entry.c @@ -29,7 +29,7 @@ #include "glade-gtk.h" static void -glade_gtk_entry_changed (GtkEditable * editable, GladeWidget * gentry) +glade_gtk_entry_changed (GtkEditable *editable, GladeWidget *gentry) { const gchar *text, *text_prop; GladeProperty *prop; @@ -51,8 +51,9 @@ glade_gtk_entry_changed (GtkEditable * editable, GladeWidget * gentry) } void -glade_gtk_entry_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_entry_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *gentry; @@ -65,7 +66,7 @@ glade_gtk_entry_post_create (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_entry_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_entry_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) @@ -75,9 +76,10 @@ glade_gtk_entry_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_entry_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_entry_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeImageEditMode mode; GladeWidget *gwidget = glade_widget_get_from_gobject (object); @@ -121,8 +123,8 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor * adaptor, TRUE, NULL); break; case GLADE_IMAGE_MODE_RESOURCE: - /* Doesnt apply for entry icons */ - break; + /* Doesnt apply for entry icons */ + break; } } else if (!strcmp (id, "secondary-icon-mode")) @@ -153,8 +155,8 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor * adaptor, NULL); break; case GLADE_IMAGE_MODE_RESOURCE: - /* Doesnt apply for entry icons */ - break; + /* Doesnt apply for entry icons */ + break; } } else if (!strcmp (id, "primary-icon-tooltip-text") || @@ -189,22 +191,22 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor * adaptor, else if (!strcmp (id, "has-frame")) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (gwidget, "shadow-type", TRUE, NULL); + glade_widget_property_set_sensitive (gwidget, "shadow-type", TRUE, NULL); else - glade_widget_property_set_sensitive (gwidget, "shadow-type", FALSE, - _("This property is only available\n" - "if the entry has a frame")); + glade_widget_property_set_sensitive (gwidget, "shadow-type", FALSE, + _("This property is only available\n" + "if the entry has a frame")); GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value); } else if (!strcmp (id, "visibility")) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (gwidget, "invisible-char", FALSE, - _("This property is only available\n" - "if the entry characters are invisible")); + glade_widget_property_set_sensitive (gwidget, "invisible-char", FALSE, + _("This property is only available\n" + "if the entry characters are invisible")); else - glade_widget_property_set_sensitive (gwidget, "invisible-char", TRUE, NULL); + glade_widget_property_set_sensitive (gwidget, "invisible-char", TRUE, NULL); GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value); } @@ -214,13 +216,14 @@ glade_gtk_entry_set_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_entry_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_entry_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GladeProperty *property; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -238,7 +241,7 @@ glade_gtk_entry_read_widget (GladeWidgetAdaptor * adaptor, gint target_minor, target_major; glade_project_get_target_version (glade_widget_get_project (widget), "gtk+", - &target_major, &target_minor); + &target_major, &target_minor); property = glade_widget_get_property (widget, "buffer"); diff --git a/plugins/gtk+/glade-gtk-expander.c b/plugins/gtk+/glade-gtk-expander.c index aaef8f98..b1cfb89d 100644 --- a/plugins/gtk+/glade-gtk-expander.c +++ b/plugins/gtk+/glade-gtk-expander.c @@ -27,8 +27,9 @@ #include "glade-gtk-frame.h" void -glade_gtk_expander_post_create (GladeWidgetAdaptor * adaptor, - GObject * expander, GladeCreateReason reason) +glade_gtk_expander_post_create (GladeWidgetAdaptor *adaptor, + GObject *expander, + GladeCreateReason reason) { static GladeWidgetAdaptor *wadaptor = NULL; GladeWidget *gexpander, *glabel; @@ -67,9 +68,10 @@ glade_gtk_expander_post_create (GladeWidgetAdaptor * adaptor, } void -glade_gtk_expander_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_expander_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { gchar *special_child_type; @@ -94,8 +96,9 @@ glade_gtk_expander_replace_child (GladeWidgetAdaptor * adaptor, void -glade_gtk_expander_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_expander_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gchar *special_child_type; @@ -116,8 +119,9 @@ glade_gtk_expander_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_expander_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_expander_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gchar *special_child_type; @@ -135,14 +139,15 @@ glade_gtk_expander_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_expander_write_child (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_expander_write_child (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node, - GWA_GET_CLASS (GTK_TYPE_CONTAINER)-> - write_child)) + GWA_GET_CLASS (GTK_TYPE_CONTAINER)-> + write_child)) /* Chain Up */ GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node); diff --git a/plugins/gtk+/glade-gtk-file-chooser-widget.c b/plugins/gtk+/glade-gtk-file-chooser-widget.c index 0811f07e..01ce9fde 100644 --- a/plugins/gtk+/glade-gtk-file-chooser-widget.c +++ b/plugins/gtk+/glade-gtk-file-chooser-widget.c @@ -30,9 +30,9 @@ #include "glade-file-chooser-button-editor.h" void -glade_gtk_file_chooser_widget_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, - GladeCreateReason reason) +glade_gtk_file_chooser_widget_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { gtk_container_forall (GTK_CONTAINER (object), glade_gtk_file_chooser_default_forall, NULL); @@ -40,7 +40,7 @@ glade_gtk_file_chooser_widget_post_create (GladeWidgetAdaptor * adaptor, GladeEditable * glade_gtk_file_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type) + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_file_chooser_widget_editor_new (); @@ -50,10 +50,10 @@ glade_gtk_file_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor, void -glade_gtk_file_chooser_button_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, - const GValue * value) +glade_gtk_file_chooser_button_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { /* Avoid a warning */ if (!strcmp (id, "action")) @@ -69,7 +69,7 @@ glade_gtk_file_chooser_button_set_property (GladeWidgetAdaptor * adaptor, GladeEditable * glade_gtk_file_chooser_button_create_editable (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type) + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_file_chooser_button_editor_new (); diff --git a/plugins/gtk+/glade-gtk-fixed-layout.c b/plugins/gtk+/glade-gtk-fixed-layout.c index 22ce1ad9..87507a04 100644 --- a/plugins/gtk+/glade-gtk-fixed-layout.c +++ b/plugins/gtk+/glade-gtk-fixed-layout.c @@ -28,8 +28,8 @@ #include "glade-layout-editor.h" GladeEditable * -glade_gtk_layout_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_layout_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -40,7 +40,7 @@ glade_gtk_layout_create_editable (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_fixed_layout_sync_size_requests (GtkWidget * widget) +glade_gtk_fixed_layout_sync_size_requests (GtkWidget *widget) { GList *children, *l; @@ -74,15 +74,15 @@ get_fixed_layout_pattern (void) { gchar *path = g_build_filename (glade_app_get_pixmaps_dir (), "fixed-bg.png", NULL); cairo_surface_t *surface = - cairo_image_surface_create_from_png (path); + cairo_image_surface_create_from_png (path); if (surface) - { - static_pattern = cairo_pattern_create_for_surface (surface); - cairo_pattern_set_extend (static_pattern, CAIRO_EXTEND_REPEAT); - } + { + static_pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (static_pattern, CAIRO_EXTEND_REPEAT); + } else - g_warning ("Failed to create surface for %s\n", path); + g_warning ("Failed to create surface for %s\n", path); g_free (path); } @@ -106,8 +106,9 @@ glade_gtk_fixed_layout_draw (GtkWidget *widget, cairo_t *cr) } void -glade_gtk_fixed_layout_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_fixed_layout_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { /* Set a minimun size so you can actually see it if you added to a box */ gtk_widget_set_size_request (GTK_WIDGET (object), 32, 32); @@ -121,12 +122,13 @@ glade_gtk_fixed_layout_post_create (GladeWidgetAdaptor * adaptor, (glade_gtk_fixed_layout_sync_size_requests), NULL); g_signal_connect (object, "draw", - G_CALLBACK (glade_gtk_fixed_layout_draw), NULL); + G_CALLBACK (glade_gtk_fixed_layout_draw), NULL); } void -glade_gtk_fixed_layout_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_fixed_layout_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_CONTAINER (object)); g_return_if_fail (GTK_IS_WIDGET (child)); @@ -135,8 +137,9 @@ glade_gtk_fixed_layout_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_fixed_layout_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_fixed_layout_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_CONTAINER (object)); g_return_if_fail (GTK_IS_WIDGET (child)); diff --git a/plugins/gtk+/glade-gtk-flow-box.c b/plugins/gtk+/glade-gtk-flow-box.c index 1e37241d..dfa5256f 100644 --- a/plugins/gtk+/glade-gtk-flow-box.c +++ b/plugins/gtk+/glade-gtk-flow-box.c @@ -65,9 +65,9 @@ sync_child_positions (GtkFlowBox *flowbox) } static void -glade_gtk_flowbox_insert (GtkFlowBox *flowbox, +glade_gtk_flowbox_insert (GtkFlowBox *flowbox, GtkFlowBoxChild *child, - gint position) + gint position) { gtk_flow_box_insert (flowbox, GTK_WIDGET (child), position); sync_child_positions (flowbox); @@ -217,9 +217,9 @@ glade_gtk_flowbox_child_insert_action (GladeWidgetAdaptor *adaptor, } void -glade_gtk_flowbox_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * action_path) +glade_gtk_flowbox_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "add_child") == 0) { diff --git a/plugins/gtk+/glade-gtk-font-chooser-widget.c b/plugins/gtk+/glade-gtk-font-chooser-widget.c index a97a28bf..b145455f 100644 --- a/plugins/gtk+/glade-gtk-font-chooser-widget.c +++ b/plugins/gtk+/glade-gtk-font-chooser-widget.c @@ -28,8 +28,8 @@ #include "glade-font-chooser-widget-editor.h" GladeEditable * -glade_gtk_font_chooser_widget_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_font_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-frame.c b/plugins/gtk+/glade-gtk-frame.c index 39227aa4..1f314a03 100644 --- a/plugins/gtk+/glade-gtk-frame.c +++ b/plugins/gtk+/glade-gtk-frame.c @@ -27,8 +27,9 @@ #include "glade-gtk-frame.h" void -glade_gtk_frame_post_create (GladeWidgetAdaptor * adaptor, - GObject * frame, GladeCreateReason reason) +glade_gtk_frame_post_create (GladeWidgetAdaptor *adaptor, + GObject *frame, + GladeCreateReason reason) { static GladeWidgetAdaptor *label_adaptor = NULL, *alignment_adaptor = NULL; GladeWidget *gframe, *glabel, *galignment; @@ -62,7 +63,7 @@ glade_gtk_frame_post_create (GladeWidgetAdaptor * adaptor, glade_widget_property_set (glabel, "label", glade_widget_get_name (gframe)); g_object_set_data (glade_widget_get_object (glabel), - "special-child-type", "label_item"); + "special-child-type", "label_item"); glade_widget_add_child (gframe, glabel, FALSE); /* add alignment */ @@ -81,9 +82,10 @@ glade_gtk_frame_post_create (GladeWidgetAdaptor * adaptor, } void -glade_gtk_frame_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_frame_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { gchar *special_child_type; @@ -107,8 +109,9 @@ glade_gtk_frame_replace_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_frame_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_frame_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GtkWidget *bin_child; gchar *special_child_type; @@ -144,8 +147,9 @@ glade_gtk_frame_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_frame_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_frame_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gchar *special_child_type; @@ -162,13 +166,14 @@ glade_gtk_frame_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_frame_write_child (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_frame_write_child (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node, - GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child)) + GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child)) /* Chain Up */ GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node); @@ -176,11 +181,11 @@ glade_gtk_frame_write_child (GladeWidgetAdaptor * adaptor, /* Shared with GtkExpander code */ gboolean -glade_gtk_write_special_child_label_item (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node, - GladeWriteWidgetFunc write_func) +glade_gtk_write_special_child_label_item (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node, + GladeWriteWidgetFunc write_func) { gchar *special_child_type = NULL; GObject *child; diff --git a/plugins/gtk+/glade-gtk-frame.h b/plugins/gtk+/glade-gtk-frame.h index 076ac645..2c02d510 100644 --- a/plugins/gtk+/glade-gtk-frame.h +++ b/plugins/gtk+/glade-gtk-frame.h @@ -27,11 +27,11 @@ G_BEGIN_DECLS gboolean -glade_gtk_write_special_child_label_item (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node, - GladeWriteWidgetFunc write_func); +glade_gtk_write_special_child_label_item (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node, + GladeWriteWidgetFunc write_func); G_END_DECLS diff --git a/plugins/gtk+/glade-gtk-grid.c b/plugins/gtk+/glade-gtk-grid.c index 78a7551b..0e270cd2 100644 --- a/plugins/gtk+/glade-gtk-grid.c +++ b/plugins/gtk+/glade-gtk-grid.c @@ -46,19 +46,19 @@ typedef enum { } GroupAction; static gboolean glade_gtk_grid_configure_begin (GladeFixed *fixed, - GladeWidget *child, - GtkWidget *grid); + GladeWidget *child, + GtkWidget *grid); static gboolean glade_gtk_grid_configure_end (GladeFixed *fixed, - GladeWidget *child, - GtkWidget *grid); + GladeWidget *child, + GtkWidget *grid); static gboolean glade_gtk_grid_configure_child (GladeFixed *fixed, - GladeWidget *child, - GdkRectangle *rect, - GtkWidget *grid); + GladeWidget *child, + GdkRectangle *rect, + GtkWidget *grid); GladeEditable * -glade_gtk_grid_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_grid_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_grid_editor_new (); @@ -81,9 +81,9 @@ glade_gtk_grid_get_child_attachments (GtkWidget *grid, static gboolean glade_gtk_grid_has_child (GtkGrid *grid, - GList *children, - guint left_attach, - guint top_attach) + GList *children, + guint left_attach, + guint top_attach) { gboolean ret = FALSE; GList *list; @@ -208,7 +208,7 @@ glade_gtk_grid_post_create (GladeWidgetAdaptor *adaptor, void glade_gtk_grid_destroy_object (GladeWidgetAdaptor *adaptor, - GObject *object) + GObject *object) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProject *project = glade_widget_get_project (widget); diff --git a/plugins/gtk+/glade-gtk-header-bar.c b/plugins/gtk+/glade-gtk-header-bar.c index b3f21541..d48bd226 100644 --- a/plugins/gtk+/glade-gtk-header-bar.c +++ b/plugins/gtk+/glade-gtk-header-bar.c @@ -67,8 +67,8 @@ glade_gtk_header_bar_get_num_children (GObject *object) } static void -glade_gtk_header_bar_parse_finished (GladeProject * project, - GObject * object) +glade_gtk_header_bar_parse_finished (GladeProject *project, + GObject *object) { GladeWidget *gbox; @@ -79,8 +79,8 @@ glade_gtk_header_bar_parse_finished (GladeProject * project, void glade_gtk_header_bar_post_create (GladeWidgetAdaptor *adaptor, - GObject *container, - GladeCreateReason reason) + GObject *container, + GladeCreateReason reason) { GladeWidget *parent = glade_widget_get_from_gobject (container); GladeProject *project = glade_widget_get_project (parent); @@ -99,8 +99,8 @@ glade_gtk_header_bar_post_create (GladeWidgetAdaptor *adaptor, void glade_gtk_header_bar_action_activate (GladeWidgetAdaptor *adaptor, - GObject * object, - const gchar *action_path) + GObject *object, + const gchar *action_path) { if (!strcmp (action_path, "add_slot")) { @@ -123,10 +123,10 @@ glade_gtk_header_bar_action_activate (GladeWidgetAdaptor *adaptor, } void -glade_gtk_header_bar_child_action_activate (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * object, - const gchar * action_path) +glade_gtk_header_bar_child_action_activate (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "remove_slot") == 0) { @@ -162,10 +162,10 @@ glade_gtk_header_bar_child_action_activate (GladeWidgetAdaptor * adaptor, } void -glade_gtk_header_bar_get_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, - GValue * value) +glade_gtk_header_bar_get_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + GValue *value) { if (!strcmp (id, "use-custom-title")) { @@ -182,8 +182,8 @@ glade_gtk_header_bar_get_property (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_header_bar_set_size (GObject * object, - const GValue * value) +glade_gtk_header_bar_set_size (GObject *object, + const GValue *value) { GList *l, *next, *children; GtkWidget *child; @@ -236,7 +236,7 @@ glade_gtk_header_bar_set_size (GObject * object, void glade_gtk_header_bar_set_use_custom_title (GObject *object, - gboolean use_custom_title) + gboolean use_custom_title) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); GtkWidget *child; @@ -245,10 +245,10 @@ glade_gtk_header_bar_set_use_custom_title (GObject *object, { child = gtk_header_bar_get_custom_title (GTK_HEADER_BAR (object)); if (!child) - { - child = glade_placeholder_new (); - g_object_set_data (G_OBJECT (child), "special-child-type", "title"); - } + { + child = glade_placeholder_new (); + g_object_set_data (G_OBJECT (child), "special-child-type", "title"); + } } else child = NULL; @@ -261,11 +261,11 @@ glade_gtk_header_bar_set_use_custom_title (GObject *object, list = glade_placeholder_packing_actions (GLADE_PLACEHOLDER (child)); for (l = list; l; l = l->next) - { - GladeWidgetAction *gwa = l->data; - if (!strcmp (glade_widget_action_get_class (gwa)->id, "remove_slot")) - glade_widget_action_set_visible (gwa, FALSE); - } + { + GladeWidgetAction *gwa = l->data; + if (!strcmp (glade_widget_action_get_class (gwa)->id, "remove_slot")) + glade_widget_action_set_visible (gwa, FALSE); + } } if (use_custom_title) @@ -283,10 +283,10 @@ glade_gtk_header_bar_set_use_custom_title (GObject *object, } void -glade_gtk_header_bar_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, - const GValue * value) +glade_gtk_header_bar_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "use-custom-title")) glade_gtk_header_bar_set_use_custom_title (object, g_value_get_boolean (value)); @@ -300,9 +300,9 @@ glade_gtk_header_bar_set_property (GladeWidgetAdaptor * adaptor, * when clicked. */ glade_widget_property_set_sensitive (gwidget, "decoration-layout", - g_value_get_boolean (value), - _("The decoration layout does not apply to header bars " - "which do no show window controls")); + g_value_get_boolean (value), + _("The decoration layout does not apply to header bars " + "which do no show window controls")); } else if (!strcmp (id, "size")) glade_gtk_header_bar_set_size (object, value); @@ -312,8 +312,8 @@ glade_gtk_header_bar_set_property (GladeWidgetAdaptor * adaptor, void glade_gtk_header_bar_add_child (GladeWidgetAdaptor *adaptor, - GObject *parent, - GObject *child) + GObject *parent, + GObject *child) { GladeWidget *gbox, *gchild; gint size; @@ -326,8 +326,8 @@ glade_gtk_header_bar_add_child (GladeWidgetAdaptor *adaptor, special_child_type = g_object_get_data (child, "special-child-type"); d(g_message ("Add %s %p (special: %s)", - GLADE_IS_PLACEHOLDER (child) ? "placeholder" : "child", - child, special_child_type)); + GLADE_IS_PLACEHOLDER (child) ? "placeholder" : "child", + child, special_child_type)); if (special_child_type && !strcmp (special_child_type, "title")) { @@ -346,9 +346,9 @@ glade_gtk_header_bar_add_child (GladeWidgetAdaptor *adaptor, } void -glade_gtk_header_bar_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, - GObject * child) +glade_gtk_header_bar_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GladeWidget *gbox; gint size; @@ -357,8 +357,8 @@ glade_gtk_header_bar_remove_child (GladeWidgetAdaptor * adaptor, special_child_type = g_object_get_data (child, "special-child-type"); d(g_message ("Remove %s %p (special: %s)", - GLADE_IS_PLACEHOLDER (child) ? "placeholder" : "child", - child, special_child_type)); + GLADE_IS_PLACEHOLDER (child) ? "placeholder" : "child", + child, special_child_type)); if (special_child_type && !strcmp (special_child_type, "title")) { @@ -383,10 +383,10 @@ glade_gtk_header_bar_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_header_bar_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, - GObject * new_widget) +glade_gtk_header_bar_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_widget) { GladeWidget *gbox; gchar *special_child_type; @@ -396,10 +396,10 @@ glade_gtk_header_bar_replace_child (GladeWidgetAdaptor * adaptor, g_object_get_data (G_OBJECT (current), "special-child-type"); d(g_message ("Replace %s %p (special: %s) with %s %p", - GLADE_IS_PLACEHOLDER (current) ? "placeholder" : "child", - current, special_child_type, - GLADE_IS_PLACEHOLDER (new_widget) ? "placeholder" : "child", - new_widget)); + GLADE_IS_PLACEHOLDER (current) ? "placeholder" : "child", + current, special_child_type, + GLADE_IS_PLACEHOLDER (new_widget) ? "placeholder" : "child", + new_widget)); if (special_child_type && !strcmp (special_child_type, "title")) { @@ -484,10 +484,10 @@ glade_gtk_header_bar_get_children (GladeWidgetAdaptor *adaptor, void glade_gtk_header_bar_child_set_property (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *child, - const gchar *property_name, - const GValue *value) + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value) { GladeWidget *gbox, *gchild, *gchild_iter; GList *children, *list; @@ -586,8 +586,8 @@ glade_gtk_header_bar_child_set_property (GladeWidgetAdaptor *adaptor, GladeEditable * -glade_gtk_header_bar_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_header_bar_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_header_bar_editor_new (); diff --git a/plugins/gtk+/glade-gtk-icon-factory.c b/plugins/gtk+/glade-gtk-icon-factory.c index fe8e7f41..a9c7aaff 100644 --- a/plugins/gtk+/glade-gtk-icon-factory.c +++ b/plugins/gtk+/glade-gtk-icon-factory.c @@ -38,8 +38,9 @@ #define GLADE_TAG_SIZE "size" void -glade_gtk_icon_factory_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_icon_factory_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_icon_factory_add_default (GTK_ICON_FACTORY (object)); @@ -47,8 +48,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_icon_factory_destroy_object (GladeWidgetAdaptor * adaptor, - GObject *object) +glade_gtk_icon_factory_destroy_object (GladeWidgetAdaptor *adaptor, + GObject *object) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_icon_factory_remove_default (GTK_ICON_FACTORY (object)); @@ -58,7 +59,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_gtk_icon_factory_read_sources (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_icon_factory_read_sources (GladeWidget *widget, GladeXmlNode *node) { GladeIconSources *sources; GtkIconSource *source; @@ -192,11 +193,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_icon_factory_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_icon_factory_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in any normal properties.. */ @@ -212,7 +214,7 @@ typedef struct } SourceWriteTab; static void -write_icon_sources (gchar * icon_name, GList * sources, SourceWriteTab * tab) +write_icon_sources (gchar *icon_name, GList *sources, SourceWriteTab *tab) { GladeXmlNode *source_node; GtkIconSource *source; @@ -280,9 +282,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS static void -glade_gtk_icon_factory_write_sources (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_icon_factory_write_sources (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *sources_node; GladeIconSources *sources = NULL; @@ -307,13 +309,13 @@ glade_gtk_icon_factory_write_sources (GladeWidget * widget, void -glade_gtk_icon_factory_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_icon_factory_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and write all the normal properties.. */ @@ -323,8 +325,7 @@ glade_gtk_icon_factory_write_widget (GladeWidgetAdaptor * adaptor, } static void -apply_icon_sources (gchar * icon_name, - GList * sources, GtkIconFactory * factory) +apply_icon_sources (gchar *icon_name, GList *sources, GtkIconFactory *factory) { GtkIconSource *source; GtkIconSet *set; @@ -344,7 +345,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_gtk_icon_factory_set_sources (GObject * object, const GValue * value) +glade_gtk_icon_factory_set_sources (GObject *object, const GValue *value) { GladeIconSources *sources = g_value_get_boxed (value); if (sources) @@ -354,10 +355,10 @@ glade_gtk_icon_factory_set_sources (GObject * object, const GValue * value) void -glade_gtk_icon_factory_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_icon_factory_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "sources") == 0) { @@ -370,7 +371,7 @@ glade_gtk_icon_factory_set_property (GladeWidgetAdaptor * adaptor, } static void -serialize_icon_sources (gchar * icon_name, GList * sources, GString * string) +serialize_icon_sources (gchar *icon_name, GList *sources, GString *string) { GList *l; @@ -424,9 +425,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } gchar * -glade_gtk_icon_factory_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_icon_factory_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GString *string; GParamSpec *pspec; @@ -452,9 +453,9 @@ glade_gtk_icon_factory_string_from_value (GladeWidgetAdaptor * adaptor, GladeEditorProperty * -glade_gtk_icon_factory_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - gboolean use_command) +glade_gtk_icon_factory_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -472,7 +473,7 @@ glade_gtk_icon_factory_create_eprop (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_icon_factory_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_icon_factory_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; diff --git a/plugins/gtk+/glade-gtk-icon-view.c b/plugins/gtk+/glade-gtk-icon-view.c index 595ee2ea..5d58574b 100644 --- a/plugins/gtk+/glade-gtk-icon-view.c +++ b/plugins/gtk+/glade-gtk-icon-view.c @@ -28,8 +28,8 @@ #include "glade-icon-view-editor.h" GladeEditable * -glade_gtk_icon_view_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_icon_view_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-image-menu-item.c b/plugins/gtk+/glade-gtk-image-menu-item.c index 8d76bee7..186f197a 100644 --- a/plugins/gtk+/glade-gtk-image-menu-item.c +++ b/plugins/gtk+/glade-gtk-image-menu-item.c @@ -30,7 +30,7 @@ #include "glade-gtk.h" static void -glade_gtk_image_menu_item_set_use_stock (GObject * object, const GValue * value) +glade_gtk_image_menu_item_set_use_stock (GObject *object, const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); gboolean use_stock; @@ -59,7 +59,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static gboolean -glade_gtk_image_menu_item_set_label (GObject * object, const GValue * value) +glade_gtk_image_menu_item_set_label (GObject *object, const GValue *value) { GladeWidget *gitem; GtkWidget *label; @@ -103,7 +103,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_gtk_image_menu_item_set_stock (GObject * object, const GValue * value) +glade_gtk_image_menu_item_set_stock (GObject *object, const GValue *value) { GladeWidget *gitem; gboolean use_stock = FALSE; @@ -118,9 +118,10 @@ glade_gtk_image_menu_item_set_stock (GObject * object, const GValue * value) } void -glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "stock")) glade_gtk_image_menu_item_set_stock (object, value); @@ -138,8 +139,8 @@ glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_image_menu_item_parse_finished (GladeProject * project, - GladeWidget * widget) +glade_gtk_image_menu_item_parse_finished (GladeProject *project, + GladeWidget *widget) { GladeWidget *gimage; GtkWidget *image = NULL; @@ -150,16 +151,16 @@ glade_gtk_image_menu_item_parse_finished (GladeProject * project, } void -glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlNode * node) +glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GladeProperty *property; gboolean use_stock; gchar *label = NULL; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -189,17 +190,17 @@ glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor * adaptor, void -glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *label_prop; gboolean use_stock; gchar *stock; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* Make a copy of the GladeProperty, override its value if use-stock is TRUE */ @@ -226,7 +227,7 @@ glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor * adaptor, */ GladeEditable * -glade_gtk_image_menu_item_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_image_menu_item_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; diff --git a/plugins/gtk+/glade-gtk-image.c b/plugins/gtk+/glade-gtk-image.c index a5b87b23..22cd3f98 100644 --- a/plugins/gtk+/glade-gtk-image.c +++ b/plugins/gtk+/glade-gtk-image.c @@ -30,13 +30,14 @@ #include "glade-gtk.h" void -glade_gtk_image_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_image_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GladeProperty *property; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -68,13 +69,14 @@ glade_gtk_image_read_widget (GladeWidgetAdaptor * adaptor, } void -glade_gtk_image_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_image_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and write all the normal properties (including "use-stock")... */ @@ -85,7 +87,7 @@ glade_gtk_image_write_widget (GladeWidgetAdaptor * adaptor, static void -glade_gtk_image_set_image_mode (GObject * object, const GValue * value) +glade_gtk_image_set_image_mode (GObject *object, const GValue *value) { GladeWidget *gwidget; GladeImageEditMode type; @@ -135,9 +137,10 @@ glade_gtk_image_set_image_mode (GObject * object, const GValue * value) } void -glade_gtk_image_get_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, GValue * value) +glade_gtk_image_get_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + GValue *value) { if (!strcmp (id, "icon-size")) { @@ -154,9 +157,10 @@ glade_gtk_image_get_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_image_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_image_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "image-mode")) glade_gtk_image_set_image_mode (object, value); @@ -192,7 +196,7 @@ glade_gtk_image_set_property (GladeWidgetAdaptor * adaptor, if (!strcmp (id, "stock") || !strcmp (id, "icon-name")) return; case GLADE_IMAGE_MODE_RESOURCE: - /* Screw the resource mode here, we can't apply them at Glade's runtime anyway */ + /* Screw the resource mode here, we can't apply them at Glade's runtime anyway */ default: break; } @@ -203,7 +207,7 @@ glade_gtk_image_set_property (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_image_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_image_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) @@ -214,10 +218,10 @@ glade_gtk_image_create_editable (GladeWidgetAdaptor * adaptor, /* Shared with other classes */ void -glade_gtk_write_icon_size (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node, - const gchar *prop_name) +glade_gtk_write_icon_size (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node, + const gchar *prop_name) { GladeXmlNode *prop_node; GladeProperty *size_prop; diff --git a/plugins/gtk+/glade-gtk-image.h b/plugins/gtk+/glade-gtk-image.h index e5cc779d..6a9e6b35 100644 --- a/plugins/gtk+/glade-gtk-image.h +++ b/plugins/gtk+/glade-gtk-image.h @@ -26,10 +26,10 @@ G_BEGIN_DECLS -void glade_gtk_write_icon_size (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node, - const gchar *prop_name); +void glade_gtk_write_icon_size (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node, + const gchar *prop_name); G_END_DECLS diff --git a/plugins/gtk+/glade-gtk-label.c b/plugins/gtk+/glade-gtk-label.c index 27973962..0ec20c39 100644 --- a/plugins/gtk+/glade-gtk-label.c +++ b/plugins/gtk+/glade-gtk-label.c @@ -30,8 +30,9 @@ #include "glade-gtk.h" void -glade_gtk_label_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_label_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *glabel = glade_widget_get_from_gobject (object); @@ -41,7 +42,7 @@ glade_gtk_label_post_create (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_label_set_label (GObject * object, const GValue * value) +glade_gtk_label_set_label (GObject *object, const GValue *value) { GladeWidget *glabel; gboolean use_markup = FALSE, use_underline = FALSE; @@ -60,7 +61,7 @@ glade_gtk_label_set_label (GObject * object, const GValue * value) } static void -glade_gtk_label_set_attributes (GObject * object, const GValue * value) +glade_gtk_label_set_attributes (GObject *object, const GValue *value) { GladeAttribute *gattr; PangoAttribute *attribute; @@ -80,19 +81,19 @@ glade_gtk_label_set_attributes (GObject * object, const GValue * value) { /* PangoFontDescription */ case PANGO_ATTR_FONT_DESC: - if ((font_desc = - pango_font_description_from_string (g_value_get_string (&gattr->value)))) - { - attribute = pango_attr_font_desc_new (font_desc); - pango_font_description_free (font_desc); - } - break; + if ((font_desc = + pango_font_description_from_string (g_value_get_string (&gattr->value)))) + { + attribute = pango_attr_font_desc_new (font_desc); + pango_font_description_free (font_desc); + } + break; /* PangoAttrLanguage */ case PANGO_ATTR_LANGUAGE: if ((language = pango_language_from_string (g_value_get_string (&gattr->value)))) - attribute = pango_attr_language_new (language); + attribute = pango_attr_language_new (language); break; /* PangoAttrInt */ case PANGO_ATTR_STYLE: @@ -207,7 +208,7 @@ glade_gtk_label_set_attributes (GObject * object, const GValue * value) static void -glade_gtk_label_set_content_mode (GObject * object, const GValue * value) +glade_gtk_label_set_content_mode (GObject *object, const GValue *value) { GladeLabelContentMode mode = g_value_get_int (value); GladeWidget *glabel; @@ -239,7 +240,7 @@ glade_gtk_label_set_content_mode (GObject * object, const GValue * value) } static void -glade_gtk_label_update_lines_sensitivity (GObject * object) +glade_gtk_label_update_lines_sensitivity (GObject *object) { GladeWidget *glabel; PangoEllipsizeMode ellipsize_mode; @@ -258,7 +259,7 @@ glade_gtk_label_update_lines_sensitivity (GObject * object) } static void -glade_gtk_label_set_wrap_mode (GObject * object, const GValue * value) +glade_gtk_label_set_wrap_mode (GObject *object, const GValue *value) { GladeLabelWrapMode mode = g_value_get_int (value); GladeWidget *glabel; @@ -280,7 +281,7 @@ glade_gtk_label_set_wrap_mode (GObject * object, const GValue * value) } static void -glade_gtk_label_set_use_underline (GObject * object, const GValue * value) +glade_gtk_label_set_use_underline (GObject *object, const GValue *value) { GladeWidget *glabel; @@ -296,9 +297,10 @@ glade_gtk_label_set_use_underline (GObject * object, const GValue * value) } void -glade_gtk_label_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_label_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "label")) glade_gtk_label_set_label (object, value); @@ -313,14 +315,14 @@ glade_gtk_label_set_property (GladeWidgetAdaptor * adaptor, else { if (!strcmp (id, "ellipsize")) - glade_gtk_label_update_lines_sensitivity (object); + glade_gtk_label_update_lines_sensitivity (object); GWA_GET_CLASS (GTK_TYPE_WIDGET)->set_property (adaptor, object, id, value); } } static void -glade_gtk_parse_attributes (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_parse_attributes (GladeWidget *widget, GladeXmlNode *node) { PangoAttrType attr_type; GladeXmlNode *prop; @@ -371,7 +373,7 @@ glade_gtk_parse_attributes (GladeWidget * widget, GladeXmlNode * node) } static void -glade_gtk_label_read_attributes (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_label_read_attributes (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *attrs_node; @@ -384,13 +386,14 @@ glade_gtk_label_read_attributes (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_label_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_label_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GladeProperty *prop; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -401,7 +404,7 @@ glade_gtk_label_read_widget (GladeWidgetAdaptor * adaptor, /* sync label property after a load... */ prop = glade_widget_get_property (widget, "label"); glade_gtk_label_set_label (glade_widget_get_object (widget), - glade_property_inline_value (prop)); + glade_property_inline_value (prop)); /* Resolve "label-content-mode" virtual control property */ if (!glade_widget_property_original_default (widget, "use-markup")) @@ -432,9 +435,9 @@ glade_gtk_label_read_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_label_write_attributes (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_label_write_attributes (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *attr_node; GList *attrs = NULL, *l; @@ -464,14 +467,15 @@ glade_gtk_label_write_attributes (GladeWidget * widget, } void -glade_gtk_label_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_label_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *attrs_node; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -490,9 +494,9 @@ glade_gtk_label_write_widget (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_label_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_label_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GParamSpec *pspec; @@ -524,8 +528,9 @@ glade_gtk_label_string_from_value (GladeWidgetAdaptor * adaptor, GladeEditorProperty * -glade_gtk_label_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, gboolean use_command) +glade_gtk_label_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -546,7 +551,7 @@ glade_gtk_label_create_eprop (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_label_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_label_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; diff --git a/plugins/gtk+/glade-gtk-level-bar.c b/plugins/gtk+/glade-gtk-level-bar.c index 71840ee2..df1fe928 100644 --- a/plugins/gtk+/glade-gtk-level-bar.c +++ b/plugins/gtk+/glade-gtk-level-bar.c @@ -28,8 +28,8 @@ #include "glade-level-bar-editor.h" GladeEditable * -glade_gtk_level_bar_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_level_bar_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-list-box.c b/plugins/gtk+/glade-gtk-list-box.c index 94a6dcdf..9e054ad6 100644 --- a/plugins/gtk+/glade-gtk-list-box.c +++ b/plugins/gtk+/glade-gtk-list-box.c @@ -220,9 +220,9 @@ glade_gtk_listbox_child_insert_action (GladeWidgetAdaptor *adaptor, } void -glade_gtk_listbox_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * action_path) +glade_gtk_listbox_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "add_row") == 0) { diff --git a/plugins/gtk+/glade-gtk-list-store.c b/plugins/gtk+/glade-gtk-list-store.c index 785ebfa4..71a0c049 100644 --- a/plugins/gtk+/glade-gtk-list-store.c +++ b/plugins/gtk+/glade-gtk-list-store.c @@ -31,16 +31,16 @@ #include "glade-model-data.h" #include "glade-gtk-cell-layout.h" -#define GLADE_TAG_COLUMNS "columns" -#define GLADE_TAG_COLUMN "column" -#define GLADE_TAG_TYPE "type" +#define GLADE_TAG_COLUMNS "columns" +#define GLADE_TAG_COLUMN "column" +#define GLADE_TAG_TYPE "type" #define GLADE_TAG_ROW "row" #define GLADE_TAG_DATA "data" #define GLADE_TAG_COL "col" static void -glade_gtk_store_set_columns (GObject * object, const GValue * value) +glade_gtk_store_set_columns (GObject *object, const GValue *value) { GList *l; gint i, n; @@ -66,7 +66,7 @@ glade_gtk_store_set_columns (GObject * object, const GValue * value) } static void -glade_gtk_store_set_data (GObject * object, const GValue * value) +glade_gtk_store_set_data (GObject *object, const GValue *value) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); GList *columns = NULL; @@ -122,9 +122,10 @@ glade_gtk_store_set_data (GObject * object, const GValue * value) } void -glade_gtk_store_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, const GValue * value) +glade_gtk_store_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "columns") == 0) { @@ -141,8 +142,9 @@ glade_gtk_store_set_property (GladeWidgetAdaptor * adaptor, } GladeEditorProperty * -glade_gtk_store_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, gboolean use_command) +glade_gtk_store_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -166,9 +168,10 @@ glade_gtk_store_create_eprop (GladeWidgetAdaptor * adaptor, static void -glade_gtk_store_columns_changed (GladeProperty * property, - GValue * old_value, - GValue * new_value, GladeWidget * store) +glade_gtk_store_columns_changed (GladeProperty *property, + GValue *old_value, + GValue *new_value, + GladeWidget *store) { GList *l, *list, *children, *prop_refs; @@ -199,8 +202,9 @@ glade_gtk_store_columns_changed (GladeProperty * property, } void -glade_gtk_store_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_store_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *gwidget; GladeProperty *property; @@ -226,7 +230,7 @@ glade_gtk_store_post_create (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_store_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_store_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; @@ -241,9 +245,9 @@ glade_gtk_store_create_editable (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_store_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_store_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GString *string; GParamSpec *pspec; @@ -320,8 +324,9 @@ glade_gtk_store_string_from_value (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_store_write_columns (GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_store_write_columns (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *columns_node; GladeProperty *prop; @@ -356,8 +361,9 @@ glade_gtk_store_write_columns (GladeWidget * widget, } static void -glade_gtk_store_write_data (GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_store_write_data (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *data_node, *col_node, *row_node; GList *columns = NULL; @@ -433,12 +439,13 @@ glade_gtk_store_write_data (GladeWidget * widget, void -glade_gtk_store_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_store_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and write all the normal properties.. */ @@ -449,7 +456,7 @@ glade_gtk_store_write_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_store_read_columns (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_store_read_columns (GladeWidget *widget, GladeXmlNode *node) { GladeNameContext *context; GladeXmlNode *columns_node; @@ -491,15 +498,15 @@ glade_gtk_store_read_columns (GladeWidget * widget, GladeXmlNode * node) glade_xml_get_property_string_required (prop, GLADE_TAG_TYPE, NULL); if (!column_name[0]) - { - gchar *cname = g_ascii_strdown (type, -1); + { + gchar *cname = g_ascii_strdown (type, -1); - data = glade_column_type_new (type, cname); + data = glade_column_type_new (type, cname); - g_free (cname); - } + g_free (cname); + } else - data = glade_column_type_new (type, column_name); + data = glade_column_type_new (type, column_name); if (glade_name_context_has_name (context, data->column_name)) { @@ -526,7 +533,7 @@ glade_gtk_store_read_columns (GladeWidget * widget, GladeXmlNode * node) } static void -glade_gtk_store_read_data (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_store_read_data (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *data_node, *row_node, *col_node; GNode *data_tree, *row, *item; @@ -601,11 +608,11 @@ glade_gtk_store_read_data (GladeWidget * widget, GladeXmlNode * node) */ value_str = glade_xml_get_content (col_node); value = glade_utils_value_from_string (g_type_from_name (column_type->type_name), value_str, - glade_widget_get_project (widget)); + glade_widget_get_project (widget)); g_free (value_str); data = glade_model_data_new (g_type_from_name (column_type->type_name), - column_type->column_name); + column_type->column_name); g_value_copy (value, &data->value); g_value_unset (value); @@ -641,11 +648,12 @@ glade_gtk_store_read_data (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_store_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_store_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ diff --git a/plugins/gtk+/glade-gtk-menu-bar.c b/plugins/gtk+/glade-gtk-menu-bar.c index 0d18816d..d5ac3be4 100644 --- a/plugins/gtk+/glade-gtk-menu-bar.c +++ b/plugins/gtk+/glade-gtk-menu-bar.c @@ -26,8 +26,8 @@ #include <gladeui/glade.h> static GladeWidget * -glade_gtk_menu_bar_append_new_submenu (GladeWidget * parent, - GladeProject * project) +glade_gtk_menu_bar_append_new_submenu (GladeWidget *parent, + GladeProject *project) { static GladeWidgetAdaptor *submenu_adaptor = NULL; GladeWidget *gsubmenu; @@ -45,9 +45,10 @@ glade_gtk_menu_bar_append_new_submenu (GladeWidget * parent, } static GladeWidget * -glade_gtk_menu_bar_append_new_item (GladeWidget * parent, - GladeProject * project, - const gchar * label, gboolean use_stock) +glade_gtk_menu_bar_append_new_item (GladeWidget *parent, + GladeProject *project, + const gchar *label, + gboolean use_stock) { static GladeWidgetAdaptor *item_adaptor = NULL, *image_item_adaptor, *separator_adaptor; @@ -96,7 +97,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS void glade_gtk_menu_bar_post_create (GladeWidgetAdaptor *adaptor, GObject *object, - GladeCreateReason reason) + GladeCreateReason reason) { GladeProject *project; GladeWidget *gmenubar, *gitem, *gsubmenu; diff --git a/plugins/gtk+/glade-gtk-menu-item.c b/plugins/gtk+/glade-gtk-menu-item.c index 34868e60..40dd4ba9 100644 --- a/plugins/gtk+/glade-gtk-menu-item.c +++ b/plugins/gtk+/glade-gtk-menu-item.c @@ -30,9 +30,9 @@ #include "glade-gtk.h" void -glade_gtk_menu_item_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * action_path) +glade_gtk_menu_item_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { GObject *obj = NULL, *shell = NULL; GladeWidget *w = glade_widget_get_from_gobject (object); @@ -65,7 +65,7 @@ glade_gtk_menu_item_action_activate (GladeWidgetAdaptor * adaptor, GObject * glade_gtk_menu_item_constructor (GType type, guint n_construct_properties, - GObjectConstructParam * construct_properties) + GObjectConstructParam *construct_properties) { GladeWidgetAdaptor *adaptor; GObject *ret_obj; @@ -97,8 +97,8 @@ glade_gtk_menu_item_post_create (GladeWidgetAdaptor * adaptor, } GList * -glade_gtk_menu_item_get_children (GladeWidgetAdaptor * adaptor, - GObject * object) +glade_gtk_menu_item_get_children (GladeWidgetAdaptor *adaptor, + GObject *object) { GList *list = NULL; GtkWidget *child; @@ -113,35 +113,35 @@ glade_gtk_menu_item_get_children (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_menu_item_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_MENU (child)) { if (user_feedback) - { - GladeWidgetAdaptor *menu_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_MENU); + { + GladeWidgetAdaptor *menu_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_MENU); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (menu_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (menu_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } else if (GTK_IS_SEPARATOR_MENU_ITEM (container)) { if (user_feedback) - { - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("An object of type %s cannot have any children."), - glade_widget_adaptor_get_title (adaptor)); - } + { + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + _("An object of type %s cannot have any children."), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -150,8 +150,9 @@ glade_gtk_menu_item_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_menu_item_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_item_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_MENU_ITEM (object)); g_return_if_fail (GTK_IS_MENU (child)); @@ -169,8 +170,9 @@ glade_gtk_menu_item_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_menu_item_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_item_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_MENU_ITEM (object)); g_return_if_fail (GTK_IS_MENU (child)); @@ -181,7 +183,7 @@ glade_gtk_menu_item_remove_child (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_menu_item_set_label (GObject * object, const GValue * value) +glade_gtk_menu_item_set_label (GObject *object, const GValue *value) { GladeWidget *gitem; GtkWidget *label; @@ -208,9 +210,10 @@ glade_gtk_menu_item_set_use_underline (GObject * object, const GValue * value) void -glade_gtk_menu_item_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_menu_item_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (gwidget, id); @@ -226,7 +229,7 @@ glade_gtk_menu_item_set_property (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_activatable_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_activatable_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) diff --git a/plugins/gtk+/glade-gtk-menu-shell.c b/plugins/gtk+/glade-gtk-menu-shell.c index e2c4ad5b..b86ee371 100644 --- a/plugins/gtk+/glade-gtk-menu-shell.c +++ b/plugins/gtk+/glade-gtk-menu-shell.c @@ -30,23 +30,23 @@ gboolean glade_gtk_menu_shell_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_MENU_ITEM (child)) { if (user_feedback) - { - GladeWidgetAdaptor *menu_item_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_MENU_ITEM); - - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (menu_item_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + { + GladeWidgetAdaptor *menu_item_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_MENU_ITEM); + + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (menu_item_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -55,8 +55,9 @@ glade_gtk_menu_shell_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_menu_shell_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_shell_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_MENU_SHELL (object)); @@ -67,8 +68,9 @@ glade_gtk_menu_shell_add_child (GladeWidgetAdaptor * adaptor, void -glade_gtk_menu_shell_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_shell_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { g_return_if_fail (GTK_IS_MENU_SHELL (object)); g_return_if_fail (GTK_IS_MENU_ITEM (child)); @@ -97,11 +99,11 @@ glade_gtk_menu_shell_get_item_position (GObject * container, GObject * child) } void -glade_gtk_menu_shell_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_menu_shell_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_MENU_SHELL (container)); g_return_if_fail (GTK_IS_MENU_ITEM (child)); @@ -121,11 +123,11 @@ glade_gtk_menu_shell_get_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_menu_shell_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_menu_shell_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_MENU_SHELL (container)); g_return_if_fail (GTK_IS_MENU_ITEM (child)); @@ -163,9 +165,9 @@ glade_gtk_menu_shell_set_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_menu_shell_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * action_path) +glade_gtk_menu_shell_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { @@ -182,9 +184,9 @@ glade_gtk_menu_shell_action_activate (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_menu_shell_tool_item_get_display_name (GladeBaseEditor * editor, - GladeWidget * gchild, - gpointer user_data) +glade_gtk_menu_shell_tool_item_get_display_name (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer user_data) { GObject *child = glade_widget_get_object (gchild); gchar *name; @@ -224,16 +226,17 @@ glade_gtk_menu_shell_item_get_parent (GladeWidget * gparent, GObject * parent) else gparent = glade_command_create (glade_widget_adaptor_get_by_type (GTK_TYPE_MENU), - gparent, NULL, - glade_widget_get_project (gparent)); + gparent, NULL, + glade_widget_get_project (gparent)); return gparent; } GladeWidget * -glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GType type, gpointer data) +glade_gtk_menu_shell_build_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GType type, + gpointer data) { GObject *parent = glade_widget_get_object (gparent); GladeWidget *gitem_new; @@ -241,16 +244,16 @@ glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, if (GTK_IS_SEPARATOR_MENU_ITEM (parent)) { glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Children cannot be added to a separator.")); + GLADE_UI_INFO, NULL, + _("Children cannot be added to a separator.")); return NULL; } if (GTK_IS_RECENT_CHOOSER_MENU (parent)) { glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("Children cannot be added to a Recent Chooser Menu.")); + GLADE_UI_INFO, NULL, + _("Children cannot be added to a Recent Chooser Menu.")); return NULL; } @@ -258,9 +261,9 @@ glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, gtk_menu_tool_button_get_menu (GTK_MENU_TOOL_BUTTON (parent)) != NULL) { glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("%s already has a menu."), - glade_widget_get_name (gparent)); + GLADE_UI_INFO, NULL, + _("%s already has a menu."), + glade_widget_get_name (gparent)); return NULL; } @@ -268,9 +271,9 @@ glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, gtk_menu_item_get_submenu (GTK_MENU_ITEM (parent)) != NULL) { glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - _("%s item already has a submenu."), - glade_widget_get_name (gparent)); + GLADE_UI_INFO, NULL, + _("%s item already has a submenu."), + glade_widget_get_name (gparent)); return NULL; } @@ -297,9 +300,10 @@ glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, } gboolean -glade_gtk_menu_shell_delete_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GladeWidget * gchild, gpointer data) +glade_gtk_menu_shell_delete_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data) { GObject *item = glade_widget_get_object (gparent); GtkWidget *submenu = NULL; @@ -326,9 +330,10 @@ glade_gtk_menu_shell_delete_child (GladeBaseEditor * editor, } gboolean -glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GladeWidget * gchild, gpointer data) +glade_gtk_menu_shell_move_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data) { GObject *parent = glade_widget_get_object (gparent); GObject *child = glade_widget_get_object (gchild); @@ -350,7 +355,7 @@ glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, if (GTK_IS_TOOL_PALETTE (parent)) return FALSE; if (GTK_IS_TOOL_ITEM (parent) && !GTK_IS_MENU_TOOL_BUTTON (parent)) - return FALSE; + return FALSE; } /* Moving a toolitem child */ @@ -367,17 +372,17 @@ glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, if (GTK_IS_RECENT_CHOOSER_MENU (child)) { if (GTK_IS_MENU_ITEM (parent)) - { - if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (parent)) != NULL) - return FALSE; - } + { + if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (parent)) != NULL) + return FALSE; + } else if (GTK_IS_MENU_TOOL_BUTTON (parent)) - { - if (gtk_menu_tool_button_get_menu (GTK_MENU_TOOL_BUTTON (parent)) != NULL) - return FALSE; - } + { + if (gtk_menu_tool_button_get_menu (GTK_MENU_TOOL_BUTTON (parent)) != NULL) + return FALSE; + } else - return FALSE; + return FALSE; } /* Moving a toolitem group */ @@ -405,7 +410,7 @@ glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, GList del = { 0, }, *children; children = - gtk_container_get_children (GTK_CONTAINER (glade_widget_get_object (old_parent))); + gtk_container_get_children (GTK_CONTAINER (glade_widget_get_object (old_parent))); if (!children) { del.data = old_parent; @@ -418,9 +423,10 @@ glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, } gboolean -glade_gtk_menu_shell_change_type (GladeBaseEditor * editor, - GladeWidget * gchild, - GType type, gpointer data) +glade_gtk_menu_shell_change_type (GladeBaseEditor *editor, + GladeWidget *gchild, + GType type, + gpointer data) { GObject *child = glade_widget_get_object (gchild); @@ -455,7 +461,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_menu_shell_launch_editor (GObject * object, gchar * title) +glade_gtk_menu_shell_launch_editor (GObject *object, gchar *title) { GladeBaseEditor *editor; GtkWidget *window; @@ -478,8 +484,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS _("Check item"), GTK_TYPE_CHECK_MENU_ITEM, _("Radio item"), GTK_TYPE_RADIO_MENU_ITEM, _("Separator item"), GTK_TYPE_SEPARATOR_MENU_ITEM, - _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, - NULL); + _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, + NULL); g_signal_connect (editor, "get-display-name", G_CALLBACK @@ -503,8 +509,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_toolbar_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data) +glade_gtk_toolbar_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data) { GladeWidget *gparent = glade_widget_get_parent (gchild); GObject *parent = glade_widget_get_object (gparent); @@ -517,9 +524,9 @@ glade_gtk_toolbar_child_selected (GladeBaseEditor * editor, glade_base_editor_add_label (editor, _("Properties")); glade_base_editor_add_properties (editor, gchild, FALSE, - "tooltip-text", - "accelerator", - NULL); + "tooltip-text", + "accelerator", + NULL); glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL); if (type == GTK_TYPE_SEPARATOR_TOOL_ITEM) @@ -528,15 +535,16 @@ glade_gtk_toolbar_child_selected (GladeBaseEditor * editor, glade_base_editor_add_label (editor, _("Packing")); if (GTK_IS_TOOLBAR (parent)) glade_base_editor_add_properties (editor, gchild, TRUE, - "expand", "homogeneous", NULL); + "expand", "homogeneous", NULL); else if (GTK_IS_TOOL_ITEM_GROUP (parent)) glade_base_editor_add_properties (editor, gchild, TRUE, - "expand", "fill", "homogeneous", "new-row", NULL); + "expand", "fill", "homogeneous", "new-row", NULL); } void -glade_gtk_tool_palette_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data) +glade_gtk_tool_palette_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data) { glade_base_editor_add_label (editor, _("Tool Item Group")); @@ -544,8 +552,8 @@ glade_gtk_tool_palette_child_selected (GladeBaseEditor * editor, glade_base_editor_add_label (editor, _("Properties")); glade_base_editor_add_properties (editor, gchild, FALSE, - "tooltip-text", - NULL); + "tooltip-text", + NULL); glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL); glade_base_editor_add_label (editor, _("Packing")); @@ -554,8 +562,9 @@ glade_gtk_tool_palette_child_selected (GladeBaseEditor * editor, } void -glade_gtk_recent_chooser_menu_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data) +glade_gtk_recent_chooser_menu_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data) { glade_base_editor_add_label (editor, _("Recent Chooser Menu")); @@ -566,9 +575,9 @@ glade_gtk_recent_chooser_menu_child_selected (GladeBaseEditor * editor, } void -glade_gtk_menu_shell_tool_item_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, - gpointer data) +glade_gtk_menu_shell_tool_item_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data) { GObject *child = glade_widget_get_object (gchild); GType type = G_OBJECT_TYPE (child); @@ -606,26 +615,26 @@ G_GNUC_END_IGNORE_DEPRECATIONS if (type != image_menu_item) glade_base_editor_add_properties (editor, gchild, FALSE, - "label", - "tooltip-text", - "accelerator", + "label", + "tooltip-text", + "accelerator", NULL); else glade_base_editor_add_properties (editor, gchild, FALSE, - "tooltip-text", - "accelerator", - NULL); + "tooltip-text", + "accelerator", + NULL); if (type == image_menu_item) glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL); else if (type == GTK_TYPE_CHECK_MENU_ITEM) glade_base_editor_add_properties (editor, gchild, FALSE, "active", - "draw-as-radio", + "draw-as-radio", "inconsistent", - NULL); + NULL); else if (type == GTK_TYPE_RADIO_MENU_ITEM) glade_base_editor_add_properties (editor, gchild, FALSE, "active", - "group", NULL); + "group", NULL); } diff --git a/plugins/gtk+/glade-gtk-menu-shell.h b/plugins/gtk+/glade-gtk-menu-shell.h index a9338262..ac2c0459 100644 --- a/plugins/gtk+/glade-gtk-menu-shell.h +++ b/plugins/gtk+/glade-gtk-menu-shell.h @@ -28,31 +28,39 @@ G_BEGIN_DECLS void glade_gtk_menu_shell_launch_editor (GObject *object, gchar *title); -gboolean glade_gtk_menu_shell_change_type (GladeBaseEditor * editor, - GladeWidget * gchild, - GType type, gpointer data); -GladeWidget *glade_gtk_menu_shell_build_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GType type, gpointer data); -gboolean glade_gtk_menu_shell_delete_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GladeWidget * gchild, gpointer data); -gboolean glade_gtk_menu_shell_move_child (GladeBaseEditor * editor, - GladeWidget * gparent, - GladeWidget * gchild, gpointer data); - -gchar *glade_gtk_menu_shell_tool_item_get_display_name (GladeBaseEditor * editor, - GladeWidget * gchild, - gpointer user_data); - -void glade_gtk_toolbar_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data); -void glade_gtk_tool_palette_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data); -void glade_gtk_recent_chooser_menu_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data); -void glade_gtk_menu_shell_tool_item_child_selected (GladeBaseEditor * editor, - GladeWidget * gchild, gpointer data); +gboolean glade_gtk_menu_shell_change_type (GladeBaseEditor *editor, + GladeWidget *gchild, + GType type, + gpointer data); +GladeWidget *glade_gtk_menu_shell_build_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GType type, + gpointer data); +gboolean glade_gtk_menu_shell_delete_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data); +gboolean glade_gtk_menu_shell_move_child (GladeBaseEditor *editor, + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data); + +gchar *glade_gtk_menu_shell_tool_item_get_display_name (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer user_data); + +void glade_gtk_toolbar_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data); +void glade_gtk_tool_palette_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data); +void glade_gtk_recent_chooser_menu_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data); +void glade_gtk_menu_shell_tool_item_child_selected (GladeBaseEditor *editor, + GladeWidget *gchild, + gpointer data); G_END_DECLS diff --git a/plugins/gtk+/glade-gtk-menu-tool-button.c b/plugins/gtk+/glade-gtk-menu-tool-button.c index 60d9bd2f..58dab088 100644 --- a/plugins/gtk+/glade-gtk-menu-tool-button.c +++ b/plugins/gtk+/glade-gtk-menu-tool-button.c @@ -28,8 +28,8 @@ #include "glade-gtk.h" GList * -glade_gtk_menu_tool_button_get_children (GladeWidgetAdaptor * adaptor, - GtkMenuToolButton * button) +glade_gtk_menu_tool_button_get_children (GladeWidgetAdaptor *adaptor, + GtkMenuToolButton *button) { GList *list = NULL; GtkWidget *menu = gtk_menu_tool_button_get_menu (button); @@ -45,23 +45,23 @@ glade_gtk_menu_tool_button_get_children (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_menu_tool_button_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_MENU (child)) { if (user_feedback) - { - GladeWidgetAdaptor *menu_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_MENU); + { + GladeWidgetAdaptor *menu_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_MENU); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (menu_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (menu_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -70,21 +70,23 @@ glade_gtk_menu_tool_button_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_menu_tool_button_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_tool_button_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { if (GTK_IS_MENU (child)) { g_object_set_data (child, "special-child-type", "menu"); gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (object), - GTK_WIDGET (child)); + GTK_WIDGET (child)); } } void -glade_gtk_menu_tool_button_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_menu_tool_button_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { if (GTK_IS_MENU (child)) { @@ -95,9 +97,10 @@ glade_gtk_menu_tool_button_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_menu_tool_button_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_object) +glade_gtk_menu_tool_button_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_object) { glade_gtk_menu_tool_button_remove_child (adaptor, container, current); glade_gtk_menu_tool_button_add_child (adaptor, container, new_object); diff --git a/plugins/gtk+/glade-gtk-model-button.c b/plugins/gtk+/glade-gtk-model-button.c index 3b1a56bc..5aac1270 100644 --- a/plugins/gtk+/glade-gtk-model-button.c +++ b/plugins/gtk+/glade-gtk-model-button.c @@ -6,8 +6,7 @@ #include "glade-model-button-editor.h" static void -model_button_clicked (GtkWidget *widget, - gpointer user_data) +model_button_clicked (GtkWidget *widget, gpointer user_data) { GtkWidget *popover; @@ -18,32 +17,32 @@ model_button_clicked (GtkWidget *widget, void glade_gtk_model_button_post_create (GladeWidgetAdaptor *adaptor, - GObject *object, - GladeCreateReason reason) + GObject *object, + GladeCreateReason reason) { g_signal_connect (object, "clicked", - G_CALLBACK (model_button_clicked), NULL); + G_CALLBACK (model_button_clicked), NULL); } void -glade_gtk_model_button_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlNode * node) +glade_gtk_model_button_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { GWA_GET_CLASS (GTK_TYPE_CONTAINER)->read_widget (adaptor, widget, node); } void -glade_gtk_model_button_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_model_button_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GWA_GET_CLASS (GTK_TYPE_CONTAINER)->write_widget (adaptor, widget, context, node); } GladeEditable * -glade_gtk_model_button_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_model_button_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) diff --git a/plugins/gtk+/glade-gtk-notebook.c b/plugins/gtk+/glade-gtk-notebook.c index b5a59bf3..dcc1a064 100644 --- a/plugins/gtk+/glade-gtk-notebook.c +++ b/plugins/gtk+/glade-gtk-notebook.c @@ -43,8 +43,8 @@ static gboolean glade_gtk_notebook_setting_position = FALSE; GladeEditable * -glade_gtk_notebook_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_notebook_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_notebook_editor_new (); @@ -53,7 +53,7 @@ glade_gtk_notebook_create_editable (GladeWidgetAdaptor * adaptor, } static gint -notebook_child_compare_func (GtkWidget * widget_a, GtkWidget * widget_b) +notebook_child_compare_func (GtkWidget *widget_a, GtkWidget *widget_b) { GladeWidget *gwidget_a, *gwidget_b; gint pos_a = 0, pos_b = 0; @@ -70,7 +70,7 @@ notebook_child_compare_func (GtkWidget * widget_a, GtkWidget * widget_b) } static gint -notebook_find_child (GtkWidget * check, gpointer cmp_pos_p) +notebook_find_child (GtkWidget *check, gpointer cmp_pos_p) { GladeWidget *gcheck; gint position = 0, cmp_pos = GPOINTER_TO_INT (cmp_pos_p); @@ -84,7 +84,7 @@ notebook_find_child (GtkWidget * check, gpointer cmp_pos_p) } static gint -notebook_search_tab (GtkNotebook * notebook, GtkWidget * tab) +notebook_search_tab (GtkNotebook *notebook, GtkWidget *tab) { GtkWidget *page; gint i; @@ -101,7 +101,7 @@ notebook_search_tab (GtkNotebook * notebook, GtkWidget * tab) } static GtkWidget * -notebook_get_filler (NotebookChildren * nchildren, gboolean page) +notebook_get_filler (NotebookChildren *nchildren, gboolean page) { GtkWidget *widget = NULL; @@ -134,7 +134,7 @@ notebook_get_filler (NotebookChildren * nchildren, gboolean page) } static GtkWidget * -notebook_get_page (NotebookChildren * nchildren, gint position) +notebook_get_page (NotebookChildren *nchildren, gint position) { GList *node; GtkWidget *widget = NULL; @@ -154,7 +154,7 @@ notebook_get_page (NotebookChildren * nchildren, gint position) } static GtkWidget * -notebook_get_tab (NotebookChildren * nchildren, gint position) +notebook_get_tab (NotebookChildren *nchildren, gint position) { GList *node; GtkWidget *widget = NULL; @@ -174,7 +174,7 @@ notebook_get_tab (NotebookChildren * nchildren, gint position) } static NotebookChildren * -glade_gtk_notebook_extract_children (GtkWidget * notebook) +glade_gtk_notebook_extract_children (GtkWidget *notebook) { NotebookChildren *nchildren; gchar *special_child_type; @@ -244,17 +244,17 @@ glade_gtk_notebook_extract_children (GtkWidget * notebook) GtkWidget *tab = gtk_notebook_get_tab_label (nb, page); if (tab) - g_object_ref (tab); + g_object_ref (tab); /* Explicitly remove the tab label first */ gtk_notebook_set_tab_label (nb, page, NULL); /* FIXE: we need to unparent here to avoid anoying warning when reparenting */ if (tab) - { - gtk_widget_unparent (tab); - g_object_unref (tab); - } + { + gtk_widget_unparent (tab); + g_object_unref (tab); + } gtk_notebook_remove_page (nb, 0); } @@ -266,8 +266,8 @@ glade_gtk_notebook_extract_children (GtkWidget * notebook) } static void -glade_gtk_notebook_insert_children (GtkWidget * notebook, - NotebookChildren * nchildren) +glade_gtk_notebook_insert_children (GtkWidget *notebook, + NotebookChildren *nchildren) { gint i; @@ -308,9 +308,10 @@ glade_gtk_notebook_insert_children (GtkWidget * notebook, } static void -glade_gtk_notebook_switch_page (GtkNotebook * notebook, - GtkWidget * page, - guint page_num, gpointer user_data) +glade_gtk_notebook_switch_page (GtkNotebook *notebook, + GtkWidget *page, + guint page_num, + gpointer user_data) { GladeWidget *gnotebook = glade_widget_get_from_gobject (notebook); @@ -322,8 +323,8 @@ glade_gtk_notebook_switch_page (GtkNotebook * notebook, * the selected widget. */ static void -glade_gtk_notebook_selection_changed (GladeProject * project, - GladeWidget * gwidget) +glade_gtk_notebook_selection_changed (GladeProject *project, + GladeWidget *gwidget) { GList *list; gint i; @@ -358,8 +359,9 @@ glade_gtk_notebook_selection_changed (GladeProject * project, } static void -glade_gtk_notebook_project_changed (GladeWidget * gwidget, - GParamSpec * pspec, gpointer userdata) +glade_gtk_notebook_project_changed (GladeWidget *gwidget, + GParamSpec *pspec, + gpointer userdata) { GladeProject * project = glade_widget_get_project (gwidget), @@ -381,7 +383,7 @@ glade_gtk_notebook_project_changed (GladeWidget * gwidget, } static void -glade_gtk_notebook_parse_finished (GladeProject * project, GObject * object) +glade_gtk_notebook_parse_finished (GladeProject *project, GObject *object) { GtkWidget *action; @@ -394,8 +396,9 @@ glade_gtk_notebook_parse_finished (GladeProject * project, GObject * object) } void -glade_gtk_notebook_post_create (GladeWidgetAdaptor * adaptor, - GObject * notebook, GladeCreateReason reason) +glade_gtk_notebook_post_create (GladeWidgetAdaptor *adaptor, + GObject *notebook, + GladeCreateReason reason) { GladeWidget *gwidget = glade_widget_get_from_gobject (notebook); GladeProject *project = glade_widget_get_project (gwidget); @@ -417,7 +420,7 @@ glade_gtk_notebook_post_create (GladeWidgetAdaptor * adaptor, } static gint -glade_gtk_notebook_get_first_blank_page (GtkNotebook * notebook) +glade_gtk_notebook_get_first_blank_page (GtkNotebook *notebook) { GladeWidget *gwidget; GtkWidget *widget; @@ -440,7 +443,7 @@ glade_gtk_notebook_get_first_blank_page (GtkNotebook * notebook) } static GladeWidget * -glade_gtk_notebook_generate_tab (GladeWidget * notebook, gint page_id) +glade_gtk_notebook_generate_tab (GladeWidget *notebook, gint page_id) { static GladeWidgetAdaptor *wadaptor = NULL; gchar *str; @@ -466,7 +469,7 @@ glade_gtk_notebook_generate_tab (GladeWidget * notebook, gint page_id) } static void -glade_gtk_notebook_set_n_pages (GObject * object, const GValue * value) +glade_gtk_notebook_set_n_pages (GObject *object, const GValue *value) { GladeWidget *widget; GtkNotebook *notebook; @@ -546,9 +549,10 @@ glade_gtk_notebook_set_n_pages (GObject * object, const GValue * value) } void -glade_gtk_notebook_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_notebook_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "pages")) glade_gtk_notebook_set_n_pages (object, value); @@ -584,8 +588,10 @@ glade_gtk_notebook_set_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_get_property (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * id, GValue * value) +glade_gtk_notebook_get_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + GValue *value) { if (!strcmp (id, "has-action-start")) { @@ -603,7 +609,7 @@ glade_gtk_notebook_get_property (GladeWidgetAdaptor * adaptor, } static gboolean -glade_gtk_notebook_verify_n_pages (GObject * object, const GValue * value) +glade_gtk_notebook_verify_n_pages (GObject *object, const GValue *value) { GtkNotebook *notebook = GTK_NOTEBOOK (object); GtkWidget *child_widget, *tab_widget; @@ -628,9 +634,10 @@ glade_gtk_notebook_verify_n_pages (GObject * object, const GValue * value) } gboolean -glade_gtk_notebook_verify_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_notebook_verify_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "pages")) return glade_gtk_notebook_verify_n_pages (object, value); @@ -642,8 +649,9 @@ glade_gtk_notebook_verify_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_notebook_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GtkNotebook *notebook; gint num_page, position = 0; @@ -742,8 +750,9 @@ glade_gtk_notebook_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_notebook_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { NotebookChildren *nchildren; gchar *special_child_type; @@ -793,9 +802,10 @@ glade_gtk_notebook_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_notebook_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { GtkNotebook *notebook; GladeWidget *gcurrent, *gnew; @@ -847,10 +857,11 @@ glade_gtk_notebook_replace_child (GladeWidgetAdaptor * adaptor, } gboolean -glade_gtk_notebook_child_verify_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * id, GValue * value) +glade_gtk_notebook_child_verify_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *id, + GValue *value) { if (!strcmp (id, "position")) return g_value_get_int (value) >= 0 && @@ -866,11 +877,11 @@ glade_gtk_notebook_child_verify_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - const GValue * value) +glade_gtk_notebook_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value) { NotebookChildren *nchildren; @@ -893,11 +904,11 @@ glade_gtk_notebook_set_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_notebook_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_notebook_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { gint position; @@ -1071,7 +1082,7 @@ glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor *adaptor, list.data = gtab; glade_command_paste (&list, parent, GLADE_PLACEHOLDER (tab_placeholder), - glade_widget_get_project (parent)); + glade_widget_get_project (parent)); } g_list_foreach (children, (GFunc) g_object_unref, NULL); diff --git a/plugins/gtk+/glade-gtk-notebook.h b/plugins/gtk+/glade-gtk-notebook.h index 2814b739..f0954591 100644 --- a/plugins/gtk+/glade-gtk-notebook.h +++ b/plugins/gtk+/glade-gtk-notebook.h @@ -27,10 +27,10 @@ G_BEGIN_DECLS void glade_gtk_box_notebook_child_insert_remove_action (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *object, - gboolean remove, - gboolean after); + GObject *container, + GObject *object, + gboolean remove, + gboolean after); G_END_DECLS diff --git a/plugins/gtk+/glade-gtk-overlay.c b/plugins/gtk+/glade-gtk-overlay.c index 8ccd3dc4..732b5e8f 100644 --- a/plugins/gtk+/glade-gtk-overlay.c +++ b/plugins/gtk+/glade-gtk-overlay.c @@ -136,16 +136,16 @@ glade_gtk_overlay_add_verify (GladeWidgetAdaptor *adaptor, if (!GTK_IS_WIDGET (child)) { if (user_feedback) - { - GladeWidgetAdaptor *widget_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_WIDGET); - - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (widget_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + { + GladeWidgetAdaptor *widget_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_WIDGET); + + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (widget_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } diff --git a/plugins/gtk+/glade-gtk-progress-bar.c b/plugins/gtk+/glade-gtk-progress-bar.c index 15929fa3..3a8f16eb 100644 --- a/plugins/gtk+/glade-gtk-progress-bar.c +++ b/plugins/gtk+/glade-gtk-progress-bar.c @@ -30,8 +30,8 @@ #define TEXT_DISABLED_MSG _("This progressbar does not show text") GladeEditable * -glade_gtk_progress_bar_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_progress_bar_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -42,9 +42,10 @@ glade_gtk_progress_bar_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_progress_bar_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_progress_bar_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); @@ -52,15 +53,15 @@ glade_gtk_progress_bar_set_property (GladeWidgetAdaptor * adaptor, if (strcmp (id, "show-text") == 0) { if (g_value_get_boolean (value)) - { - glade_widget_property_set_sensitive (widget, "text", TRUE, NULL); - glade_widget_property_set_sensitive (widget, "ellipsize", TRUE, NULL); - } + { + glade_widget_property_set_sensitive (widget, "text", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "ellipsize", TRUE, NULL); + } else - { - glade_widget_property_set_sensitive (widget, "text", FALSE, TEXT_DISABLED_MSG); - glade_widget_property_set_sensitive (widget, "ellipsize", FALSE, TEXT_DISABLED_MSG); - } + { + glade_widget_property_set_sensitive (widget, "text", FALSE, TEXT_DISABLED_MSG); + glade_widget_property_set_sensitive (widget, "ellipsize", FALSE, TEXT_DISABLED_MSG); + } } if (GPC_VERSION_CHECK (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1)) diff --git a/plugins/gtk+/glade-gtk-recent-chooser-menu.c b/plugins/gtk+/glade-gtk-recent-chooser-menu.c index fd925c08..d1aa8961 100644 --- a/plugins/gtk+/glade-gtk-recent-chooser-menu.c +++ b/plugins/gtk+/glade-gtk-recent-chooser-menu.c @@ -28,8 +28,8 @@ #include "glade-recent-chooser-menu-editor.h" GladeEditable * -glade_gtk_recent_chooser_menu_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_recent_chooser_menu_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_recent_chooser_menu_editor_new (); @@ -38,9 +38,10 @@ glade_gtk_recent_chooser_menu_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_recent_chooser_menu_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_recent_chooser_menu_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); diff --git a/plugins/gtk+/glade-gtk-recent-chooser-widget.c b/plugins/gtk+/glade-gtk-recent-chooser-widget.c index 1da09dd3..bc25394f 100644 --- a/plugins/gtk+/glade-gtk-recent-chooser-widget.c +++ b/plugins/gtk+/glade-gtk-recent-chooser-widget.c @@ -30,7 +30,7 @@ GladeEditable * glade_gtk_recent_chooser_widget_create_editable (GladeWidgetAdaptor *adaptor, - GladeEditorPageType type) + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_recent_chooser_widget_editor_new (); diff --git a/plugins/gtk+/glade-gtk-recent-file-filter.c b/plugins/gtk+/glade-gtk-recent-file-filter.c index 829c92cb..cc334860 100644 --- a/plugins/gtk+/glade-gtk-recent-file-filter.c +++ b/plugins/gtk+/glade-gtk-recent-file-filter.c @@ -42,9 +42,9 @@ typedef enum { static void glade_gtk_filter_read_strings (GladeWidget *widget, - GladeXmlNode *node, - FilterType type, - const gchar *property_name) + GladeXmlNode *node, + FilterType type, + const gchar *property_name) { GladeXmlNode *items_node; GladeXmlNode *item_node; @@ -76,19 +76,19 @@ glade_gtk_filter_read_strings (GladeWidget *widget, { for (item_node = glade_xml_node_get_children (items_node); - item_node; item_node = glade_xml_node_next (item_node)) - { - gchar *str; + item_node; item_node = glade_xml_node_next (item_node)) + { + gchar *str; - if (!glade_xml_node_verify (item_node, string_tag)) - continue; + if (!glade_xml_node_verify (item_node, string_tag)) + continue; if ((str = glade_xml_get_content (item_node)) == NULL) - continue; + continue; - string_list = glade_string_list_append (string_list, str, NULL, NULL, FALSE, NULL); - g_free (str); - } + string_list = glade_string_list_append (string_list, str, NULL, NULL, FALSE, NULL); + g_free (str); + } glade_widget_property_set (widget, property_name, string_list); glade_string_list_free (string_list); @@ -97,10 +97,10 @@ glade_gtk_filter_read_strings (GladeWidget *widget, static void glade_gtk_filter_write_strings (GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node, - FilterType type, - const gchar *property_name) + GladeXmlContext *context, + GladeXmlNode *node, + FilterType type, + const gchar *property_name) { GladeXmlNode *item_node; GList *string_list = NULL, *l; @@ -132,9 +132,9 @@ glade_gtk_filter_write_strings (GladeWidget *widget, } GladeEditorProperty * -glade_gtk_recent_file_filter_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - gboolean use_command) +glade_gtk_recent_file_filter_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -153,9 +153,9 @@ glade_gtk_recent_file_filter_create_eprop (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_recent_file_filter_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_recent_file_filter_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GParamSpec *pspec; @@ -174,11 +174,11 @@ glade_gtk_recent_file_filter_string_from_value (GladeWidgetAdaptor * adaptor, void glade_gtk_recent_filter_read_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -191,14 +191,14 @@ glade_gtk_recent_filter_read_widget (GladeWidgetAdaptor *adaptor, void glade_gtk_recent_filter_write_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *strings_node; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -223,7 +223,7 @@ glade_gtk_recent_filter_write_widget (GladeWidgetAdaptor *adaptor, strings_node = glade_xml_node_new (context, GLADE_TAG_APPLICATIONS); glade_gtk_filter_write_strings (widget, context, strings_node, - FILTER_APPLICATION, "glade-applications"); + FILTER_APPLICATION, "glade-applications"); if (!glade_xml_node_get_children (strings_node)) glade_xml_node_delete (strings_node); @@ -233,11 +233,11 @@ glade_gtk_recent_filter_write_widget (GladeWidgetAdaptor *adaptor, void glade_gtk_file_filter_read_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -249,14 +249,14 @@ glade_gtk_file_filter_read_widget (GladeWidgetAdaptor *adaptor, void glade_gtk_file_filter_write_widget (GladeWidgetAdaptor *adaptor, - GladeWidget *widget, - GladeXmlContext *context, - GladeXmlNode *node) + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *strings_node; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ diff --git a/plugins/gtk+/glade-gtk-scale.c b/plugins/gtk+/glade-gtk-scale.c index 4ed14c16..e134c5b0 100644 --- a/plugins/gtk+/glade-gtk-scale.c +++ b/plugins/gtk+/glade-gtk-scale.c @@ -30,8 +30,8 @@ #define DRAW_VALUE_DISABLED_MSG _("Scale is configured to not draw the value") GladeEditable * -glade_gtk_scale_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_scale_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -42,9 +42,10 @@ glade_gtk_scale_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_scale_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_scale_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); @@ -52,15 +53,15 @@ glade_gtk_scale_set_property (GladeWidgetAdaptor * adaptor, if (strcmp (id, "draw-value") == 0) { if (g_value_get_boolean (value)) - { - glade_widget_property_set_sensitive (widget, "digits", TRUE, NULL); - glade_widget_property_set_sensitive (widget, "value-pos", TRUE, NULL); - } + { + glade_widget_property_set_sensitive (widget, "digits", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "value-pos", TRUE, NULL); + } else - { - glade_widget_property_set_sensitive (widget, "digits", FALSE, DRAW_VALUE_DISABLED_MSG); - glade_widget_property_set_sensitive (widget, "value-pos", FALSE, DRAW_VALUE_DISABLED_MSG); - } + { + glade_widget_property_set_sensitive (widget, "digits", FALSE, DRAW_VALUE_DISABLED_MSG); + glade_widget_property_set_sensitive (widget, "value-pos", FALSE, DRAW_VALUE_DISABLED_MSG); + } } if (GPC_VERSION_CHECK (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1)) diff --git a/plugins/gtk+/glade-gtk-scrollbar.c b/plugins/gtk+/glade-gtk-scrollbar.c index 7ebde834..7de7ec16 100644 --- a/plugins/gtk+/glade-gtk-scrollbar.c +++ b/plugins/gtk+/glade-gtk-scrollbar.c @@ -28,8 +28,8 @@ #include "glade-scrollbar-editor.h" GladeEditable * -glade_gtk_scrollbar_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_scrollbar_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-scrolled-window.c b/plugins/gtk+/glade-gtk-scrolled-window.c index a4635e8c..3b160e5d 100644 --- a/plugins/gtk+/glade-gtk-scrolled-window.c +++ b/plugins/gtk+/glade-gtk-scrolled-window.c @@ -28,8 +28,8 @@ #include "glade-scrolled-window-editor.h" GladeEditable * -glade_gtk_scrolled_window_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_scrolled_window_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -40,9 +40,10 @@ glade_gtk_scrolled_window_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_scrolled_window_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_scrolled_window_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); @@ -50,10 +51,10 @@ glade_gtk_scrolled_window_set_property (GladeWidgetAdaptor * adaptor, if (strcmp (id, "window-placement-set") == 0) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (widget, "window-placement", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "window-placement", TRUE, NULL); else - glade_widget_property_set_sensitive (widget, "window-placement", FALSE, - _("This property is disabled")); + glade_widget_property_set_sensitive (widget, "window-placement", FALSE, + _("This property is disabled")); } else if (GPC_VERSION_CHECK (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1)) GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value); @@ -71,4 +72,4 @@ glade_gtk_scrolled_window_add_child_verify (GladeWidgetAdaptor *adaptor, return !glade_util_check_and_warn_scrollable (gcontainer, glade_widget_get_adaptor (gchild), glade_app_get_window ()); -}
\ No newline at end of file +} diff --git a/plugins/gtk+/glade-gtk-size-group.c b/plugins/gtk+/glade-gtk-size-group.c index 3ca480ae..3b312bc5 100644 --- a/plugins/gtk+/glade-gtk-size-group.c +++ b/plugins/gtk+/glade-gtk-size-group.c @@ -29,7 +29,7 @@ #define GLADE_TAG_SIZEGROUP_WIDGET "widget" static void -glade_gtk_size_group_read_widgets (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_size_group_read_widgets (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *widgets_node; GladeProperty *property; @@ -80,11 +80,12 @@ glade_gtk_size_group_read_widgets (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_size_group_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_size_group_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -95,9 +96,9 @@ glade_gtk_size_group_read_widget (GladeWidgetAdaptor * adaptor, static void -glade_gtk_size_group_write_widgets (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_size_group_write_widgets (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *widgets_node, *widget_node; GList *widgets = NULL, *list; @@ -127,13 +128,13 @@ glade_gtk_size_group_write_widgets (GladeWidget * widget, void -glade_gtk_size_group_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_size_group_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -144,10 +145,10 @@ glade_gtk_size_group_write_widget (GladeWidgetAdaptor * adaptor, void -glade_gtk_size_group_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_size_group_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (!strcmp (property_name, "widgets")) { diff --git a/plugins/gtk+/glade-gtk-spin-button.c b/plugins/gtk+/glade-gtk-spin-button.c index be6c1d2d..df7fe686 100644 --- a/plugins/gtk+/glade-gtk-spin-button.c +++ b/plugins/gtk+/glade-gtk-spin-button.c @@ -28,8 +28,8 @@ #include "glade-spin-button-editor.h" GladeEditable * -glade_gtk_spin_button_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_spin_button_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) return (GladeEditable *) glade_spin_button_editor_new (); @@ -38,7 +38,7 @@ glade_gtk_spin_button_create_editable (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_spin_button_set_adjustment (GObject * object, const GValue * value) +glade_gtk_spin_button_set_adjustment (GObject *object, const GValue *value) { GObject *adjustment; GtkAdjustment *adj; @@ -67,9 +67,10 @@ glade_gtk_spin_button_set_adjustment (GObject * object, const GValue * value) } void -glade_gtk_spin_button_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_spin_button_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "adjustment")) glade_gtk_spin_button_set_adjustment (object, value); diff --git a/plugins/gtk+/glade-gtk-table.c b/plugins/gtk+/glade-gtk-table.c index 4b515b69..71f395a8 100644 --- a/plugins/gtk+/glade-gtk-table.c +++ b/plugins/gtk+/glade-gtk-table.c @@ -60,9 +60,9 @@ typedef enum #define GTK_TABLE(obj) ((GtkTable *)obj) static void -glade_gtk_table_get_child_attachments (GtkWidget * table, - GtkWidget * child, - GtkTableChild * tchild) +glade_gtk_table_get_child_attachments (GtkWidget *table, + GtkWidget *child, + GtkTableChild *tchild) { guint left, right, top, bottom; @@ -80,8 +80,7 @@ glade_gtk_table_get_child_attachments (GtkWidget * table, } static gboolean -glade_gtk_table_widget_exceeds_bounds (GtkTable * table, gint n_rows, - gint n_cols) +glade_gtk_table_widget_exceeds_bounds (GtkTable *table, gint n_rows, gint n_cols) { GList *list, *children; gboolean ret = FALSE; @@ -112,43 +111,46 @@ glade_gtk_table_widget_exceeds_bounds (GtkTable * table, gint n_rows, (occmap)[row * n_columns + col] static void -glade_gtk_table_build_occupation_maps(GtkTable *table, guint n_columns, guint n_rows, - gchar **child_map, gpointer **placeholder_map) +glade_gtk_table_build_occupation_maps(GtkTable *table, + guint n_columns, + guint n_rows, + gchar **child_map, + gpointer **placeholder_map) { - guint i, j; - GList *list, *children = gtk_container_get_children (GTK_CONTAINER (table)); + guint i, j; + GList *list, *children = gtk_container_get_children (GTK_CONTAINER (table)); - *child_map = g_malloc0(n_columns * n_rows * sizeof(gchar)); /* gchar is smaller than gboolean */ - *placeholder_map = g_malloc0(n_columns * n_rows * sizeof(gpointer)); + *child_map = g_malloc0(n_columns * n_rows * sizeof(gchar)); /* gchar is smaller than gboolean */ + *placeholder_map = g_malloc0(n_columns * n_rows * sizeof(gpointer)); - for (list = children; list && list->data; list = list->next) + for (list = children; list && list->data; list = list->next) { - GtkTableChild child; - - glade_gtk_table_get_child_attachments (GTK_WIDGET (table), - GTK_WIDGET (list->data), &child); - - if (GLADE_IS_PLACEHOLDER(list->data)) - { - /* assumption: placeholders are always attached to exactly 1 cell */ - TABLE_OCCUPIED(*placeholder_map, n_columns, child.left_attach, child.top_attach) = list->data; - } - else - { - for (i = child.left_attach; i < child.right_attach && i < n_columns; i++) - { - for (j = child.top_attach; j < child.bottom_attach && j < n_rows; j++) - { - TABLE_OCCUPIED(*child_map, n_columns, i, j) = 1; - } - } - } + GtkTableChild child; + + glade_gtk_table_get_child_attachments (GTK_WIDGET (table), + GTK_WIDGET (list->data), &child); + + if (GLADE_IS_PLACEHOLDER(list->data)) + { + /* assumption: placeholders are always attached to exactly 1 cell */ + TABLE_OCCUPIED(*placeholder_map, n_columns, child.left_attach, child.top_attach) = list->data; + } + else + { + for (i = child.left_attach; i < child.right_attach && i < n_columns; i++) + { + for (j = child.top_attach; j < child.bottom_attach && j < n_rows; j++) + { + TABLE_OCCUPIED(*child_map, n_columns, i, j) = 1; + } + } + } } g_list_free (children); } static void -glade_gtk_table_refresh_placeholders (GtkTable * table) +glade_gtk_table_refresh_placeholders (GtkTable *table) { guint n_columns, n_rows, i, j; gchar *child_map; @@ -156,34 +158,34 @@ glade_gtk_table_refresh_placeholders (GtkTable * table) g_object_get (table, "n-columns", &n_columns, "n-rows", &n_rows, NULL); glade_gtk_table_build_occupation_maps (table, n_columns, n_rows, - &child_map, &placeholder_map); + &child_map, &placeholder_map); for (i = 0; i < n_columns; i++) { for (j = 0; j < n_rows; j++) - { - gpointer placeholder = TABLE_OCCUPIED(placeholder_map, n_columns, i, j); - - if (TABLE_OCCUPIED(child_map, n_columns, i, j)) - { - if (placeholder) - { - gtk_container_remove (GTK_CONTAINER (table), - GTK_WIDGET (placeholder)); - } - } - else - { - if (!placeholder) - { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - gtk_table_attach_defaults (table, - glade_placeholder_new (), - i, i + 1, j, j + 1); - G_GNUC_END_IGNORE_DEPRECATIONS; - } - } - } + { + gpointer placeholder = TABLE_OCCUPIED(placeholder_map, n_columns, i, j); + + if (TABLE_OCCUPIED(child_map, n_columns, i, j)) + { + if (placeholder) + { + gtk_container_remove (GTK_CONTAINER (table), + GTK_WIDGET (placeholder)); + } + } + else + { + if (!placeholder) + { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_table_attach_defaults (table, + glade_placeholder_new (), + i, i + 1, j, j + 1); + G_GNUC_END_IGNORE_DEPRECATIONS; + } + } + } } g_free(child_map); g_free(placeholder_map); @@ -193,7 +195,7 @@ glade_gtk_table_refresh_placeholders (GtkTable * table) } static void -gtk_table_children_callback (GtkWidget * widget, gpointer client_data) +gtk_table_children_callback (GtkWidget *widget, gpointer client_data) { GList **children; @@ -202,8 +204,8 @@ gtk_table_children_callback (GtkWidget * widget, gpointer client_data) } GList * -glade_gtk_table_get_children (GladeWidgetAdaptor * adaptor, - GtkContainer * container) +glade_gtk_table_get_children (GladeWidgetAdaptor *adaptor, + GtkContainer *container) { GList *children = NULL; @@ -214,8 +216,9 @@ glade_gtk_table_get_children (GladeWidgetAdaptor * adaptor, } void -glade_gtk_table_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_table_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (child)); @@ -223,8 +226,9 @@ glade_gtk_table_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_table_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_table_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child)); @@ -232,9 +236,10 @@ glade_gtk_table_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_table_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_table_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { /* Chain Up */ GWA_GET_CLASS @@ -256,8 +261,9 @@ glade_gtk_table_replace_child (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_table_set_n_common (GObject * object, const GValue * value, - gboolean for_rows) +glade_gtk_table_set_n_common (GObject *object, + const GValue *value, + gboolean for_rows) { GladeWidget *widget; GtkTable *table; @@ -351,9 +357,10 @@ glade_gtk_table_set_n_common (GObject * object, const GValue * value, } void -glade_gtk_table_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_table_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "n-rows")) glade_gtk_table_set_n_common (object, value, TRUE); @@ -365,8 +372,9 @@ glade_gtk_table_set_property (GladeWidgetAdaptor * adaptor, } static gboolean -glade_gtk_table_verify_n_common (GObject * object, const GValue * value, - gboolean for_rows) +glade_gtk_table_verify_n_common (GObject *object, + const GValue *value, + gboolean for_rows) { GtkTable *table = GTK_TABLE (object); guint n_columns, n_rows, new_size = g_value_get_uint (value); @@ -382,9 +390,10 @@ glade_gtk_table_verify_n_common (GObject * object, const GValue * value, } gboolean -glade_gtk_table_verify_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_table_verify_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "n-rows")) return glade_gtk_table_verify_n_common (object, value, TRUE); @@ -398,10 +407,11 @@ glade_gtk_table_verify_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_table_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, GValue * value) +glade_gtk_table_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor, @@ -420,13 +430,13 @@ glade_gtk_table_set_child_property (GladeWidgetAdaptor * adaptor, } static gboolean -glade_gtk_table_verify_attach_common (GObject * object, - GValue * value, - guint * val, - const gchar * prop, - guint * prop_val, - const gchar * parent_prop, - guint * parent_val) +glade_gtk_table_verify_attach_common (GObject *object, + GValue *value, + guint *val, + const gchar *prop, + guint *prop_val, + const gchar *parent_prop, + guint *parent_val) { GladeWidget *widget, *parent; @@ -443,10 +453,10 @@ glade_gtk_table_verify_attach_common (GObject * object, } static gboolean -glade_gtk_table_verify_left_top_attach (GObject * object, - GValue * value, - const gchar * prop, - const gchar * parent_prop) +glade_gtk_table_verify_left_top_attach (GObject *object, + GValue *value, + const gchar *prop, + const gchar *parent_prop) { guint val, prop_val, parent_val; @@ -462,10 +472,10 @@ glade_gtk_table_verify_left_top_attach (GObject * object, } static gboolean -glade_gtk_table_verify_right_bottom_attach (GObject * object, - GValue * value, - const gchar * prop, - const gchar * parent_prop) +glade_gtk_table_verify_right_bottom_attach (GObject *object, + GValue *value, + const gchar *prop, + const gchar *parent_prop) { guint val, prop_val, parent_val; @@ -481,10 +491,11 @@ glade_gtk_table_verify_right_bottom_attach (GObject * object, } gboolean -glade_gtk_table_child_verify_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * id, GValue * value) +glade_gtk_table_child_verify_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *id, + GValue *value) { if (!strcmp (id, "left-attach")) return glade_gtk_table_verify_left_top_attach (child, @@ -514,14 +525,14 @@ glade_gtk_table_child_verify_property (GladeWidgetAdaptor * adaptor, static void glade_gtk_table_child_insert_remove_action (GladeWidgetAdaptor *adaptor, - GObject *container, - GObject *object, - GroupAction group_action, - const gchar *n_row_col, - const gchar *attach1, /* should be smaller (top/left) attachment */ + GObject *container, + GObject *object, + GroupAction group_action, + const gchar *n_row_col, + const gchar *attach1, /* should be smaller (top/left) attachment */ const gchar *attach2, /* should be larger (bot/right) attachment */ gboolean remove, - gboolean after) + gboolean after) { GladeWidget *parent; GList *children, *l; @@ -656,10 +667,10 @@ glade_gtk_table_child_insert_remove_action (GladeWidgetAdaptor *adaptor, } void -glade_gtk_table_child_action_activate (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * object, - const gchar * action_path) +glade_gtk_table_child_action_activate (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "insert_row/after") == 0) { diff --git a/plugins/gtk+/glade-gtk-text-tag-table.c b/plugins/gtk+/glade-gtk-text-tag-table.c index e553ab16..2cebfa07 100644 --- a/plugins/gtk+/glade-gtk-text-tag-table.c +++ b/plugins/gtk+/glade-gtk-text-tag-table.c @@ -29,23 +29,23 @@ gboolean glade_gtk_text_tag_table_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_TEXT_TAG (child)) { if (user_feedback) - { - GladeWidgetAdaptor *tag_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_TEXT_TAG); + { + GladeWidgetAdaptor *tag_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_TEXT_TAG); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (tag_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (tag_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -54,8 +54,9 @@ glade_gtk_text_tag_table_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_text_tag_table_add_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_text_tag_table_add_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { if (GTK_IS_TEXT_TAG (child)) { @@ -75,8 +76,9 @@ glade_gtk_text_tag_table_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_text_tag_table_remove_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_text_tag_table_remove_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { if (GTK_IS_TEXT_TAG (child)) { @@ -96,17 +98,18 @@ glade_gtk_text_tag_table_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_text_tag_table_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_tag) +glade_gtk_text_tag_table_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_tag) { glade_gtk_text_tag_table_remove_child (adaptor, container, current); glade_gtk_text_tag_table_add_child (adaptor, container, new_tag); } GList * -glade_gtk_text_tag_table_get_children (GladeWidgetAdaptor * adaptor, - GObject * container) +glade_gtk_text_tag_table_get_children (GladeWidgetAdaptor *adaptor, + GObject *container) { GladeWidget *gtable = glade_widget_get_from_gobject (container); GList *tags = g_object_get_data (G_OBJECT (gtable), "glade-tags"); @@ -116,23 +119,23 @@ glade_gtk_text_tag_table_get_children (GladeWidgetAdaptor * adaptor, static void glade_gtk_text_tag_table_child_selected (GladeBaseEditor *editor, - GladeWidget *gchild, - gpointer data) + GladeWidget *gchild, + gpointer data) { glade_base_editor_add_label (editor, _("Tag")); - + glade_base_editor_add_default_properties (editor, gchild); - + glade_base_editor_add_label (editor, _("Properties")); glade_base_editor_add_editable (editor, gchild, GLADE_PAGE_GENERAL); } static gboolean glade_gtk_text_tag_table_move_child (GladeBaseEditor *editor, - GladeWidget *gparent, - GladeWidget *gchild, - gpointer data) -{ + GladeWidget *gparent, + GladeWidget *gchild, + gpointer data) +{ return FALSE; } @@ -145,22 +148,22 @@ glade_gtk_text_tag_table_launch_editor (GObject *table) /* Editor */ editor = glade_base_editor_new (glade_widget_get_object (widget), NULL, - _("Tag"), GTK_TYPE_TEXT_TAG, - NULL); + _("Tag"), GTK_TYPE_TEXT_TAG, + NULL); g_signal_connect (editor, "child-selected", G_CALLBACK (glade_gtk_text_tag_table_child_selected), NULL); g_signal_connect (editor, "move-child", G_CALLBACK (glade_gtk_text_tag_table_move_child), NULL); gtk_widget_show (GTK_WIDGET (editor)); - + window = glade_base_editor_pack_new_window (editor, _("Text Tag Table Editor"), NULL); gtk_widget_show (window); } void glade_gtk_text_tag_table_action_activate (GladeWidgetAdaptor *adaptor, - GObject *object, - const gchar *action_path) + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { diff --git a/plugins/gtk+/glade-gtk-text-view.c b/plugins/gtk+/glade-gtk-text-view.c index f835f401..015ad2c0 100644 --- a/plugins/gtk+/glade-gtk-text-view.c +++ b/plugins/gtk+/glade-gtk-text-view.c @@ -28,8 +28,8 @@ #include "glade-text-view-editor.h" GladeEditable * -glade_gtk_text_view_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_text_view_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -40,17 +40,18 @@ glade_gtk_text_view_create_editable (GladeWidgetAdaptor * adaptor, } static gboolean -glade_gtk_text_view_stop_double_click (GtkWidget * widget, - GdkEventButton * event, - gpointer user_data) +glade_gtk_text_view_stop_double_click (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) { /* Return True if the event is double or triple click */ return (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS); } void -glade_gtk_text_view_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_text_view_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { /* This makes gtk_text_view_set_buffer() stop complaing */ gtk_drag_dest_set (GTK_WIDGET (object), 0, NULL, 0, 0); @@ -61,10 +62,10 @@ glade_gtk_text_view_post_create (GladeWidgetAdaptor * adaptor, } void -glade_gtk_text_view_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * property_name, - const GValue * value) +glade_gtk_text_view_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "buffer") == 0) { diff --git a/plugins/gtk+/glade-gtk-tool-button.c b/plugins/gtk+/glade-gtk-tool-button.c index a1aa7f9b..406797c8 100644 --- a/plugins/gtk+/glade-gtk-tool-button.c +++ b/plugins/gtk+/glade-gtk-tool-button.c @@ -29,7 +29,7 @@ #include "glade-tool-button-editor.h" GladeEditable * -glade_gtk_tool_button_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_tool_button_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) @@ -39,7 +39,7 @@ glade_gtk_tool_button_create_editable (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_tool_button_set_image_mode (GObject * object, const GValue * value) +glade_gtk_tool_button_set_image_mode (GObject *object, const GValue *value) { GladeWidget *gbutton; @@ -67,7 +67,7 @@ glade_gtk_tool_button_set_image_mode (GObject * object, const GValue * value) } static void -glade_gtk_tool_button_set_custom_label (GObject * object, const GValue * value) +glade_gtk_tool_button_set_custom_label (GObject *object, const GValue *value) { GladeWidget *gbutton; @@ -89,7 +89,7 @@ glade_gtk_tool_button_set_custom_label (GObject * object, const GValue * value) } static void -glade_gtk_tool_button_set_label (GObject * object, const GValue * value) +glade_gtk_tool_button_set_label (GObject *object, const GValue *value) { const gchar *label; @@ -104,7 +104,7 @@ glade_gtk_tool_button_set_label (GObject * object, const GValue * value) } static void -glade_gtk_tool_button_set_stock_id (GObject * object, const GValue * value) +glade_gtk_tool_button_set_stock_id (GObject *object, const GValue *value) { const gchar *stock_id; @@ -121,7 +121,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_gtk_tool_button_set_icon_name (GObject * object, const GValue * value) +glade_gtk_tool_button_set_icon_name (GObject *object, const GValue *value) { const gchar *name; @@ -136,9 +136,10 @@ glade_gtk_tool_button_set_icon_name (GObject * object, const GValue * value) } void -glade_gtk_tool_button_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_tool_button_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "image-mode")) glade_gtk_tool_button_set_image_mode (object, value); @@ -156,8 +157,8 @@ glade_gtk_tool_button_set_property (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_tool_button_parse_finished (GladeProject * project, - GladeWidget * widget) +glade_gtk_tool_button_parse_finished (GladeProject *project, + GladeWidget *widget) { gchar *stock_str = NULL, *icon_name = NULL; gint stock_id = 0; @@ -194,11 +195,12 @@ glade_gtk_tool_button_parse_finished (GladeProject * project, } void -glade_gtk_tool_button_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_tool_button_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ diff --git a/plugins/gtk+/glade-gtk-tool-item-group.c b/plugins/gtk+/glade-gtk-tool-item-group.c index f8db7c4d..05e3368a 100644 --- a/plugins/gtk+/glade-gtk-tool-item-group.c +++ b/plugins/gtk+/glade-gtk-tool-item-group.c @@ -30,23 +30,23 @@ gboolean glade_gtk_tool_item_group_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_TOOL_ITEM (child)) { if (user_feedback) - { - GladeWidgetAdaptor *tool_item_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM); + { + GladeWidgetAdaptor *tool_item_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (tool_item_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (tool_item_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -55,22 +55,24 @@ glade_gtk_tool_item_group_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_tool_item_group_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_tool_item_group_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (child)); } void -glade_gtk_tool_item_group_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_tool_item_group_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child)); } static void -glade_gtk_tool_item_group_parse_finished (GladeProject * project, - GladeWidget * widget) +glade_gtk_tool_item_group_parse_finished (GladeProject *project, + GladeWidget *widget) { GtkWidget *label_widget = NULL; @@ -83,11 +85,12 @@ glade_gtk_tool_item_group_parse_finished (GladeProject * project, } void -glade_gtk_tool_item_group_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_tool_item_group_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -100,7 +103,7 @@ glade_gtk_tool_item_group_read_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_tool_item_group_set_custom_label (GObject * object, const GValue * value) +glade_gtk_tool_item_group_set_custom_label (GObject *object, const GValue *value) { GladeWidget *gbutton; @@ -118,9 +121,10 @@ glade_gtk_tool_item_group_set_custom_label (GObject * object, const GValue * val } void -glade_gtk_tool_item_group_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_tool_item_group_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { if (!strcmp (id, "custom-label")) glade_gtk_tool_item_group_set_custom_label (object, value); @@ -131,8 +135,8 @@ glade_gtk_tool_item_group_set_property (GladeWidgetAdaptor * adaptor, glade_widget_property_get (widget, "custom-label", &custom); if (!custom) - gtk_tool_item_group_set_label (GTK_TOOL_ITEM_GROUP (object), - g_value_get_string (value)); + gtk_tool_item_group_set_label (GTK_TOOL_ITEM_GROUP (object), + g_value_get_string (value)); } else if (!strcmp (id, "label-widget")) { @@ -142,14 +146,14 @@ glade_gtk_tool_item_group_set_property (GladeWidgetAdaptor * adaptor, glade_widget_property_get (widget, "custom-label", &custom); if (custom || (glade_util_object_is_loading (object) && label != NULL)) - gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (object), label); + gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (object), label); } else GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value); } GladeEditable * -glade_gtk_tool_item_group_create_editable (GladeWidgetAdaptor * adaptor, +glade_gtk_tool_item_group_create_editable (GladeWidgetAdaptor *adaptor, GladeEditorPageType type) { GladeEditable *editable; diff --git a/plugins/gtk+/glade-gtk-tool-item.c b/plugins/gtk+/glade-gtk-tool-item.c index 20fdd5b4..520ef53d 100644 --- a/plugins/gtk+/glade-gtk-tool-item.c +++ b/plugins/gtk+/glade-gtk-tool-item.c @@ -28,7 +28,7 @@ GObject * glade_gtk_tool_item_constructor (GType type, guint n_construct_properties, - GObjectConstructParam * construct_properties) + GObjectConstructParam *construct_properties) { GladeWidgetAdaptor *adaptor; GObject *ret_obj; @@ -47,7 +47,7 @@ glade_gtk_tool_item_constructor (GType type, void glade_gtk_tool_item_post_create (GladeWidgetAdaptor *adaptor, GObject *object, - GladeCreateReason reason) + GladeCreateReason reason) { if (GTK_IS_SEPARATOR_TOOL_ITEM (object)) return; @@ -58,9 +58,10 @@ glade_gtk_tool_item_post_create (GladeWidgetAdaptor *adaptor, } void -glade_gtk_tool_item_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_tool_item_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (gwidget, id); diff --git a/plugins/gtk+/glade-gtk-tool-palette.c b/plugins/gtk+/glade-gtk-tool-palette.c index f791a7bf..1e806218 100644 --- a/plugins/gtk+/glade-gtk-tool-palette.c +++ b/plugins/gtk+/glade-gtk-tool-palette.c @@ -30,8 +30,8 @@ #include "glade-gtk.h" GladeEditable * -glade_gtk_tool_palette_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_tool_palette_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -42,11 +42,11 @@ glade_gtk_tool_palette_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_tool_palette_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_tool_palette_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_TOOL_PALETTE (container)); if (GTK_IS_TOOL_ITEM_GROUP (child) == FALSE) @@ -56,7 +56,7 @@ glade_gtk_tool_palette_get_child_property (GladeWidgetAdaptor * adaptor, { g_value_set_int (value, gtk_tool_palette_get_group_position (GTK_TOOL_PALETTE (container), - GTK_TOOL_ITEM_GROUP (child))); + GTK_TOOL_ITEM_GROUP (child))); } else { /* Chain Up */ @@ -68,11 +68,11 @@ glade_gtk_tool_palette_get_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_tool_palette_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_tool_palette_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_TOOL_PALETTE (container)); g_return_if_fail (GTK_IS_TOOL_ITEM_GROUP (child)); @@ -106,23 +106,23 @@ glade_gtk_tool_palette_set_child_property (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_tool_palette_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_TOOL_ITEM_GROUP (child)) { if (user_feedback) - { - GladeWidgetAdaptor *tool_item_group_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM_GROUP); + { + GladeWidgetAdaptor *tool_item_group_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM_GROUP); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (tool_item_group_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (tool_item_group_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -131,8 +131,9 @@ glade_gtk_tool_palette_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_tool_palette_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_tool_palette_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GtkToolPalette *palette; GtkToolItemGroup *group; @@ -151,21 +152,22 @@ glade_gtk_tool_palette_add_child (GladeWidgetAdaptor * adaptor, /* Packing props arent around when parenting during a glade_widget_dup() */ if (gchild && glade_widget_get_packing_properties (gchild)) - glade_widget_pack_property_set (gchild, "position", - gtk_tool_palette_get_group_position (palette, group)); + glade_widget_pack_property_set (gchild, "position", + gtk_tool_palette_get_group_position (palette, group)); } } void -glade_gtk_tool_palette_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_tool_palette_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child)); } static void -glade_gtk_tool_palette_launch_editor (GladeWidgetAdaptor * adaptor, - GObject * palette) +glade_gtk_tool_palette_launch_editor (GladeWidgetAdaptor *adaptor, + GObject *palette) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS GType image_menu_item = GTK_TYPE_IMAGE_MENU_ITEM; @@ -175,8 +177,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS /* Editor */ editor = glade_base_editor_new (palette, NULL, - _("Group"), GTK_TYPE_TOOL_ITEM_GROUP, - NULL); + _("Group"), GTK_TYPE_TOOL_ITEM_GROUP, + NULL); glade_base_editor_append_types (editor, GTK_TYPE_TOOL_ITEM_GROUP, _("Button"), GTK_TYPE_TOOL_BUTTON, @@ -193,7 +195,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS _("Check"), GTK_TYPE_CHECK_MENU_ITEM, _("Radio"), GTK_TYPE_RADIO_MENU_ITEM, _("Separator"), GTK_TYPE_SEPARATOR_MENU_ITEM, - _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, + _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, NULL); glade_base_editor_append_types (editor, GTK_TYPE_MENU_ITEM, @@ -202,7 +204,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS _("Check"), GTK_TYPE_CHECK_MENU_ITEM, _("Radio"), GTK_TYPE_RADIO_MENU_ITEM, _("Separator"), GTK_TYPE_SEPARATOR_MENU_ITEM, - _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, + _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, NULL); g_signal_connect (editor, "get-display-name", @@ -227,8 +229,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_tool_palette_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * action_path) +glade_gtk_tool_palette_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { diff --git a/plugins/gtk+/glade-gtk-toolbar.c b/plugins/gtk+/glade-gtk-toolbar.c index b5a5a3d6..8f34b0f9 100644 --- a/plugins/gtk+/glade-gtk-toolbar.c +++ b/plugins/gtk+/glade-gtk-toolbar.c @@ -33,7 +33,7 @@ static void property_toolbar_style_notify_enabled (GladeProperty *property, GParamSpec *spec, - GtkWidget *widget) + GtkWidget *widget) { GtkToolbarStyle style; @@ -42,23 +42,23 @@ property_toolbar_style_notify_enabled (GladeProperty *property, glade_property_get (property, &style); if (GTK_IS_TOOLBAR (widget)) - gtk_toolbar_set_style (GTK_TOOLBAR (widget), style); + gtk_toolbar_set_style (GTK_TOOLBAR (widget), style); else if (GTK_IS_TOOL_PALETTE (widget)) - gtk_tool_palette_set_style (GTK_TOOL_PALETTE (widget), style); + gtk_tool_palette_set_style (GTK_TOOL_PALETTE (widget), style); } else { if (GTK_IS_TOOLBAR (widget)) - gtk_toolbar_unset_style (GTK_TOOLBAR (widget)); + gtk_toolbar_unset_style (GTK_TOOLBAR (widget)); else if (GTK_IS_TOOL_PALETTE (widget)) - gtk_tool_palette_unset_style (GTK_TOOL_PALETTE (widget)); + gtk_tool_palette_unset_style (GTK_TOOL_PALETTE (widget)); } } static void property_icon_size_notify_enabled (GladeProperty *property, - GParamSpec *spec, - GtkWidget *widget) + GParamSpec *spec, + GtkWidget *widget) { gint size; @@ -67,22 +67,23 @@ property_icon_size_notify_enabled (GladeProperty *property, glade_property_get (property, &size); if (GTK_IS_TOOLBAR (widget)) - gtk_toolbar_set_icon_size (GTK_TOOLBAR (widget), size); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (widget), size); else if (GTK_IS_TOOL_PALETTE (widget)) - gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (widget), size); + gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (widget), size); } else { if (GTK_IS_TOOLBAR (widget)) - gtk_toolbar_unset_icon_size (GTK_TOOLBAR (widget)); + gtk_toolbar_unset_icon_size (GTK_TOOLBAR (widget)); else if (GTK_IS_TOOL_PALETTE (widget)) - gtk_tool_palette_unset_icon_size (GTK_TOOL_PALETTE (widget)); + gtk_tool_palette_unset_icon_size (GTK_TOOL_PALETTE (widget)); } } void -glade_gtk_toolbar_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_toolbar_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *widget; GladeProperty *property; @@ -99,11 +100,11 @@ glade_gtk_toolbar_post_create (GladeWidgetAdaptor * adaptor, } void -glade_gtk_toolbar_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_toolbar_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_TOOLBAR (container)); if (GTK_IS_TOOL_ITEM (child) == FALSE) @@ -125,11 +126,11 @@ glade_gtk_toolbar_get_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_toolbar_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_toolbar_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { g_return_if_fail (GTK_IS_TOOLBAR (container)); g_return_if_fail (GTK_IS_TOOL_ITEM (child)); @@ -162,23 +163,23 @@ glade_gtk_toolbar_set_child_property (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_toolbar_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_TOOL_ITEM (child)) { if (user_feedback) - { - GladeWidgetAdaptor *tool_item_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM); + { + GladeWidgetAdaptor *tool_item_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_TOOL_ITEM); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (tool_item_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (tool_item_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -187,8 +188,9 @@ glade_gtk_toolbar_add_verify (GladeWidgetAdaptor *adaptor, } void -glade_gtk_toolbar_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_toolbar_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GtkToolbar *toolbar; GtkToolItem *item; @@ -214,15 +216,16 @@ glade_gtk_toolbar_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_toolbar_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_toolbar_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child)); } static void -glade_gtk_toolbar_launch_editor (GladeWidgetAdaptor * adaptor, - GObject * toolbar) +glade_gtk_toolbar_launch_editor (GladeWidgetAdaptor *adaptor, + GObject *toolbar) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS GType image_menu_item = GTK_TYPE_IMAGE_MENU_ITEM; @@ -255,7 +258,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS _("Check"), GTK_TYPE_CHECK_MENU_ITEM, _("Radio"), GTK_TYPE_RADIO_MENU_ITEM, _("Separator"), GTK_TYPE_SEPARATOR_MENU_ITEM, - _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, + _("Recent Menu"), GTK_TYPE_RECENT_CHOOSER_MENU, NULL); g_signal_connect (editor, "get-display-name", @@ -281,8 +284,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } void -glade_gtk_toolbar_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * action_path) +glade_gtk_toolbar_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { @@ -295,12 +299,13 @@ glade_gtk_toolbar_action_activate (GladeWidgetAdaptor * adaptor, /* Write the GtkIconSize as an integer */ void -glade_gtk_toolbar_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_toolbar_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and write all the normal properties (including "use-stock")... */ diff --git a/plugins/gtk+/glade-gtk-tree-view.c b/plugins/gtk+/glade-gtk-tree-view.c index cf1c6273..043c75e4 100644 --- a/plugins/gtk+/glade-gtk-tree-view.c +++ b/plugins/gtk+/glade-gtk-tree-view.c @@ -34,8 +34,8 @@ GladeEditable * -glade_gtk_treeview_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_treeview_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { @@ -47,23 +47,23 @@ glade_gtk_treeview_create_editable (GladeWidgetAdaptor * adaptor, gboolean glade_gtk_treeview_add_verify (GladeWidgetAdaptor *adaptor, - GtkWidget *container, - GtkWidget *child, - gboolean user_feedback) + GtkWidget *container, + GtkWidget *child, + gboolean user_feedback) { if (!GTK_IS_TREE_VIEW_COLUMN (child)) { if (user_feedback) - { - GladeWidgetAdaptor *cell_adaptor = - glade_widget_adaptor_get_by_type (GTK_TYPE_TREE_VIEW_COLUMN); + { + GladeWidgetAdaptor *cell_adaptor = + glade_widget_adaptor_get_by_type (GTK_TYPE_TREE_VIEW_COLUMN); - glade_util_ui_message (glade_app_get_window (), - GLADE_UI_INFO, NULL, - ONLY_THIS_GOES_IN_THAT_MSG, - glade_widget_adaptor_get_title (cell_adaptor), - glade_widget_adaptor_get_title (adaptor)); - } + glade_util_ui_message (glade_app_get_window (), + GLADE_UI_INFO, NULL, + ONLY_THIS_GOES_IN_THAT_MSG, + glade_widget_adaptor_get_title (cell_adaptor), + glade_widget_adaptor_get_title (adaptor)); + } return FALSE; } @@ -107,8 +107,9 @@ glade_gtk_treeview_launch_editor (GObject *treeview) } void -glade_gtk_treeview_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * action_path) +glade_gtk_treeview_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { if (strcmp (action_path, "launch_editor") == 0) { @@ -134,11 +135,11 @@ glade_gtk_treeview_get_column_index (GtkTreeView * view, } void -glade_gtk_treeview_get_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - GValue * value) +glade_gtk_treeview_get_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + GValue *value) { if (strcmp (property_name, "position") == 0) g_value_set_int (value, @@ -155,11 +156,11 @@ glade_gtk_treeview_get_child_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_treeview_set_child_property (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * child, - const gchar * property_name, - const GValue * value) +glade_gtk_treeview_set_child_property (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child, + const gchar *property_name, + const GValue *value) { if (strcmp (property_name, "position") == 0) { @@ -179,8 +180,8 @@ glade_gtk_treeview_set_child_property (GladeWidgetAdaptor * adaptor, } GList * -glade_gtk_treeview_get_children (GladeWidgetAdaptor * adaptor, - GtkTreeView * view) +glade_gtk_treeview_get_children (GladeWidgetAdaptor *adaptor, + GtkTreeView *view) { GList *children; @@ -195,7 +196,7 @@ glade_gtk_treeview_get_children (GladeWidgetAdaptor * adaptor, * to fixed size and then control the column's sensitivity accordingly. */ #define INSENSITIVE_COLUMN_SIZING_MSG \ - _("Columns must have a fixed size inside a treeview with fixed height mode set") + _("Columns must have a fixed size inside a treeview with fixed height mode set") void glade_gtk_treeview_add_child (GladeWidgetAdaptor * adaptor, @@ -223,8 +224,9 @@ glade_gtk_treeview_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_treeview_remove_child (GladeWidgetAdaptor * adaptor, - GObject * container, GObject * child) +glade_gtk_treeview_remove_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *child) { GtkTreeView *view = GTK_TREE_VIEW (container); GtkTreeViewColumn *column; @@ -237,9 +239,10 @@ glade_gtk_treeview_remove_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_treeview_replace_child (GladeWidgetAdaptor * adaptor, - GObject * container, - GObject * current, GObject * new_column) +glade_gtk_treeview_replace_child (GladeWidgetAdaptor *adaptor, + GObject *container, + GObject *current, + GObject *new_column) { GtkTreeView *view = GTK_TREE_VIEW (container); GList *columns; @@ -273,9 +276,10 @@ glade_gtk_treeview_replace_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_treeview_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_treeview_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *widget = glade_widget_get_from_gobject (object); GladeProperty *property = glade_widget_get_property (widget, id); @@ -283,23 +287,23 @@ glade_gtk_treeview_set_property (GladeWidgetAdaptor * adaptor, if (strcmp (id, "enable-search") == 0) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (widget, "search-column", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "search-column", TRUE, NULL); else - glade_widget_property_set_sensitive (widget, "search-column", FALSE, _("Search is disabled")); + glade_widget_property_set_sensitive (widget, "search-column", FALSE, _("Search is disabled")); } else if (strcmp (id, "headers-visible") == 0) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (widget, "headers-clickable", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "headers-clickable", TRUE, NULL); else - glade_widget_property_set_sensitive (widget, "headers-clickable", FALSE, _("Headers are invisible")); + glade_widget_property_set_sensitive (widget, "headers-clickable", FALSE, _("Headers are invisible")); } else if (strcmp (id, "show-expanders") == 0) { if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (widget, "expander-column", TRUE, NULL); + glade_widget_property_set_sensitive (widget, "expander-column", TRUE, NULL); else - glade_widget_property_set_sensitive (widget, "expander-column", FALSE, _("Expanders are not shown")); + glade_widget_property_set_sensitive (widget, "expander-column", FALSE, _("Expanders are not shown")); } if (GPC_VERSION_CHECK (glade_property_get_class (property), gtk_major_version, gtk_minor_version + 1)) diff --git a/plugins/gtk+/glade-gtk-viewport.c b/plugins/gtk+/glade-gtk-viewport.c index 40b555ff..d18630e0 100644 --- a/plugins/gtk+/glade-gtk-viewport.c +++ b/plugins/gtk+/glade-gtk-viewport.c @@ -28,8 +28,8 @@ #include "glade-viewport-editor.h" GladeEditable * -glade_gtk_viewport_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_viewport_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { if (type == GLADE_PAGE_GENERAL) { diff --git a/plugins/gtk+/glade-gtk-widget.c b/plugins/gtk+/glade-gtk-widget.c index 49f4e28f..3ecf9e6b 100644 --- a/plugins/gtk+/glade-gtk-widget.c +++ b/plugins/gtk+/glade-gtk-widget.c @@ -75,8 +75,8 @@ static const gchar *atk_relations_list[] = { void -glade_gtk_widget_destroy_object (GladeWidgetAdaptor * adaptor, - GObject *object) +glade_gtk_widget_destroy_object (GladeWidgetAdaptor *adaptor, + GObject *object) { gtk_widget_destroy (GTK_WIDGET (object)); @@ -84,7 +84,7 @@ glade_gtk_widget_destroy_object (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_parse_atk_relation (GladeProperty * property, GladeXmlNode * node) +glade_gtk_parse_atk_relation (GladeProperty *property, GladeXmlNode *node) { GladeXmlNode *prop; GladePropertyClass *pclass; @@ -139,13 +139,13 @@ glade_gtk_parse_atk_relation (GladeProperty * property, GladeXmlNode * node) if (string) { g_object_set_data_full (G_OBJECT (property), "glade-loaded-object", - /* 'string' here is already allocated on the heap */ + /* 'string' here is already allocated on the heap */ string, g_free); } } static void -glade_gtk_parse_atk_props (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_parse_atk_props (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *prop; GladeProperty *property; @@ -207,7 +207,7 @@ glade_gtk_parse_atk_props (GladeWidget * widget, GladeXmlNode * node) /* Set the parsed value on the property ... */ gvalue = glade_property_class_make_gvalue_from_string - (glade_property_get_class (property), value, glade_widget_get_project (widget)); + (glade_property_get_class (property), value, glade_widget_get_project (widget)); glade_property_set_value (property, gvalue); g_value_unset (gvalue); g_free (gvalue); @@ -229,7 +229,7 @@ glade_gtk_parse_atk_props (GladeWidget * widget, GladeXmlNode * node) } static void -glade_gtk_parse_atk_props_gtkbuilder (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_parse_atk_props_gtkbuilder (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *child, *object_node; gchar *internal; @@ -257,7 +257,7 @@ glade_gtk_parse_atk_props_gtkbuilder (GladeWidget * widget, GladeXmlNode * node) } static void -glade_gtk_widget_read_atk_props (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_widget_read_atk_props (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *atk_node; GladeProperty *property; @@ -283,7 +283,7 @@ glade_gtk_widget_read_atk_props (GladeWidget * widget, GladeXmlNode * node) } static void -glade_gtk_widget_read_style_classes (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_widget_read_style_classes (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *style_node; GladeXmlNode *class_node; @@ -292,19 +292,19 @@ glade_gtk_widget_read_style_classes (GladeWidget * widget, GladeXmlNode * node) if ((style_node = glade_xml_search_child (node, GLADE_TAG_STYLE)) != NULL) { for (class_node = glade_xml_node_get_children (style_node); - class_node; class_node = glade_xml_node_next (class_node)) - { - gchar *name; + class_node; class_node = glade_xml_node_next (class_node)) + { + gchar *name; - if (!glade_xml_node_verify (class_node, GLADE_TAG_CLASS)) - continue; + if (!glade_xml_node_verify (class_node, GLADE_TAG_CLASS)) + continue; - name = glade_xml_get_property_string (class_node, GLADE_TAG_NAME); + name = glade_xml_get_property_string (class_node, GLADE_TAG_NAME); - string_list = glade_string_list_append (string_list, name, NULL, NULL, FALSE, NULL); + string_list = glade_string_list_append (string_list, name, NULL, NULL, FALSE, NULL); - g_free (name); - } + g_free (name); + } glade_widget_property_set (widget, "glade-style-classes", string_list); glade_string_list_free (string_list); @@ -312,13 +312,14 @@ glade_gtk_widget_read_style_classes (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_widget_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_widget_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { const gchar *tooltip_markup = NULL; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -340,9 +341,9 @@ glade_gtk_widget_read_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_widget_write_atk_property (GladeProperty * property, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_property (GladeProperty *property, + GladeXmlContext *context, + GladeXmlNode *node) { gchar *value = glade_property_make_string (property); @@ -378,9 +379,9 @@ glade_gtk_widget_write_atk_property (GladeProperty * property, } static void -glade_gtk_widget_write_atk_properties (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_properties (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *child_node, *object_node; GladeProperty *name_prop, *desc_prop, *role_prop; @@ -431,9 +432,9 @@ glade_gtk_widget_write_atk_properties (GladeWidget * widget, } static void -glade_gtk_widget_write_atk_relation (GladeProperty * property, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_relation (GladeProperty *property, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *prop_node; GladePropertyClass *pclass; @@ -448,7 +449,7 @@ glade_gtk_widget_write_atk_relation (GladeProperty * property, { for (i = 0; split[i] != NULL; i++) { - pclass = glade_property_get_class (property); + pclass = glade_property_get_class (property); prop_node = glade_xml_node_new (context, GLADE_TAG_A11Y_RELATION); glade_xml_node_append_child (node, prop_node); @@ -466,9 +467,9 @@ glade_gtk_widget_write_atk_relation (GladeProperty * property, } static void -glade_gtk_widget_write_atk_relations (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_relations (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *property; gint i; @@ -485,9 +486,9 @@ glade_gtk_widget_write_atk_relations (GladeWidget * widget, } static void -glade_gtk_widget_write_atk_action (GladeProperty * property, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_action (GladeProperty *property, + GladeXmlContext *context, + GladeXmlNode *node) { gchar *value = glade_property_make_string (property); @@ -508,9 +509,9 @@ glade_gtk_widget_write_atk_action (GladeProperty * property, } static void -glade_gtk_widget_write_atk_actions (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_actions (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *property; @@ -525,9 +526,9 @@ glade_gtk_widget_write_atk_actions (GladeWidget * widget, } static void -glade_gtk_widget_write_atk_props (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_atk_props (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *atk_node; @@ -546,9 +547,9 @@ glade_gtk_widget_write_atk_props (GladeWidget * widget, static void -glade_gtk_widget_write_style_classes (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_widget_write_style_classes (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *class_node, *style_node; GList *string_list = NULL, *l; @@ -567,8 +568,8 @@ glade_gtk_widget_write_style_classes (GladeWidget * widget, glade_xml_node_append_child (style_node, class_node); glade_xml_node_set_property_string (class_node, - GLADE_TAG_NAME, - string->string); + GLADE_TAG_NAME, + string->string); } if (!glade_xml_node_get_children (style_node)) @@ -578,14 +579,15 @@ glade_gtk_widget_write_style_classes (GladeWidget * widget, } void -glade_gtk_widget_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_widget_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeProperty *prop; if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* Make sure use-action-appearance and related-action properties are @@ -603,9 +605,10 @@ glade_gtk_widget_write_widget (GladeWidgetAdaptor * adaptor, } void -glade_gtk_widget_write_widget_after (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_widget_write_widget_after (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { /* The ATK properties are actually children */ glade_gtk_widget_write_atk_props (widget, context, node); @@ -619,8 +622,9 @@ glade_gtk_widget_write_widget_after (GladeWidgetAdaptor * adaptor, } GladeEditorProperty * -glade_gtk_widget_create_eprop (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, gboolean use_command) +glade_gtk_widget_create_eprop (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + gboolean use_command) { GladeEditorProperty *eprop; GParamSpec *pspec; @@ -642,8 +646,8 @@ glade_gtk_widget_create_eprop (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_widget_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_widget_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { GladeEditable *editable; @@ -657,9 +661,9 @@ glade_gtk_widget_create_editable (GladeWidgetAdaptor * adaptor, } gchar * -glade_gtk_widget_string_from_value (GladeWidgetAdaptor * adaptor, - GladePropertyClass * klass, - const GValue * value) +glade_gtk_widget_string_from_value (GladeWidgetAdaptor *adaptor, + GladePropertyClass *klass, + const GValue *value) { GParamSpec *pspec; @@ -679,8 +683,9 @@ glade_gtk_widget_string_from_value (GladeWidgetAdaptor * adaptor, } static void -widget_parent_changed (GtkWidget * widget, - GParamSpec * pspec, GladeWidgetAdaptor * adaptor) +widget_parent_changed (GtkWidget *widget, + GParamSpec *pspec, + GladeWidgetAdaptor *adaptor) { GladeWidget *gwidget = glade_widget_get_from_gobject (widget); GladeWidget *parent; @@ -699,8 +704,9 @@ widget_parent_changed (GtkWidget * widget, } void -glade_gtk_widget_deep_post_create (GladeWidgetAdaptor * adaptor, - GObject * widget, GladeCreateReason reason) +glade_gtk_widget_deep_post_create (GladeWidgetAdaptor *adaptor, + GObject *widget, + GladeCreateReason reason) { GladeWidget *gwidget = glade_widget_get_from_gobject (widget); @@ -724,9 +730,10 @@ glade_gtk_widget_deep_post_create (GladeWidgetAdaptor * adaptor, } void -glade_gtk_widget_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_widget_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { /* FIXME: is this still needed with the new gtk+ tooltips? */ if (!strcmp (id, "tooltip")) @@ -748,16 +755,16 @@ glade_gtk_widget_set_property (GladeWidgetAdaptor * adaptor, */ styles = g_object_get_data (object, "glade-style-classes"); for (l = styles; l; l = g_list_next (l)) - { - GladeString *style = l->data; + { + GladeString *style = l->data; gtk_style_context_remove_class (context, style->string); - } + } for (l = g_value_get_boxed (value); l; l = g_list_next (l)) - { - GladeString *style = l->data; - gtk_style_context_add_class (context, style->string); - } + { + GladeString *style = l->data; + gtk_style_context_add_class (context, style->string); + } /* Save the list here so we can use it later on to remove them from the style context */ g_object_set_data_full (object, "glade-style-classes", @@ -783,7 +790,7 @@ glade_gtk_widget_get_property (GladeWidgetAdaptor * adaptor, static GList * -create_command_property_list (GladeWidget * gnew, GList * saved_props) +create_command_property_list (GladeWidget *gnew, GList *saved_props) { GList *l, *command_properties = NULL; @@ -792,7 +799,7 @@ create_command_property_list (GladeWidget * gnew, GList * saved_props) GladeProperty *property = l->data; GladePropertyClass *pclass = glade_property_get_class (property); GladeProperty *orig_prop = - glade_widget_get_pack_property (gnew, glade_property_class_id (pclass)); + glade_widget_get_pack_property (gnew, glade_property_class_id (pclass)); GCSetPropData *pdata = g_new0 (GCSetPropData, 1); pdata->property = orig_prop; @@ -809,8 +816,9 @@ create_command_property_list (GladeWidget * gnew, GList * saved_props) void -glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * action_path) +glade_gtk_widget_action_activate (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { GladeWidget *gwidget = glade_widget_get_from_gobject (object), *gparent; GList this_widget = { 0, }, that_widget = { 0,}; @@ -858,7 +866,7 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, /* If the parent had a parentless widget reference, undoably add the child * as the new parentless widget reference here */ if (property) - glade_command_set_property (property, glade_widget_get_object (gwidget)); + glade_command_set_property (property, glade_widget_get_object (gwidget)); glade_command_pop_group (); } @@ -895,22 +903,22 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, GladeWidgetAdaptor *adaptor = glade_widget_adaptor_get_by_type (new_type); GList *saved_props, *prop_cmds; - GladeWidget *gnew_parent; + GladeWidget *gnew_parent; GladeProperty *property; glade_command_push_group (_("Adding parent %s for %s"), glade_widget_adaptor_get_title (adaptor), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* Record packing properties */ saved_props = - glade_widget_dup_properties (gwidget, glade_widget_get_packing_properties (gwidget), - FALSE, FALSE, FALSE); + glade_widget_dup_properties (gwidget, glade_widget_get_packing_properties (gwidget), + FALSE, FALSE, FALSE); - property = glade_widget_get_parentless_widget_ref (gwidget); + property = glade_widget_get_parentless_widget_ref (gwidget); - /* Remove "this" widget, If the parent we're removing is a parentless - * widget reference, the reference will be implicitly broken by the 'cut' command */ + /* Remove "this" widget, If the parent we're removing is a parentless + * widget reference, the reference will be implicitly broken by the 'cut' command */ this_widget.data = gwidget; glade_command_delete (&this_widget); @@ -918,10 +926,10 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, if ((gnew_parent = glade_command_create (adaptor, gparent, NULL, project)) != NULL) { - /* Now we created the new parent, if gwidget had a parentless widget reference... - * set that reference to the new parent instead */ - if (property) - glade_command_set_property (property, glade_widget_get_object (gnew_parent)); + /* Now we created the new parent, if gwidget had a parentless widget reference... + * set that reference to the new parent instead */ + if (property) + glade_command_set_property (property, glade_widget_get_object (gnew_parent)); /* Remove the alignment that we added in the frame's post_create... */ if (new_type == GTK_TYPE_FRAME) @@ -942,7 +950,7 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, /* Apply the properties in an undoable way */ if (prop_cmds) glade_command_set_properties_list - (glade_widget_get_project (gparent), prop_cmds); + (glade_widget_get_project (gparent), prop_cmds); /* Add "this" widget to the new parent */ glade_command_add (&this_widget, gnew_parent, NULL, project, FALSE); @@ -950,7 +958,7 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, glade_command_pop_group (); } else - { + { glade_command_pop_group (); /* Undo delete command @@ -961,8 +969,8 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, * Ideally we need a way to remove a redo item from the project or * simply do not let the user cancel a widget creation! */ - glade_project_undo (project); - } + glade_project_undo (project); + } g_list_foreach (saved_props, (GFunc) g_object_unref, NULL); g_list_free (saved_props); @@ -988,7 +996,7 @@ glade_gtk_widget_action_activate (GladeWidgetAdaptor * adaptor, } static GList * -list_sizegroups (GladeWidget * gwidget) +list_sizegroups (GladeWidget *gwidget) { GladeProject *project = glade_widget_get_project (gwidget); GList *groups = NULL; @@ -1004,7 +1012,7 @@ list_sizegroups (GladeWidget * gwidget) } static void -glade_gtk_widget_add2group_cb (GtkMenuItem * item, GladeWidget * gwidget) +glade_gtk_widget_add2group_cb (GtkMenuItem *item, GladeWidget *gwidget) { GladeWidget *group = g_object_get_data (G_OBJECT (item), "glade-group-widget"); @@ -1021,20 +1029,20 @@ glade_gtk_widget_add2group_cb (GtkMenuItem * item, GladeWidget * gwidget) { size_group_name = glade_widget_get_name (group); if (g_str_has_prefix (size_group_name, GLADE_UNNAMED_PREFIX)) - size_group_name = _("(unnamed)"); + size_group_name = _("(unnamed)"); } /* Ensure the widget has a name if it's going to be referred to by a size group */ current_name = glade_widget_get_name (gwidget); if (g_str_has_prefix (current_name, GLADE_UNNAMED_PREFIX)) widget_name = glade_project_new_widget_name (glade_widget_get_project (gwidget), NULL, - glade_widget_adaptor_get_generic_name (glade_widget_get_adaptor (gwidget))); + glade_widget_adaptor_get_generic_name (glade_widget_get_adaptor (gwidget))); else widget_name = g_strdup (current_name); if (group) glade_command_push_group (_("Adding %s to Size Group %s"), - widget_name, + widget_name, size_group_name); else glade_command_push_group (_("Adding %s to a new Size Group"), @@ -1063,8 +1071,9 @@ glade_gtk_widget_add2group_cb (GtkMenuItem * item, GladeWidget * gwidget) GtkWidget * -glade_gtk_widget_action_submenu (GladeWidgetAdaptor * adaptor, - GObject * object, const gchar * action_path) +glade_gtk_widget_action_submenu (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *action_path) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); GList *groups, *list; @@ -1082,11 +1091,11 @@ glade_gtk_widget_action_submenu (GladeWidgetAdaptor * adaptor, { group = list->data; - size_group_name = glade_widget_get_name (group); - if (g_str_has_prefix (size_group_name, GLADE_UNNAMED_PREFIX)) - size_group_name = _("(unnamed)"); + size_group_name = glade_widget_get_name (group); + if (g_str_has_prefix (size_group_name, GLADE_UNNAMED_PREFIX)) + size_group_name = _("(unnamed)"); - item = gtk_menu_item_new_with_label (size_group_name); + item = gtk_menu_item_new_with_label (size_group_name); g_object_set_data (G_OBJECT (item), "glade-group-widget", group); g_signal_connect (G_OBJECT (item), "activate", diff --git a/plugins/gtk+/glade-gtk-window.c b/plugins/gtk+/glade-gtk-window.c index a88fee82..53604a90 100644 --- a/plugins/gtk+/glade-gtk-window.c +++ b/plugins/gtk+/glade-gtk-window.c @@ -39,7 +39,7 @@ #define CSD_DISABLED_MESSAGE _("This property does not apply to client-side decorated windows") static void -glade_gtk_window_parse_finished (GladeProject * project, GObject * object) +glade_gtk_window_parse_finished (GladeProject *project, GObject *object) { GtkWidget *titlebar = gtk_window_get_titlebar(GTK_WINDOW (object)); glade_widget_property_set (glade_widget_get_from_gobject (object), "use-csd", @@ -62,8 +62,9 @@ glade_gtk_window_ensure_titlebar_placeholder (GObject *window) } void -glade_gtk_window_post_create (GladeWidgetAdaptor * adaptor, - GObject * object, GladeCreateReason reason) +glade_gtk_window_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) { GladeWidget *parent = glade_widget_get_from_gobject (object); GladeProject *project = glade_widget_get_project (parent); @@ -93,7 +94,7 @@ glade_gtk_window_post_create (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_window_read_accel_groups (GladeWidget * widget, GladeXmlNode * node) +glade_gtk_window_read_accel_groups (GladeWidget *widget, GladeXmlNode *node) { GladeXmlNode *groups_node; GladeProperty *property; @@ -143,11 +144,12 @@ glade_gtk_window_read_accel_groups (GladeWidget * widget, GladeXmlNode * node) } void -glade_gtk_window_read_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, GladeXmlNode * node) +glade_gtk_window_read_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) return; /* First chain up and read in all the normal properties.. */ @@ -163,9 +165,9 @@ glade_gtk_window_read_widget (GladeWidgetAdaptor * adaptor, } static void -glade_gtk_window_write_accel_groups (GladeWidget * widget, - GladeXmlContext * context, - GladeXmlNode * node) +glade_gtk_window_write_accel_groups (GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { GladeXmlNode *groups_node, *group_node; GList *groups = NULL, *list; @@ -194,9 +196,10 @@ glade_gtk_window_write_accel_groups (GladeWidget * widget, void -glade_gtk_window_write_widget (GladeWidgetAdaptor * adaptor, - GladeWidget * widget, - GladeXmlContext * context, GladeXmlNode * node) +glade_gtk_window_write_widget (GladeWidgetAdaptor *adaptor, + GladeWidget *widget, + GladeXmlContext *context, + GladeXmlNode *node) { if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) @@ -210,8 +213,8 @@ glade_gtk_window_write_widget (GladeWidgetAdaptor * adaptor, } GladeEditable * -glade_gtk_window_create_editable (GladeWidgetAdaptor * adaptor, - GladeEditorPageType type) +glade_gtk_window_create_editable (GladeWidgetAdaptor *adaptor, + GladeEditorPageType type) { GladeEditable *editable; @@ -226,17 +229,17 @@ glade_gtk_window_create_editable (GladeWidgetAdaptor * adaptor, GType window_type = glade_widget_adaptor_get_object_type (adaptor); if (g_type_is_a (window_type, GTK_TYPE_ABOUT_DIALOG)) - editable = (GladeEditable *) glade_about_dialog_editor_new (); + editable = (GladeEditable *) glade_about_dialog_editor_new (); else if (g_type_is_a (window_type, GTK_TYPE_FILE_CHOOSER_DIALOG)) - editable = (GladeEditable *) glade_file_chooser_dialog_editor_new (); + editable = (GladeEditable *) glade_file_chooser_dialog_editor_new (); else if (g_type_is_a (window_type, GTK_TYPE_FONT_CHOOSER_DIALOG)) - editable = (GladeEditable *) glade_font_chooser_dialog_editor_new (); + editable = (GladeEditable *) glade_font_chooser_dialog_editor_new (); else if (g_type_is_a (window_type, GTK_TYPE_RECENT_CHOOSER_DIALOG)) - editable = (GladeEditable *) glade_recent_chooser_dialog_editor_new (); + editable = (GladeEditable *) glade_recent_chooser_dialog_editor_new (); else if (g_type_is_a (window_type, GTK_TYPE_MESSAGE_DIALOG)) - editable = (GladeEditable *) glade_message_dialog_editor_new (); + editable = (GladeEditable *) glade_message_dialog_editor_new (); else - editable = (GladeEditable *) glade_window_editor_new (); + editable = (GladeEditable *) glade_window_editor_new (); } else editable = GWA_GET_CLASS (GTK_TYPE_WIDGET)->create_editable (adaptor, type); @@ -245,9 +248,10 @@ glade_gtk_window_create_editable (GladeWidgetAdaptor * adaptor, } void -glade_gtk_window_set_property (GladeWidgetAdaptor * adaptor, - GObject * object, - const gchar * id, const GValue * value) +glade_gtk_window_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); @@ -257,9 +261,9 @@ glade_gtk_window_set_property (GladeWidgetAdaptor * adaptor, glade_widget_property_set_sensitive (gwidget, "icon-name", FALSE, NOT_SELECTED_MSG); if (g_value_get_boolean (value)) - glade_widget_property_set_sensitive (gwidget, "icon-name", TRUE, NULL); + glade_widget_property_set_sensitive (gwidget, "icon-name", TRUE, NULL); else - glade_widget_property_set_sensitive (gwidget, "icon", TRUE, NULL); + glade_widget_property_set_sensitive (gwidget, "icon", TRUE, NULL); } else if (!strcmp (id, "use-csd")) { @@ -291,9 +295,10 @@ glade_gtk_window_set_property (GladeWidgetAdaptor * adaptor, } void -glade_gtk_window_replace_child (GladeWidgetAdaptor * adaptor, - GtkWidget * container, - GtkWidget * current, GtkWidget * new_widget) +glade_gtk_window_replace_child (GladeWidgetAdaptor *adaptor, + GtkWidget *container, + GtkWidget *current, + GtkWidget *new_widget) { gchar *special_child_type; @@ -315,8 +320,9 @@ glade_gtk_window_replace_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_window_add_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_window_add_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { GtkWidget *bin_child; gchar *special_child_type; @@ -347,8 +353,9 @@ glade_gtk_window_add_child (GladeWidgetAdaptor * adaptor, } void -glade_gtk_window_remove_child (GladeWidgetAdaptor * adaptor, - GObject * object, GObject * child) +glade_gtk_window_remove_child (GladeWidgetAdaptor *adaptor, + GObject *object, + GObject *child) { gchar *special_child_type; GtkWidget *placeholder; diff --git a/plugins/gtk+/glade-header-bar-editor.h b/plugins/gtk+/glade-header-bar-editor.h index 865b5161..1420a47c 100644 --- a/plugins/gtk+/glade-header-bar-editor.h +++ b/plugins/gtk+/glade-header-bar-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_HEADER_BAR_EDITOR (glade_header_bar_editor_get_type ()) -#define GLADE_HEADER_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditor)) -#define GLADE_HEADER_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditorClass)) -#define GLADE_IS_HEADER_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_HEADER_BAR_EDITOR)) -#define GLADE_IS_HEADER_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_HEADER_BAR_EDITOR)) -#define GLADE_HEADER_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditorClass)) +#define GLADE_TYPE_HEADER_BAR_EDITOR (glade_header_bar_editor_get_type ()) +#define GLADE_HEADER_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditor)) +#define GLADE_HEADER_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditorClass)) +#define GLADE_IS_HEADER_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_HEADER_BAR_EDITOR)) +#define GLADE_IS_HEADER_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_HEADER_BAR_EDITOR)) +#define GLADE_HEADER_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_HEADER_BAR_EDITOR, GladeHeaderBarEditorClass)) typedef struct _GladeHeaderBarEditor GladeHeaderBarEditor; typedef struct _GladeHeaderBarEditorClass GladeHeaderBarEditorClass; diff --git a/plugins/gtk+/glade-icon-factory-editor.c b/plugins/gtk+/glade-icon-factory-editor.c index 5c132adf..d5d67fe8 100644 --- a/plugins/gtk+/glade-icon-factory-editor.c +++ b/plugins/gtk+/glade-icon-factory-editor.c @@ -27,12 +27,12 @@ #include "glade-icon-factory-editor.h" -static void glade_icon_factory_editor_finalize (GObject * object); +static void glade_icon_factory_editor_finalize (GObject *object); static void glade_icon_factory_editor_editable_init (GladeEditableIface * iface); -static void glade_icon_factory_editor_grab_focus (GtkWidget * widget); +static void glade_icon_factory_editor_grab_focus (GtkWidget *widget); static GladeEditableIface *parent_editable_iface; @@ -43,7 +43,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeIconFactoryEditor, glade_icon_factory_editor, static void -glade_icon_factory_editor_class_init (GladeIconFactoryEditorClass * klass) +glade_icon_factory_editor_class_init (GladeIconFactoryEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -53,14 +53,14 @@ glade_icon_factory_editor_class_init (GladeIconFactoryEditorClass * klass) } static void -glade_icon_factory_editor_init (GladeIconFactoryEditor * self) +glade_icon_factory_editor_init (GladeIconFactoryEditor *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); } static void -glade_icon_factory_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_icon_factory_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeIconFactoryEditor *factory_editor = GLADE_ICON_FACTORY_EDITOR (editable); GList *l; @@ -78,8 +78,8 @@ glade_icon_factory_editor_load (GladeEditable * editable, GladeWidget * widget) } static void -glade_icon_factory_editor_set_show_name (GladeEditable * editable, - gboolean show_name) +glade_icon_factory_editor_set_show_name (GladeEditable *editable, + gboolean show_name) { GladeIconFactoryEditor *factory_editor = GLADE_ICON_FACTORY_EDITOR (editable); @@ -88,7 +88,7 @@ glade_icon_factory_editor_set_show_name (GladeEditable * editable, } static void -glade_icon_factory_editor_editable_init (GladeEditableIface * iface) +glade_icon_factory_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); @@ -97,7 +97,7 @@ glade_icon_factory_editor_editable_init (GladeEditableIface * iface) } static void -glade_icon_factory_editor_finalize (GObject * object) +glade_icon_factory_editor_finalize (GObject *object) { GladeIconFactoryEditor *factory_editor = GLADE_ICON_FACTORY_EDITOR (object); @@ -112,7 +112,7 @@ glade_icon_factory_editor_finalize (GObject * object) } static void -glade_icon_factory_editor_grab_focus (GtkWidget * widget) +glade_icon_factory_editor_grab_focus (GtkWidget *widget) { GladeIconFactoryEditor *factory_editor = GLADE_ICON_FACTORY_EDITOR (widget); @@ -121,8 +121,8 @@ glade_icon_factory_editor_grab_focus (GtkWidget * widget) GtkWidget * -glade_icon_factory_editor_new (GladeWidgetAdaptor * adaptor, - GladeEditable * embed) +glade_icon_factory_editor_new (GladeWidgetAdaptor *adaptor, + GladeEditable *embed) { GladeIconFactoryEditor *factory_editor; GladeEditorProperty *eprop; diff --git a/plugins/gtk+/glade-icon-factory-editor.h b/plugins/gtk+/glade-icon-factory-editor.h index fd120b79..d772ed83 100644 --- a/plugins/gtk+/glade-icon-factory-editor.h +++ b/plugins/gtk+/glade-icon-factory-editor.h @@ -25,33 +25,33 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ICON_FACTORY_EDITOR (glade_icon_factory_editor_get_type ()) -#define GLADE_ICON_FACTORY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditor)) -#define GLADE_ICON_FACTORY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditorClass)) -#define GLADE_IS_ICON_FACTORY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR)) -#define GLADE_IS_ICON_FACTORY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ICON_FACTORY_EDITOR)) -#define GLADE_ICON_FACTORY_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditorClass)) +#define GLADE_TYPE_ICON_FACTORY_EDITOR (glade_icon_factory_editor_get_type ()) +#define GLADE_ICON_FACTORY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditor)) +#define GLADE_ICON_FACTORY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditorClass)) +#define GLADE_IS_ICON_FACTORY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR)) +#define GLADE_IS_ICON_FACTORY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ICON_FACTORY_EDITOR)) +#define GLADE_ICON_FACTORY_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ICON_FACTORY_EDITOR, GladeIconFactoryEditorClass)) typedef struct _GladeIconFactoryEditor GladeIconFactoryEditor; typedef struct _GladeIconFactoryEditorClass GladeIconFactoryEditorClass; struct _GladeIconFactoryEditor { - GtkBox parent; + GtkBox parent; - GtkWidget *embed; /* Embedded parent class editor */ + GtkWidget *embed; /* Embedded parent class editor */ - GList *properties; /* A list of eprops to update at load() time */ + GList *properties; /* A list of eprops to update at load() time */ }; struct _GladeIconFactoryEditorClass { - GtkBoxClass parent; + GtkBoxClass parent; }; GType glade_icon_factory_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_icon_factory_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-icon-sources.c b/plugins/gtk+/glade-icon-sources.c index 832ac40a..9db69853 100644 --- a/plugins/gtk+/glade-icon-sources.c +++ b/plugins/gtk+/glade-icon-sources.c @@ -29,7 +29,7 @@ #include "glade-icon-sources.h" static GList * -icon_set_copy (GList * set) +icon_set_copy (GList *set) { GList *dup_set = NULL, *l; GtkIconSource *source; @@ -46,7 +46,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS static void -icon_set_free (GList * list) +icon_set_free (GList *list) { G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_list_foreach (list, (GFunc) gtk_icon_source_free, NULL); @@ -68,14 +68,14 @@ glade_icon_sources_new (void) static void -icon_sources_dup (gchar * icon_name, GList * set, GladeIconSources * dup) +icon_sources_dup (gchar *icon_name, GList *set, GladeIconSources *dup) { GList *dup_set = icon_set_copy (set); g_hash_table_insert (dup->sources, g_strdup (icon_name), dup_set); } GladeIconSources * -glade_icon_sources_copy (GladeIconSources * sources) +glade_icon_sources_copy (GladeIconSources *sources) { if (!sources) return NULL; @@ -88,7 +88,7 @@ glade_icon_sources_copy (GladeIconSources * sources) } void -glade_icon_sources_free (GladeIconSources * sources) +glade_icon_sources_free (GladeIconSources *sources) { if (sources) { @@ -143,7 +143,7 @@ GLADE_MAKE_EPROP (GladeEPropIconSources, glade_eprop_icon_sources) #define GLADE_IS_EPROP_ICON_SOURCES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_EPROP_ICON_SOURCES)) #define GLADE_IS_EPROP_ICON_SOURCES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_EPROP_ICON_SOURCES)) #define GLADE_EPROP_ICON_SOURCES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GLADE_EPROP_ICON_SOURCES, GladeEPropIconSourcesClass)) - static void glade_eprop_icon_sources_finalize (GObject * object) + static void glade_eprop_icon_sources_finalize (GObject *object) { /* Chain up */ GObjectClass *parent_class = @@ -154,8 +154,9 @@ GLADE_MAKE_EPROP (GladeEPropIconSources, glade_eprop_icon_sources) } static void -populate_store_foreach (const gchar * icon_name, - GList * sources, GladeEPropIconSources * eprop_sources) +populate_store_foreach (const gchar *icon_name, + GList *sources, + GladeEPropIconSources *eprop_sources) { GtkIconSource *source; GtkTreeIter parent_iter, iter; @@ -244,7 +245,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -icon_sources_populate_store (GladeEPropIconSources * eprop_sources) +icon_sources_populate_store (GladeEPropIconSources *eprop_sources) { GladeIconSources *sources = NULL; GladeProperty *property; @@ -265,8 +266,8 @@ icon_sources_populate_store (GladeEPropIconSources * eprop_sources) } static void -glade_eprop_icon_sources_load (GladeEditorProperty * eprop, - GladeProperty * property) +glade_eprop_icon_sources_load (GladeEditorProperty *eprop, + GladeProperty *property) { GladeEditorPropertyClass *parent_class = g_type_class_peek_parent (GLADE_EDITOR_PROPERTY_GET_CLASS (eprop)); @@ -281,7 +282,7 @@ glade_eprop_icon_sources_load (GladeEditorProperty * eprop, } static gboolean -reload_icon_sources_idle (GladeEditorProperty * eprop) +reload_icon_sources_idle (GladeEditorProperty *eprop) { GladeProperty *property = glade_editor_property_get_property (eprop); @@ -314,7 +315,7 @@ edit_row_idle (RowEditData *data) } static void -add_clicked (GtkWidget * button, GladeEPropIconSources * eprop_sources) +add_clicked (GtkWidget *button, GladeEPropIconSources *eprop_sources) { /* Remember to set focus on the cell and activate it ! */ GtkTreeIter *parent_iter = NULL, iter, new_parent_iter; @@ -401,8 +402,9 @@ expand_to_path_and_focus: } static GtkIconSource * -get_icon_source (GladeIconSources * sources, - const gchar * icon_name, gint index) +get_icon_source (GladeIconSources *sources, + const gchar *icon_name, + gint index) { GList *source_list = g_hash_table_lookup (sources->sources, icon_name); @@ -417,8 +419,8 @@ get_icon_source (GladeIconSources * sources, } static void -update_icon_sources (GladeEditorProperty * eprop, - GladeIconSources * icon_sources) +update_icon_sources (GladeEditorProperty *eprop, + GladeIconSources *icon_sources) { GValue value = { 0, }; @@ -429,7 +431,7 @@ update_icon_sources (GladeEditorProperty * eprop, } static void -delete_clicked (GtkWidget * button, GladeEditorProperty * eprop) +delete_clicked (GtkWidget *button, GladeEditorProperty *eprop) { GladeEPropIconSources *eprop_sources = GLADE_EPROP_ICON_SOURCES (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -486,9 +488,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -value_filename_edited (GtkCellRendererText * cell, - const gchar * path, - const gchar * new_text, GladeEditorProperty * eprop) +value_filename_edited (GtkCellRendererText *cell, + const gchar *path, + const gchar *new_text, + GladeEditorProperty *eprop) { GladeEPropIconSources *eprop_sources = GLADE_EPROP_ICON_SOURCES (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -573,8 +576,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -value_attribute_toggled (GtkCellRendererToggle * cell_renderer, - gchar * path, GladeEditorProperty * eprop) +value_attribute_toggled (GtkCellRendererToggle *cell_renderer, + gchar *path, + GladeEditorProperty *eprop) { GladeEPropIconSources *eprop_sources = GLADE_EPROP_ICON_SOURCES (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -635,9 +639,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -value_attribute_edited (GtkCellRendererText * cell, - const gchar * path, - const gchar * new_text, GladeEditorProperty * eprop) +value_attribute_edited (GtkCellRendererText *cell, + const gchar *path, + const gchar *new_text, + GladeEditorProperty *eprop) { GladeEPropIconSources *eprop_sources = GLADE_EPROP_ICON_SOURCES (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -710,12 +715,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static gboolean -icon_sources_query_tooltip (GtkWidget * widget, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip * tooltip, - GladeEPropIconSources * eprop_sources) +icon_sources_query_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + GladeEPropIconSources *eprop_sources) { GtkTreePath *path = NULL; GtkTreeIter iter; @@ -819,7 +824,7 @@ icon_sources_query_tooltip (GtkWidget * widget, static GtkTreeView * -build_view (GladeEditorProperty * eprop) +build_view (GladeEditorProperty *eprop) { GladeEPropIconSources *eprop_sources = GLADE_EPROP_ICON_SOURCES (eprop); static GtkListStore *direction_store = NULL, *size_store = @@ -972,8 +977,7 @@ build_view (GladeEditorProperty * eprop) } static void -icon_name_entry_activated (GtkEntry * entry, - GladeEPropIconSources * eprop_sources) +icon_name_entry_activated (GtkEntry *entry, GladeEPropIconSources *eprop_sources) { const gchar *text = gtk_entry_get_text (entry); GladeProperty *property; @@ -1019,7 +1023,7 @@ glade_eprop_icon_sources_create_input (GladeEditorProperty * eprop) gtk_container_set_border_width (GTK_CONTAINER (button), 2); gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("list-add-symbolic", - GTK_ICON_SIZE_BUTTON)); + GTK_ICON_SIZE_BUTTON)); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (add_clicked), eprop_sources); @@ -1027,7 +1031,7 @@ glade_eprop_icon_sources_create_input (GladeEditorProperty * eprop) button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("list-remove-symbolic", - GTK_ICON_SIZE_BUTTON)); + GTK_ICON_SIZE_BUTTON)); gtk_container_set_border_width (GTK_CONTAINER (button), 2); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); diff --git a/plugins/gtk+/glade-icon-sources.h b/plugins/gtk+/glade-icon-sources.h index a9a40f31..05adfa95 100644 --- a/plugins/gtk+/glade-icon-sources.h +++ b/plugins/gtk+/glade-icon-sources.h @@ -27,14 +27,14 @@ G_BEGIN_DECLS struct _GladeIconSources { - GHashTable *sources; + GHashTable *sources; }; typedef struct _GladeIconSources GladeIconSources; typedef struct _GladeParamIconSources GladeParamIconSources; -#define GLADE_TYPE_ICON_SOURCES (glade_icon_sources_get_type()) +#define GLADE_TYPE_ICON_SOURCES (glade_icon_sources_get_type()) #define GLADE_TYPE_EPROP_ICON_SOURCES (glade_eprop_icon_sources_get_type()) GType glade_icon_sources_get_type (void) G_GNUC_CONST; diff --git a/plugins/gtk+/glade-icon-view-editor.h b/plugins/gtk+/glade-icon-view-editor.h index 99705bdb..7a9a8431 100644 --- a/plugins/gtk+/glade-icon-view-editor.h +++ b/plugins/gtk+/glade-icon-view-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_ICON_VIEW_EDITOR (glade_icon_view_editor_get_type ()) -#define GLADE_ICON_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditor)) -#define GLADE_ICON_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditorClass)) -#define GLADE_IS_ICON_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ICON_VIEW_EDITOR)) -#define GLADE_IS_ICON_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ICON_VIEW_EDITOR)) -#define GLADE_ICON_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditorClass)) +#define GLADE_TYPE_ICON_VIEW_EDITOR (glade_icon_view_editor_get_type ()) +#define GLADE_ICON_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditor)) +#define GLADE_ICON_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditorClass)) +#define GLADE_IS_ICON_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_ICON_VIEW_EDITOR)) +#define GLADE_IS_ICON_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_ICON_VIEW_EDITOR)) +#define GLADE_ICON_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_ICON_VIEW_EDITOR, GladeIconViewEditorClass)) typedef struct _GladeIconViewEditor GladeIconViewEditor; typedef struct _GladeIconViewEditorClass GladeIconViewEditorClass; diff --git a/plugins/gtk+/glade-image-editor.h b/plugins/gtk+/glade-image-editor.h index f3afd792..4025d2ce 100644 --- a/plugins/gtk+/glade-image-editor.h +++ b/plugins/gtk+/glade-image-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_IMAGE_EDITOR (glade_image_editor_get_type ()) -#define GLADE_IMAGE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditor)) -#define GLADE_IMAGE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditorClass)) -#define GLADE_IS_IMAGE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_IMAGE_EDITOR)) -#define GLADE_IS_IMAGE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_IMAGE_EDITOR)) -#define GLADE_IMAGE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditorClass)) +#define GLADE_TYPE_IMAGE_EDITOR (glade_image_editor_get_type ()) +#define GLADE_IMAGE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditor)) +#define GLADE_IMAGE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditorClass)) +#define GLADE_IS_IMAGE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_IMAGE_EDITOR)) +#define GLADE_IS_IMAGE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_IMAGE_EDITOR)) +#define GLADE_IMAGE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_IMAGE_EDITOR, GladeImageEditorClass)) typedef struct _GladeImageEditor GladeImageEditor; typedef struct _GladeImageEditorClass GladeImageEditorClass; diff --git a/plugins/gtk+/glade-image-item-editor.c b/plugins/gtk+/glade-image-item-editor.c index 6b8ed2e0..f4741bf3 100644 --- a/plugins/gtk+/glade-image-item-editor.c +++ b/plugins/gtk+/glade-image-item-editor.c @@ -27,11 +27,11 @@ #include "glade-image-item-editor.h" -static void glade_image_item_editor_finalize (GObject * object); +static void glade_image_item_editor_finalize (GObject *object); -static void glade_image_item_editor_editable_init (GladeEditableIface * iface); +static void glade_image_item_editor_editable_init (GladeEditableIface *iface); -static void glade_image_item_editor_grab_focus (GtkWidget * widget); +static void glade_image_item_editor_grab_focus (GtkWidget *widget); static GladeEditableIface *parent_editable_iface; @@ -41,7 +41,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeImageItemEditor, glade_image_item_editor, GTK_TYPE static void -glade_image_item_editor_class_init (GladeImageItemEditorClass * klass) +glade_image_item_editor_class_init (GladeImageItemEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -51,14 +51,14 @@ glade_image_item_editor_class_init (GladeImageItemEditorClass * klass) } static void -glade_image_item_editor_init (GladeImageItemEditor * self) +glade_image_item_editor_init (GladeImageItemEditor *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); } static GladeWidget * -get_image_widget (GladeWidget * widget) +get_image_widget (GladeWidget *widget) { GtkWidget *image; G_GNUC_BEGIN_IGNORE_DEPRECATIONS @@ -68,7 +68,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_image_item_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_image_item_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeImageItemEditor *item_editor = GLADE_IMAGE_ITEM_EDITOR (editable); GladeWidget *image_widget; @@ -112,8 +112,8 @@ glade_image_item_editor_load (GladeEditable * editable, GladeWidget * widget) } static void -glade_image_item_editor_set_show_name (GladeEditable * editable, - gboolean show_name) +glade_image_item_editor_set_show_name (GladeEditable *editable, + gboolean show_name) { GladeImageItemEditor *item_editor = GLADE_IMAGE_ITEM_EDITOR (editable); @@ -121,7 +121,7 @@ glade_image_item_editor_set_show_name (GladeEditable * editable, } static void -glade_image_item_editor_editable_init (GladeEditableIface * iface) +glade_image_item_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); @@ -130,7 +130,7 @@ glade_image_item_editor_editable_init (GladeEditableIface * iface) } static void -glade_image_item_editor_finalize (GObject * object) +glade_image_item_editor_finalize (GObject *object) { GladeImageItemEditor *item_editor = GLADE_IMAGE_ITEM_EDITOR (object); @@ -146,7 +146,7 @@ glade_image_item_editor_finalize (GObject * object) } static void -glade_image_item_editor_grab_focus (GtkWidget * widget) +glade_image_item_editor_grab_focus (GtkWidget *widget) { GladeImageItemEditor *item_editor = GLADE_IMAGE_ITEM_EDITOR (widget); @@ -156,7 +156,7 @@ glade_image_item_editor_grab_focus (GtkWidget * widget) static void -stock_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) +stock_toggled (GtkWidget *widget, GladeImageItemEditor *item_editor) { GladeProperty *property; GladeWidget *image, *loaded; @@ -187,7 +187,7 @@ stock_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) glade_command_unlock_widget (image); glade_command_delete (&list); glade_project_selection_set (glade_widget_get_project (loaded), - glade_widget_get_object (loaded), TRUE); + glade_widget_get_object (loaded), TRUE); } property = glade_widget_get_property (loaded, "use-stock"); @@ -202,7 +202,7 @@ stock_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) } static void -custom_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) +custom_toggled (GtkWidget *widget, GladeImageItemEditor *item_editor) { GladeProperty *property; GladeWidgetAdaptor *adaptor; @@ -255,7 +255,7 @@ custom_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) /* reload widget by selection ;-) */ glade_project_selection_set (glade_widget_get_project (loaded), - glade_widget_get_object (loaded), TRUE); + glade_widget_get_object (loaded), TRUE); } glade_command_pop_group (); @@ -266,7 +266,7 @@ custom_toggled (GtkWidget * widget, GladeImageItemEditor * item_editor) } static void -table_attach (GtkWidget * table, GtkWidget * child, gint pos, gint row) +table_attach (GtkWidget *table, GtkWidget *child, gint pos, gint row) { gtk_grid_attach (GTK_GRID (table), child, pos, row, 1, 1); @@ -275,8 +275,8 @@ table_attach (GtkWidget * table, GtkWidget * child, gint pos, gint row) } GtkWidget * -glade_image_item_editor_new (GladeWidgetAdaptor * adaptor, - GladeEditable * embed) +glade_image_item_editor_new (GladeWidgetAdaptor *adaptor, + GladeEditable *embed) { GladeImageItemEditor *item_editor; GladeEditorProperty *eprop; diff --git a/plugins/gtk+/glade-image-item-editor.h b/plugins/gtk+/glade-image-item-editor.h index 8146cc5f..2f0789ec 100644 --- a/plugins/gtk+/glade-image-item-editor.h +++ b/plugins/gtk+/glade-image-item-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_IMAGE_ITEM_EDITOR (glade_image_item_editor_get_type ()) -#define GLADE_IMAGE_ITEM_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditor)) -#define GLADE_IMAGE_ITEM_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditorClass)) -#define GLADE_IS_IMAGE_ITEM_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR)) -#define GLADE_IS_IMAGE_ITEM_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_IMAGE_ITEM_EDITOR)) -#define GLADE_IMAGE_ITEM_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditorClass)) +#define GLADE_TYPE_IMAGE_ITEM_EDITOR (glade_image_item_editor_get_type ()) +#define GLADE_IMAGE_ITEM_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditor)) +#define GLADE_IMAGE_ITEM_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditorClass)) +#define GLADE_IS_IMAGE_ITEM_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR)) +#define GLADE_IS_IMAGE_ITEM_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_IMAGE_ITEM_EDITOR)) +#define GLADE_IMAGE_ITEM_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_IMAGE_ITEM_EDITOR, GladeImageItemEditorClass)) typedef struct _GladeImageItemEditor GladeImageItemEditor; typedef struct _GladeImageItemEditorClass GladeImageItemEditorClass; @@ -57,7 +57,7 @@ struct _GladeImageItemEditorClass GType glade_image_item_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_image_item_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-label-editor.c b/plugins/gtk+/glade-label-editor.c index 89b840d5..cf44e4a8 100644 --- a/plugins/gtk+/glade-label-editor.c +++ b/plugins/gtk+/glade-label-editor.c @@ -31,7 +31,7 @@ static void glade_label_editor_grab_focus (GtkWidget *widget); /* GladeEditableIface */ static void glade_label_editor_load (GladeEditable *editable, - GladeWidget *widget); + GladeWidget *widget); static void glade_label_editor_editable_init (GladeEditableIface *iface); /* Callbacks */ @@ -49,7 +49,7 @@ struct _GladeLabelEditorPrivate GtkWidget *attributes_radio; /* Set pango attributes manually (attributes eprop embedded) */ GtkWidget *markup_radio; /* Parse the label as a pango markup string (no showing eprop) */ GtkWidget *pattern_radio; /* Use a pattern string to underline portions of the text - * (pattern eprop embedded) */ + * (pattern eprop embedded) */ /* These control whether to use single-line-mode, wrap & wrap-mode or niether */ GtkWidget *wrap_free_label; /* Set boldness on this label for a fake property */ @@ -66,7 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeLabelEditor, glade_label_editor, GLADE_TYPE_EDITOR glade_label_editor_editable_init)); static void -glade_label_editor_class_init (GladeLabelEditorClass * klass) +glade_label_editor_class_init (GladeLabelEditorClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -92,7 +92,7 @@ glade_label_editor_class_init (GladeLabelEditorClass * klass) } static void -glade_label_editor_init (GladeLabelEditor * self) +glade_label_editor_init (GladeLabelEditor *self) { self->priv = glade_label_editor_get_instance_private (self); @@ -100,7 +100,7 @@ glade_label_editor_init (GladeLabelEditor * self) } static void -glade_label_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_label_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeLabelEditor *label_editor = GLADE_LABEL_EDITOR (editable); GladeLabelEditorPrivate *priv = label_editor->priv; @@ -176,7 +176,7 @@ glade_label_editor_load (GladeEditable * editable, GladeWidget * widget) } static void -glade_label_editor_editable_init (GladeEditableIface * iface) +glade_label_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_interface_peek_parent (iface); @@ -184,7 +184,7 @@ glade_label_editor_editable_init (GladeEditableIface * iface) } static void -glade_label_editor_grab_focus (GtkWidget * widget) +glade_label_editor_grab_focus (GtkWidget *widget) { GladeLabelEditor *label_editor = GLADE_LABEL_EDITOR (widget); GladeLabelEditorPrivate *priv = label_editor->priv; @@ -196,7 +196,7 @@ glade_label_editor_grab_focus (GtkWidget * widget) label-content-mode radios **********************************************************************/ static void -attributes_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +attributes_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; @@ -230,7 +230,7 @@ attributes_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) } static void -markup_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +markup_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; @@ -267,7 +267,7 @@ markup_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) } static void -pattern_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +pattern_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; @@ -304,7 +304,7 @@ pattern_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) label-wrap-mode radios **********************************************************************/ static void -wrap_free_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +wrap_free_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; @@ -341,7 +341,7 @@ wrap_free_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) } static void -single_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +single_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; @@ -378,7 +378,7 @@ single_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) } static void -wrap_mode_toggled (GtkWidget * widget, GladeLabelEditor * label_editor) +wrap_mode_toggled (GtkWidget *widget, GladeLabelEditor *label_editor) { GladeLabelEditorPrivate *priv = label_editor->priv; GladeProperty *property; diff --git a/plugins/gtk+/glade-label-editor.h b/plugins/gtk+/glade-label-editor.h index b5b9ee4c..8817790f 100644 --- a/plugins/gtk+/glade-label-editor.h +++ b/plugins/gtk+/glade-label-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_LABEL_EDITOR (glade_label_editor_get_type ()) -#define GLADE_LABEL_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditor)) -#define GLADE_LABEL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditorClass)) -#define GLADE_IS_LABEL_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LABEL_EDITOR)) -#define GLADE_IS_LABEL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LABEL_EDITOR)) -#define GLADE_LABEL_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditorClass)) +#define GLADE_TYPE_LABEL_EDITOR (glade_label_editor_get_type ()) +#define GLADE_LABEL_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditor)) +#define GLADE_LABEL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditorClass)) +#define GLADE_IS_LABEL_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LABEL_EDITOR)) +#define GLADE_IS_LABEL_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LABEL_EDITOR)) +#define GLADE_LABEL_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LABEL_EDITOR, GladeLabelEditorClass)) typedef struct _GladeLabelEditor GladeLabelEditor; typedef struct _GladeLabelEditorClass GladeLabelEditorClass; diff --git a/plugins/gtk+/glade-layout-editor.h b/plugins/gtk+/glade-layout-editor.h index c49a919b..13dff9bc 100644 --- a/plugins/gtk+/glade-layout-editor.h +++ b/plugins/gtk+/glade-layout-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_LAYOUT_EDITOR (glade_layout_editor_get_type ()) -#define GLADE_LAYOUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditor)) -#define GLADE_LAYOUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditorClass)) -#define GLADE_IS_LAYOUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LAYOUT_EDITOR)) -#define GLADE_IS_LAYOUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LAYOUT_EDITOR)) -#define GLADE_LAYOUT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditorClass)) +#define GLADE_TYPE_LAYOUT_EDITOR (glade_layout_editor_get_type ()) +#define GLADE_LAYOUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditor)) +#define GLADE_LAYOUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditorClass)) +#define GLADE_IS_LAYOUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LAYOUT_EDITOR)) +#define GLADE_IS_LAYOUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LAYOUT_EDITOR)) +#define GLADE_LAYOUT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LAYOUT_EDITOR, GladeLayoutEditorClass)) typedef struct _GladeLayoutEditor GladeLayoutEditor; typedef struct _GladeLayoutEditorClass GladeLayoutEditorClass; diff --git a/plugins/gtk+/glade-level-bar-editor.h b/plugins/gtk+/glade-level-bar-editor.h index dad5a443..dbadabbd 100644 --- a/plugins/gtk+/glade-level-bar-editor.h +++ b/plugins/gtk+/glade-level-bar-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_LEVEL_BAR_EDITOR (glade_level_bar_editor_get_type ()) -#define GLADE_LEVEL_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditor)) -#define GLADE_LEVEL_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditorClass)) -#define GLADE_IS_LEVEL_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR)) -#define GLADE_IS_LEVEL_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LEVEL_BAR_EDITOR)) -#define GLADE_LEVEL_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditorClass)) +#define GLADE_TYPE_LEVEL_BAR_EDITOR (glade_level_bar_editor_get_type ()) +#define GLADE_LEVEL_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditor)) +#define GLADE_LEVEL_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditorClass)) +#define GLADE_IS_LEVEL_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR)) +#define GLADE_IS_LEVEL_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_LEVEL_BAR_EDITOR)) +#define GLADE_LEVEL_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_LEVEL_BAR_EDITOR, GladeLevelBarEditorClass)) typedef struct _GladeLevelBarEditor GladeLevelBarEditor; typedef struct _GladeLevelBarEditorClass GladeLevelBarEditorClass; diff --git a/plugins/gtk+/glade-message-dialog-editor.h b/plugins/gtk+/glade-message-dialog-editor.h index 77694a3a..1639a30e 100644 --- a/plugins/gtk+/glade-message-dialog-editor.h +++ b/plugins/gtk+/glade-message-dialog-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_MESSAGE_DIALOG_EDITOR (glade_message_dialog_editor_get_type ()) -#define GLADE_MESSAGE_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditor)) -#define GLADE_MESSAGE_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditorClass)) -#define GLADE_IS_MESSAGE_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR)) -#define GLADE_IS_MESSAGE_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MESSAGE_DIALOG_EDITOR)) -#define GLADE_MESSAGE_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditorClass)) +#define GLADE_TYPE_MESSAGE_DIALOG_EDITOR (glade_message_dialog_editor_get_type ()) +#define GLADE_MESSAGE_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditor)) +#define GLADE_MESSAGE_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditorClass)) +#define GLADE_IS_MESSAGE_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR)) +#define GLADE_IS_MESSAGE_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MESSAGE_DIALOG_EDITOR)) +#define GLADE_MESSAGE_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MESSAGE_DIALOG_EDITOR, GladeMessageDialogEditorClass)) typedef struct _GladeMessageDialogEditor GladeMessageDialogEditor; typedef struct _GladeMessageDialogEditorClass GladeMessageDialogEditorClass; diff --git a/plugins/gtk+/glade-misc-editor.h b/plugins/gtk+/glade-misc-editor.h index 212d39b0..4af9fb90 100644 --- a/plugins/gtk+/glade-misc-editor.h +++ b/plugins/gtk+/glade-misc-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_MISC_EDITOR (glade_misc_editor_get_type ()) -#define GLADE_MISC_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MISC_EDITOR, GladeMiscEditor)) -#define GLADE_MISC_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MISC_EDITOR, GladeMiscEditorClass)) -#define GLADE_IS_MISC_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MISC_EDITOR)) -#define GLADE_IS_MISC_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MISC_EDITOR)) -#define GLADE_MISC_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MISC_EDITOR, GladeMiscEditorClass)) +#define GLADE_TYPE_MISC_EDITOR (glade_misc_editor_get_type ()) +#define GLADE_MISC_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MISC_EDITOR, GladeMiscEditor)) +#define GLADE_MISC_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MISC_EDITOR, GladeMiscEditorClass)) +#define GLADE_IS_MISC_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MISC_EDITOR)) +#define GLADE_IS_MISC_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MISC_EDITOR)) +#define GLADE_MISC_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MISC_EDITOR, GladeMiscEditorClass)) typedef struct _GladeMiscEditor GladeMiscEditor; typedef struct _GladeMiscEditorClass GladeMiscEditorClass; diff --git a/plugins/gtk+/glade-model-button-editor.h b/plugins/gtk+/glade-model-button-editor.h index 235caa34..6ca58f8f 100644 --- a/plugins/gtk+/glade-model-button-editor.h +++ b/plugins/gtk+/glade-model-button-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_MODEL_BUTTON_EDITOR (glade_model_button_editor_get_type ()) -#define GLADE_MODEL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditor)) -#define GLADE_MODEL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditorClass)) -#define GLADE_IS_MODEL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR)) -#define GLADE_IS_MODEL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MODEL_BUTTON_EDITOR)) -#define GLADE_MODEL_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditorClass)) +#define GLADE_TYPE_MODEL_BUTTON_EDITOR (glade_model_button_editor_get_type ()) +#define GLADE_MODEL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditor)) +#define GLADE_MODEL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditorClass)) +#define GLADE_IS_MODEL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR)) +#define GLADE_IS_MODEL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_MODEL_BUTTON_EDITOR)) +#define GLADE_MODEL_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_MODEL_BUTTON_EDITOR, GladeModelButtonEditorClass)) typedef struct _GladeModelButtonEditor GladeModelButtonEditor; typedef struct _GladeModelButtonEditorClass GladeModelButtonEditorClass; diff --git a/plugins/gtk+/glade-model-data.c b/plugins/gtk+/glade-model-data.c index 41cfcc2b..4a0b7d94 100644 --- a/plugins/gtk+/glade-model-data.c +++ b/plugins/gtk+/glade-model-data.c @@ -31,7 +31,7 @@ #include "glade-column-types.h" GladeModelData * -glade_model_data_new (GType type, const gchar * column_name) +glade_model_data_new (GType type, const gchar *column_name) { GladeModelData *data = g_slice_new0 (GladeModelData); @@ -47,7 +47,7 @@ glade_model_data_new (GType type, const gchar * column_name) } GladeModelData * -glade_model_data_copy (GladeModelData * data) +glade_model_data_copy (GladeModelData *data) { GladeModelData *dup; @@ -72,7 +72,7 @@ glade_model_data_copy (GladeModelData * data) } void -glade_model_data_free (GladeModelData * data) +glade_model_data_free (GladeModelData *data) { if (data) { @@ -87,13 +87,13 @@ glade_model_data_free (GladeModelData * data) } GNode * -glade_model_data_tree_copy (GNode * node) +glade_model_data_tree_copy (GNode *node) { return g_node_copy_deep (node, (GCopyFunc) glade_model_data_copy, NULL); } static gboolean -model_data_traverse_free (GNode * node, gpointer data) +model_data_traverse_free (GNode *node, gpointer data) { glade_model_data_free ((GladeModelData *) node->data); @@ -101,7 +101,7 @@ model_data_traverse_free (GNode * node, gpointer data) } void -glade_model_data_tree_free (GNode * node) +glade_model_data_tree_free (GNode *node) { if (node) { @@ -112,7 +112,7 @@ glade_model_data_tree_free (GNode * node) } GladeModelData * -glade_model_data_tree_get_data (GNode * data_tree, gint row, gint colnum) +glade_model_data_tree_get_data (GNode *data_tree, gint row, gint colnum) { GNode *node; @@ -126,8 +126,10 @@ glade_model_data_tree_get_data (GNode * data_tree, gint row, gint colnum) } void -glade_model_data_insert_column (GNode * node, - GType type, const gchar * column_name, gint nth) +glade_model_data_insert_column (GNode *node, + GType type, + const gchar *column_name, + gint nth) { GNode *row, *item; GladeModelData *data; @@ -145,7 +147,7 @@ glade_model_data_insert_column (GNode * node, } void -glade_model_data_remove_column (GNode * node, gint nth) +glade_model_data_remove_column (GNode *node, gint nth) { GNode *row, *item; GladeModelData *data; @@ -165,7 +167,7 @@ glade_model_data_remove_column (GNode * node, gint nth) } void -glade_model_data_reorder_column (GNode * node, gint column, gint nth) +glade_model_data_reorder_column (GNode *node, gint column, gint nth) { GNode *row, *item; @@ -183,7 +185,7 @@ glade_model_data_reorder_column (GNode * node, gint column, gint nth) } gint -glade_model_data_column_index (GNode * node, const gchar * column_name) +glade_model_data_column_index (GNode *node, const gchar *column_name) { gint i; GNode *item; @@ -201,9 +203,9 @@ glade_model_data_column_index (GNode * node, const gchar * column_name) } void -glade_model_data_column_rename (GNode * node, - const gchar * column_name, - const gchar * new_name) +glade_model_data_column_rename (GNode *node, + const gchar *column_name, + const gchar *new_name) { gint idx; GNode *row, *iter; @@ -269,7 +271,7 @@ GLADE_MAKE_EPROP (GladeEPropModelData, glade_eprop_model_data) static void eprop_data_focus_editing_cell (GladeEPropModelData *eprop_data); -static void append_row (GNode * node, GList * columns) +static void append_row (GNode *node, GList *columns) { GladeModelData *data; GladeColumnType *column; @@ -292,7 +294,7 @@ static void append_row (GNode * node, GList * columns) } static void -clear_view (GladeEditorProperty * eprop) +clear_view (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GtkTreeViewColumn *column; @@ -307,7 +309,7 @@ clear_view (GladeEditorProperty * eprop) } static gboolean -update_data_tree_idle (GladeEditorProperty * eprop) +update_data_tree_idle (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -330,7 +332,7 @@ update_data_tree_idle (GladeEditorProperty * eprop) } static gboolean -update_and_focus_data_tree_idle (GladeEditorProperty * eprop) +update_and_focus_data_tree_idle (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -348,7 +350,7 @@ update_and_focus_data_tree_idle (GladeEditorProperty * eprop) } static gboolean -focus_data_tree_idle (GladeEditorProperty * eprop) +focus_data_tree_idle (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); @@ -360,7 +362,7 @@ focus_data_tree_idle (GladeEditorProperty * eprop) } static void -glade_eprop_model_data_add_row (GladeEditorProperty * eprop) +glade_eprop_model_data_add_row (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GValue value = { 0, }; @@ -394,7 +396,7 @@ glade_eprop_model_data_add_row (GladeEditorProperty * eprop) } static void -glade_eprop_model_data_delete_selected (GladeEditorProperty * eprop) +glade_eprop_model_data_delete_selected (GladeEditorProperty *eprop) { GtkTreeIter iter; GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); @@ -428,22 +430,23 @@ glade_eprop_model_data_delete_selected (GladeEditorProperty * eprop) } static void -glade_eprop_model_data_add_clicked (GtkWidget * button, - GladeEditorProperty * eprop) +glade_eprop_model_data_add_clicked (GtkWidget *button, + GladeEditorProperty *eprop) { glade_eprop_model_data_add_row (eprop); } static void -glade_eprop_model_data_delete_clicked (GtkWidget * button, - GladeEditorProperty * eprop) +glade_eprop_model_data_delete_clicked (GtkWidget *button, + GladeEditorProperty *eprop) { glade_eprop_model_data_delete_selected (eprop); } static gboolean -eprop_treeview_key_press (GtkWidget * treeview, - GdkEventKey * event, GladeEditorProperty * eprop) +eprop_treeview_key_press (GtkWidget *treeview, + GdkEventKey *event, + GladeEditorProperty *eprop) { if (event->keyval == GDK_KEY_Delete) { @@ -461,7 +464,7 @@ eprop_treeview_key_press (GtkWidget * treeview, } static gboolean -data_changed_idle (GladeEditorProperty * eprop) +data_changed_idle (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -503,8 +506,9 @@ data_changed_idle (GladeEditorProperty * eprop) } static void -eprop_treeview_row_deleted (GtkTreeModel * tree_model, - GtkTreePath * path, GladeEditorProperty * eprop) +eprop_treeview_row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + GladeEditorProperty *eprop) { if (glade_editor_property_loading (eprop)) return; @@ -514,7 +518,7 @@ eprop_treeview_row_deleted (GtkTreeModel * tree_model, static void -glade_eprop_model_data_finalize (GObject * object) +glade_eprop_model_data_finalize (GObject *object) { /* Chain up */ GObjectClass *parent_class = @@ -525,7 +529,7 @@ glade_eprop_model_data_finalize (GObject * object) } static GtkListStore * -eprop_model_data_generate_store (GladeEditorProperty * eprop) +eprop_model_data_generate_store (GladeEditorProperty *eprop) { GtkListStore *store = NULL; GladeModelData *iter_data; @@ -591,8 +595,7 @@ eprop_model_data_generate_store (GladeEditorProperty * eprop) } static void -value_toggled (GtkCellRendererToggle * cell, - gchar * path, GladeEditorProperty * eprop) +value_toggled (GtkCellRendererToggle *cell, gchar *path, GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GtkTreeIter iter; @@ -631,8 +634,9 @@ value_toggled (GtkCellRendererToggle * cell, } static void -value_i18n_activate (GladeCellRendererIcon * cell, - const gchar * path, GladeEditorProperty * eprop) +value_i18n_activate (GladeCellRendererIcon *cell, + const gchar *path, + GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GtkTreeIter iter; @@ -686,9 +690,10 @@ value_i18n_activate (GladeCellRendererIcon * cell, } static void -value_text_edited (GtkCellRendererText * cell, - const gchar * path, - const gchar * new_text, GladeEditorProperty * eprop) +value_text_edited (GtkCellRendererText *cell, + const gchar *path, + const gchar *new_text, + GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GtkTreeIter iter; @@ -743,10 +748,11 @@ value_text_edited (GtkCellRendererText * cell, static void -enum_flags_format_cell_data (GtkCellLayout * cell_layout, - GtkCellRenderer * cell, - GtkTreeModel * tree_model, - GtkTreeIter * iter, gpointer data) +enum_flags_format_cell_data (GtkCellLayout *cell_layout, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) { gint colnum = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column-number")); @@ -768,9 +774,10 @@ enum_flags_format_cell_data (GtkCellLayout * cell_layout, static void -data_editing_started (GtkCellRenderer * cell, - GtkCellEditable * editable, - gchar * path, GladeEditorProperty * eprop) +data_editing_started (GtkCellRenderer *cell, + GtkCellEditable *editable, + gchar *path, + GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); gint colnum = @@ -790,7 +797,7 @@ data_editing_started (GtkCellRenderer * cell, } static void -data_editing_canceled (GtkCellRenderer * renderer, GladeEditorProperty * eprop) +data_editing_canceled (GtkCellRenderer *renderer, GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); @@ -801,8 +808,9 @@ data_editing_canceled (GtkCellRenderer * renderer, GladeEditorProperty * eprop) } static GtkTreeViewColumn * -eprop_model_generate_column (GladeEditorProperty * eprop, - gint colnum, GladeModelData * data) +eprop_model_generate_column (GladeEditorProperty *eprop, + gint colnum, + GladeModelData *data) { GtkTreeViewColumn *column = gtk_tree_view_column_new (); GtkCellRenderer *renderer = NULL; @@ -954,7 +962,7 @@ eprop_model_generate_column (GladeEditorProperty * eprop, } static void -eprop_model_data_generate_columns (GladeEditorProperty * eprop) +eprop_model_data_generate_columns (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); @@ -980,7 +988,7 @@ eprop_model_data_generate_columns (GladeEditorProperty * eprop) } static void -eprop_data_focus_new (GladeEPropModelData * eprop_data) +eprop_data_focus_new (GladeEPropModelData *eprop_data) { /* Focus and edit the first column of a newly added row */ @@ -1020,7 +1028,7 @@ eprop_data_focus_new (GladeEPropModelData * eprop_data) } static void -eprop_data_focus_editing_cell (GladeEPropModelData * eprop_data) +eprop_data_focus_editing_cell (GladeEPropModelData *eprop_data) { /* Focus and edit the first column of a newly added row */ if (!eprop_data->setting_focus && eprop_data->store && eprop_data->want_focus @@ -1061,8 +1069,8 @@ eprop_data_focus_editing_cell (GladeEPropModelData * eprop_data) static void -glade_eprop_model_data_load (GladeEditorProperty * eprop, - GladeProperty * property) +glade_eprop_model_data_load (GladeEditorProperty *eprop, + GladeProperty *property) { GladeEditorPropertyClass *parent_class = g_type_class_peek_parent (GLADE_EDITOR_PROPERTY_GET_CLASS (eprop)); @@ -1099,12 +1107,12 @@ glade_eprop_model_data_load (GladeEditorProperty * eprop, eprop_data_focus_new (eprop_data); else if (eprop_data->want_focus && eprop_data->editing_row >= 0 && eprop_data->editing_column >= 0) - eprop_data_focus_editing_cell (eprop_data); + eprop_data_focus_editing_cell (eprop_data); } } static GtkWidget * -glade_eprop_model_data_create_input (GladeEditorProperty * eprop) +glade_eprop_model_data_create_input (GladeEditorProperty *eprop) { GladeEPropModelData *eprop_data = GLADE_EPROP_MODEL_DATA (eprop); GtkWidget *vbox, *hbox, *button, *swin, *label; @@ -1127,7 +1135,7 @@ glade_eprop_model_data_create_input (GladeEditorProperty * eprop) button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("list-add-symbolic", - GTK_ICON_SIZE_BUTTON)); + GTK_ICON_SIZE_BUTTON)); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button), "clicked", @@ -1137,7 +1145,7 @@ glade_eprop_model_data_create_input (GladeEditorProperty * eprop) button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("list-remove-symbolic", - GTK_ICON_SIZE_BUTTON)); + GTK_ICON_SIZE_BUTTON)); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button), "clicked", diff --git a/plugins/gtk+/glade-model-data.h b/plugins/gtk+/glade-model-data.h index b6f5bf6f..9b298939 100644 --- a/plugins/gtk+/glade-model-data.h +++ b/plugins/gtk+/glade-model-data.h @@ -27,18 +27,18 @@ G_BEGIN_DECLS struct _GladeModelData { - GValue value; - gchar *name; + GValue value; + gchar *name; - gboolean i18n_translatable; - gchar *i18n_context; - gchar *i18n_comment; + gboolean i18n_translatable; + gchar *i18n_context; + gchar *i18n_comment; }; typedef struct _GladeModelData GladeModelData; -#define GLADE_TYPE_MODEL_DATA_TREE (glade_model_data_tree_get_type()) +#define GLADE_TYPE_MODEL_DATA_TREE (glade_model_data_tree_get_type()) #define GLADE_TYPE_EPROP_MODEL_DATA (glade_eprop_model_data_get_type()) GType glade_model_data_tree_get_type (void) G_GNUC_CONST; @@ -46,7 +46,7 @@ GType glade_eprop_model_data_get_type (void) G_GNUC_CONST; GladeModelData *glade_model_data_new (GType type, - const gchar *column_name); + const gchar *column_name); GladeModelData *glade_model_data_copy (GladeModelData *data); void glade_model_data_free (GladeModelData *data); @@ -54,22 +54,22 @@ GNode *glade_model_data_tree_copy (GNode *node); void glade_model_data_tree_free (GNode *node); GladeModelData *glade_model_data_tree_get_data (GNode *data_tree, - gint row, - gint colnum); + gint row, + gint colnum); void glade_model_data_insert_column (GNode *node, - GType type, - const gchar *column_name, - gint nth); + GType type, + const gchar *column_name, + gint nth); void glade_model_data_remove_column (GNode *node, - gint nth); + gint nth); void glade_model_data_reorder_column (GNode *node, - gint column, - gint nth); + gint column, + gint nth); gint glade_model_data_column_index (GNode *node, - const gchar *column_name); + const gchar *column_name); void glade_model_data_column_rename (GNode *node, - const gchar *column_name, - const gchar *new_name); + const gchar *column_name, + const gchar *new_name); G_END_DECLS diff --git a/plugins/gtk+/glade-notebook-editor.h b/plugins/gtk+/glade-notebook-editor.h index a3a29d91..56226cc8 100644 --- a/plugins/gtk+/glade-notebook-editor.h +++ b/plugins/gtk+/glade-notebook-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_NOTEBOOK_EDITOR (glade_notebook_editor_get_type ()) -#define GLADE_NOTEBOOK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditor)) -#define GLADE_NOTEBOOK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditorClass)) -#define GLADE_IS_NOTEBOOK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_NOTEBOOK_EDITOR)) -#define GLADE_IS_NOTEBOOK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_NOTEBOOK_EDITOR)) -#define GLADE_NOTEBOOK_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditorClass)) +#define GLADE_TYPE_NOTEBOOK_EDITOR (glade_notebook_editor_get_type ()) +#define GLADE_NOTEBOOK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditor)) +#define GLADE_NOTEBOOK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditorClass)) +#define GLADE_IS_NOTEBOOK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_NOTEBOOK_EDITOR)) +#define GLADE_IS_NOTEBOOK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_NOTEBOOK_EDITOR)) +#define GLADE_NOTEBOOK_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_NOTEBOOK_EDITOR, GladeNotebookEditorClass)) typedef struct _GladeNotebookEditor GladeNotebookEditor; typedef struct _GladeNotebookEditorClass GladeNotebookEditorClass; diff --git a/plugins/gtk+/glade-popover-editor.h b/plugins/gtk+/glade-popover-editor.h index eeb35a63..91ae2ed2 100644 --- a/plugins/gtk+/glade-popover-editor.h +++ b/plugins/gtk+/glade-popover-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_POPOVER_EDITOR (glade_popover_editor_get_type ()) -#define GLADE_POPOVER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditor)) -#define GLADE_POPOVER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditorClass)) -#define GLADE_IS_POPOVER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_POPOVER_EDITOR)) -#define GLADE_IS_POPOVER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_POPOVER_EDITOR)) -#define GLADE_POPOVER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditorClass)) +#define GLADE_TYPE_POPOVER_EDITOR (glade_popover_editor_get_type ()) +#define GLADE_POPOVER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditor)) +#define GLADE_POPOVER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditorClass)) +#define GLADE_IS_POPOVER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_POPOVER_EDITOR)) +#define GLADE_IS_POPOVER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_POPOVER_EDITOR)) +#define GLADE_POPOVER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_POPOVER_EDITOR, GladePopoverEditorClass)) typedef struct _GladePopoverEditor GladePopoverEditor; typedef struct _GladePopoverEditorClass GladePopoverEditorClass; diff --git a/plugins/gtk+/glade-popover-menu-editor.h b/plugins/gtk+/glade-popover-menu-editor.h index 61b76d51..37d7f4e3 100644 --- a/plugins/gtk+/glade-popover-menu-editor.h +++ b/plugins/gtk+/glade-popover-menu-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_POPOVER_MENU_EDITOR (glade_popover_menu_editor_get_type ()) -#define GLADE_POPOVER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditor)) -#define GLADE_POPOVER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditorClass)) -#define GLADE_IS_POPOVER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR)) -#define GLADE_IS_POPOVER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_POPOVER_MENU_EDITOR)) -#define GLADE_POPOVER_MENU_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditorClass)) +#define GLADE_TYPE_POPOVER_MENU_EDITOR (glade_popover_menu_editor_get_type ()) +#define GLADE_POPOVER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditor)) +#define GLADE_POPOVER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditorClass)) +#define GLADE_IS_POPOVER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR)) +#define GLADE_IS_POPOVER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_POPOVER_MENU_EDITOR)) +#define GLADE_POPOVER_MENU_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_POPOVER_MENU_EDITOR, GladePopoverMenuEditorClass)) typedef struct _GladePopoverMenuEditor GladePopoverMenuEditor; typedef struct _GladePopoverMenuEditorClass GladePopoverMenuEditorClass; diff --git a/plugins/gtk+/glade-progress-bar-editor.h b/plugins/gtk+/glade-progress-bar-editor.h index d5f48272..dd3a58a9 100644 --- a/plugins/gtk+/glade-progress-bar-editor.h +++ b/plugins/gtk+/glade-progress-bar-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_PROGRESS_BAR_EDITOR (glade_progress_bar_editor_get_type ()) -#define GLADE_PROGRESS_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditor)) -#define GLADE_PROGRESS_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditorClass)) -#define GLADE_IS_PROGRESS_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR)) -#define GLADE_IS_PROGRESS_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_PROGRESS_BAR_EDITOR)) -#define GLADE_PROGRESS_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditorClass)) +#define GLADE_TYPE_PROGRESS_BAR_EDITOR (glade_progress_bar_editor_get_type ()) +#define GLADE_PROGRESS_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditor)) +#define GLADE_PROGRESS_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditorClass)) +#define GLADE_IS_PROGRESS_BAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR)) +#define GLADE_IS_PROGRESS_BAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_PROGRESS_BAR_EDITOR)) +#define GLADE_PROGRESS_BAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_PROGRESS_BAR_EDITOR, GladeProgressBarEditorClass)) typedef struct _GladeProgressBarEditor GladeProgressBarEditor; typedef struct _GladeProgressBarEditorClass GladeProgressBarEditorClass; diff --git a/plugins/gtk+/glade-real-tree-view-editor.h b/plugins/gtk+/glade-real-tree-view-editor.h index 3b7115db..c9dee736 100644 --- a/plugins/gtk+/glade-real-tree-view-editor.h +++ b/plugins/gtk+/glade-real-tree-view-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_REAL_TREE_VIEW_EDITOR (glade_real_tree_view_editor_get_type ()) -#define GLADE_REAL_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditor)) -#define GLADE_REAL_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditorClass)) -#define GLADE_IS_REAL_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR)) -#define GLADE_IS_REAL_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_REAL_TREE_VIEW_EDITOR)) -#define GLADE_REAL_TREE_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditorClass)) +#define GLADE_TYPE_REAL_TREE_VIEW_EDITOR (glade_real_tree_view_editor_get_type ()) +#define GLADE_REAL_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditor)) +#define GLADE_REAL_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditorClass)) +#define GLADE_IS_REAL_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR)) +#define GLADE_IS_REAL_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_REAL_TREE_VIEW_EDITOR)) +#define GLADE_REAL_TREE_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_REAL_TREE_VIEW_EDITOR, GladeRealTreeViewEditorClass)) typedef struct _GladeRealTreeViewEditor GladeRealTreeViewEditor; typedef struct _GladeRealTreeViewEditorClass GladeRealTreeViewEditorClass; diff --git a/plugins/gtk+/glade-recent-action-editor.h b/plugins/gtk+/glade-recent-action-editor.h index aaac1154..ba1895cd 100644 --- a/plugins/gtk+/glade-recent-action-editor.h +++ b/plugins/gtk+/glade-recent-action-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_RECENT_ACTION_EDITOR (glade_recent_action_editor_get_type ()) -#define GLADE_RECENT_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditor)) -#define GLADE_RECENT_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditorClass)) -#define GLADE_IS_RECENT_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR)) -#define GLADE_IS_RECENT_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_ACTION_EDITOR)) -#define GLADE_RECENT_ACTION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditorClass)) +#define GLADE_TYPE_RECENT_ACTION_EDITOR (glade_recent_action_editor_get_type ()) +#define GLADE_RECENT_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditor)) +#define GLADE_RECENT_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditorClass)) +#define GLADE_IS_RECENT_ACTION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR)) +#define GLADE_IS_RECENT_ACTION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_ACTION_EDITOR)) +#define GLADE_RECENT_ACTION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_ACTION_EDITOR, GladeRecentActionEditorClass)) typedef struct _GladeRecentActionEditor GladeRecentActionEditor; typedef struct _GladeRecentActionEditorClass GladeRecentActionEditorClass; diff --git a/plugins/gtk+/glade-recent-chooser-dialog-editor.h b/plugins/gtk+/glade-recent-chooser-dialog-editor.h index 4f97f06b..26742e72 100644 --- a/plugins/gtk+/glade-recent-chooser-dialog-editor.h +++ b/plugins/gtk+/glade-recent-chooser-dialog-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR (glade_recent_chooser_dialog_editor_get_type ()) -#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditor)) -#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditorClass)) -#define GLADE_IS_RECENT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR)) -#define GLADE_IS_RECENT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR)) -#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditorClass)) +#define GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR (glade_recent_chooser_dialog_editor_get_type ()) +#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditor)) +#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditorClass)) +#define GLADE_IS_RECENT_CHOOSER_DIALOG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR)) +#define GLADE_IS_RECENT_CHOOSER_DIALOG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR)) +#define GLADE_RECENT_CHOOSER_DIALOG_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_DIALOG_EDITOR, GladeRecentChooserDialogEditorClass)) typedef struct _GladeRecentChooserDialogEditor GladeRecentChooserDialogEditor; typedef struct _GladeRecentChooserDialogEditorClass GladeRecentChooserDialogEditorClass; diff --git a/plugins/gtk+/glade-recent-chooser-editor.c b/plugins/gtk+/glade-recent-chooser-editor.c index 064e27d7..227bed68 100644 --- a/plugins/gtk+/glade-recent-chooser-editor.c +++ b/plugins/gtk+/glade-recent-chooser-editor.c @@ -25,7 +25,7 @@ #include "glade-recent-chooser-editor.h" -static void glade_recent_chooser_editor_editable_init (GladeEditableIface * iface); +static void glade_recent_chooser_editor_editable_init (GladeEditableIface *iface); struct _GladeRecentChooserEditorPrivate { GtkWidget *select_multiple_editor; @@ -40,7 +40,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeRecentChooserEditor, glade_recent_chooser_editor, glade_recent_chooser_editor_editable_init)); static void -glade_recent_chooser_editor_class_init (GladeRecentChooserEditorClass * klass) +glade_recent_chooser_editor_class_init (GladeRecentChooserEditorClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -51,7 +51,7 @@ glade_recent_chooser_editor_class_init (GladeRecentChooserEditorClass * klass) } static void -glade_recent_chooser_editor_init (GladeRecentChooserEditor * self) +glade_recent_chooser_editor_init (GladeRecentChooserEditor *self) { self->priv = glade_recent_chooser_editor_get_instance_private (self); @@ -60,7 +60,7 @@ glade_recent_chooser_editor_init (GladeRecentChooserEditor * self) static void glade_recent_chooser_editor_load (GladeEditable *editable, - GladeWidget *gwidget) + GladeWidget *gwidget) { GladeRecentChooserEditor *recent_editor = GLADE_RECENT_CHOOSER_EDITOR (editable); GladeRecentChooserEditorPrivate *priv = recent_editor->priv; @@ -82,7 +82,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -glade_recent_chooser_editor_editable_init (GladeEditableIface * iface) +glade_recent_chooser_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_interface_peek_parent (iface); diff --git a/plugins/gtk+/glade-recent-chooser-editor.h b/plugins/gtk+/glade-recent-chooser-editor.h index c1b703f6..f737bd24 100644 --- a/plugins/gtk+/glade-recent-chooser-editor.h +++ b/plugins/gtk+/glade-recent-chooser-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_RECENT_CHOOSER_EDITOR (glade_recent_chooser_editor_get_type ()) -#define GLADE_RECENT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR, GladeRecentChooserEditor)) +#define GLADE_TYPE_RECENT_CHOOSER_EDITOR (glade_recent_chooser_editor_get_type ()) +#define GLADE_RECENT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR, GladeRecentChooserEditor)) #define GLADE_RECENT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_EDITOR, GladeRecentChooserEditorClass)) -#define GLADE_IS_RECENT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR)) -#define GLADE_IS_RECENT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_EDITOR)) -#define GLADE_RECENT_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR, GladeRecentChooserEditorClass)) +#define GLADE_IS_RECENT_CHOOSER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR)) +#define GLADE_IS_RECENT_CHOOSER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_EDITOR)) +#define GLADE_RECENT_CHOOSER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_EDITOR, GladeRecentChooserEditorClass)) typedef struct _GladeRecentChooserEditor GladeRecentChooserEditor; typedef struct _GladeRecentChooserEditorClass GladeRecentChooserEditorClass; diff --git a/plugins/gtk+/glade-recent-chooser-menu-editor.h b/plugins/gtk+/glade-recent-chooser-menu-editor.h index 4bfd8054..d75c7b90 100644 --- a/plugins/gtk+/glade-recent-chooser-menu-editor.h +++ b/plugins/gtk+/glade-recent-chooser-menu-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR (glade_recent_chooser_menu_editor_get_type ()) -#define GLADE_RECENT_CHOOSER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditor)) -#define GLADE_RECENT_CHOOSER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditorClass)) -#define GLADE_IS_RECENT_CHOOSER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR)) -#define GLADE_IS_RECENT_CHOOSER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR)) -#define GLADE_RECENT_CHOOSER_MENU_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditorClass)) +#define GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR (glade_recent_chooser_menu_editor_get_type ()) +#define GLADE_RECENT_CHOOSER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditor)) +#define GLADE_RECENT_CHOOSER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditorClass)) +#define GLADE_IS_RECENT_CHOOSER_MENU_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR)) +#define GLADE_IS_RECENT_CHOOSER_MENU_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR)) +#define GLADE_RECENT_CHOOSER_MENU_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_MENU_EDITOR, GladeRecentChooserMenuEditorClass)) typedef struct _GladeRecentChooserMenuEditor GladeRecentChooserMenuEditor; typedef struct _GladeRecentChooserMenuEditorClass GladeRecentChooserMenuEditorClass; diff --git a/plugins/gtk+/glade-recent-chooser-widget-editor.h b/plugins/gtk+/glade-recent-chooser-widget-editor.h index 2ea03793..24cf4f60 100644 --- a/plugins/gtk+/glade-recent-chooser-widget-editor.h +++ b/plugins/gtk+/glade-recent-chooser-widget-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR (glade_recent_chooser_widget_editor_get_type ()) -#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditor)) -#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditorClass)) -#define GLADE_IS_RECENT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR)) -#define GLADE_IS_RECENT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR)) -#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditorClass)) +#define GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR (glade_recent_chooser_widget_editor_get_type ()) +#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditor)) +#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditorClass)) +#define GLADE_IS_RECENT_CHOOSER_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR)) +#define GLADE_IS_RECENT_CHOOSER_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR)) +#define GLADE_RECENT_CHOOSER_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_RECENT_CHOOSER_WIDGET_EDITOR, GladeRecentChooserWidgetEditorClass)) typedef struct _GladeRecentChooserWidgetEditor GladeRecentChooserWidgetEditor; typedef struct _GladeRecentChooserWidgetEditorClass GladeRecentChooserWidgetEditorClass; diff --git a/plugins/gtk+/glade-scale-button-editor.h b/plugins/gtk+/glade-scale-button-editor.h index bf389517..56c9d97e 100644 --- a/plugins/gtk+/glade-scale-button-editor.h +++ b/plugins/gtk+/glade-scale-button-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SCALE_BUTTON_EDITOR (glade_scale_button_editor_get_type ()) -#define GLADE_SCALE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditor)) -#define GLADE_SCALE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditorClass)) -#define GLADE_IS_SCALE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR)) -#define GLADE_IS_SCALE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCALE_BUTTON_EDITOR)) -#define GLADE_SCALE_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditorClass)) +#define GLADE_TYPE_SCALE_BUTTON_EDITOR (glade_scale_button_editor_get_type ()) +#define GLADE_SCALE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditor)) +#define GLADE_SCALE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditorClass)) +#define GLADE_IS_SCALE_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR)) +#define GLADE_IS_SCALE_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCALE_BUTTON_EDITOR)) +#define GLADE_SCALE_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCALE_BUTTON_EDITOR, GladeScaleButtonEditorClass)) typedef struct _GladeScaleButtonEditor GladeScaleButtonEditor; typedef struct _GladeScaleButtonEditorClass GladeScaleButtonEditorClass; diff --git a/plugins/gtk+/glade-scale-editor.h b/plugins/gtk+/glade-scale-editor.h index 9201cb32..1af20426 100644 --- a/plugins/gtk+/glade-scale-editor.h +++ b/plugins/gtk+/glade-scale-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SCALE_EDITOR (glade_scale_editor_get_type ()) -#define GLADE_SCALE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditor)) -#define GLADE_SCALE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditorClass)) -#define GLADE_IS_SCALE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCALE_EDITOR)) -#define GLADE_IS_SCALE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCALE_EDITOR)) -#define GLADE_SCALE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditorClass)) +#define GLADE_TYPE_SCALE_EDITOR (glade_scale_editor_get_type ()) +#define GLADE_SCALE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditor)) +#define GLADE_SCALE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditorClass)) +#define GLADE_IS_SCALE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCALE_EDITOR)) +#define GLADE_IS_SCALE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCALE_EDITOR)) +#define GLADE_SCALE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCALE_EDITOR, GladeScaleEditorClass)) typedef struct _GladeScaleEditor GladeScaleEditor; typedef struct _GladeScaleEditorClass GladeScaleEditorClass; diff --git a/plugins/gtk+/glade-scrollable-editor.h b/plugins/gtk+/glade-scrollable-editor.h index 1d7e8874..8735fe00 100644 --- a/plugins/gtk+/glade-scrollable-editor.h +++ b/plugins/gtk+/glade-scrollable-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SCROLLABLE_EDITOR (glade_scrollable_editor_get_type ()) -#define GLADE_SCROLLABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditor)) -#define GLADE_SCROLLABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditorClass)) -#define GLADE_IS_SCROLLABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLABLE_EDITOR)) -#define GLADE_IS_SCROLLABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLABLE_EDITOR)) -#define GLADE_SCROLLABLE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditorClass)) +#define GLADE_TYPE_SCROLLABLE_EDITOR (glade_scrollable_editor_get_type ()) +#define GLADE_SCROLLABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditor)) +#define GLADE_SCROLLABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditorClass)) +#define GLADE_IS_SCROLLABLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLABLE_EDITOR)) +#define GLADE_IS_SCROLLABLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLABLE_EDITOR)) +#define GLADE_SCROLLABLE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLABLE_EDITOR, GladeScrollableEditorClass)) typedef struct _GladeScrollableEditor GladeScrollableEditor; typedef struct _GladeScrollableEditorClass GladeScrollableEditorClass; diff --git a/plugins/gtk+/glade-scrollbar-editor.h b/plugins/gtk+/glade-scrollbar-editor.h index 695bf9e3..479ed895 100644 --- a/plugins/gtk+/glade-scrollbar-editor.h +++ b/plugins/gtk+/glade-scrollbar-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SCROLLBAR_EDITOR (glade_scrollbar_editor_get_type ()) -#define GLADE_SCROLLBAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditor)) -#define GLADE_SCROLLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditorClass)) -#define GLADE_IS_SCROLLBAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLBAR_EDITOR)) -#define GLADE_IS_SCROLLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLBAR_EDITOR)) -#define GLADE_SCROLLBAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditorClass)) +#define GLADE_TYPE_SCROLLBAR_EDITOR (glade_scrollbar_editor_get_type ()) +#define GLADE_SCROLLBAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditor)) +#define GLADE_SCROLLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditorClass)) +#define GLADE_IS_SCROLLBAR_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLBAR_EDITOR)) +#define GLADE_IS_SCROLLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLBAR_EDITOR)) +#define GLADE_SCROLLBAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLBAR_EDITOR, GladeScrollbarEditorClass)) typedef struct _GladeScrollbarEditor GladeScrollbarEditor; typedef struct _GladeScrollbarEditorClass GladeScrollbarEditorClass; diff --git a/plugins/gtk+/glade-scrolled-window-editor.h b/plugins/gtk+/glade-scrolled-window-editor.h index 26e00a84..2d0b4bf7 100644 --- a/plugins/gtk+/glade-scrolled-window-editor.h +++ b/plugins/gtk+/glade-scrolled-window-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SCROLLED_WINDOW_EDITOR (glade_scrolled_window_editor_get_type ()) -#define GLADE_SCROLLED_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditor)) -#define GLADE_SCROLLED_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditorClass)) -#define GLADE_IS_SCROLLED_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR)) -#define GLADE_IS_SCROLLED_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLED_WINDOW_EDITOR)) -#define GLADE_SCROLLED_WINDOW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditorClass)) +#define GLADE_TYPE_SCROLLED_WINDOW_EDITOR (glade_scrolled_window_editor_get_type ()) +#define GLADE_SCROLLED_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditor)) +#define GLADE_SCROLLED_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditorClass)) +#define GLADE_IS_SCROLLED_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR)) +#define GLADE_IS_SCROLLED_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SCROLLED_WINDOW_EDITOR)) +#define GLADE_SCROLLED_WINDOW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SCROLLED_WINDOW_EDITOR, GladeScrolledWindowEditorClass)) typedef struct _GladeScrolledWindowEditor GladeScrolledWindowEditor; typedef struct _GladeScrolledWindowEditorClass GladeScrolledWindowEditorClass; diff --git a/plugins/gtk+/glade-spin-button-editor.h b/plugins/gtk+/glade-spin-button-editor.h index c144003f..3d4d80ff 100644 --- a/plugins/gtk+/glade-spin-button-editor.h +++ b/plugins/gtk+/glade-spin-button-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_SPIN_BUTTON_EDITOR (glade_spin_button_editor_get_type ()) -#define GLADE_SPIN_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditor)) -#define GLADE_SPIN_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditorClass)) -#define GLADE_IS_SPIN_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR)) -#define GLADE_IS_SPIN_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SPIN_BUTTON_EDITOR)) -#define GLADE_SPIN_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditorClass)) +#define GLADE_TYPE_SPIN_BUTTON_EDITOR (glade_spin_button_editor_get_type ()) +#define GLADE_SPIN_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditor)) +#define GLADE_SPIN_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditorClass)) +#define GLADE_IS_SPIN_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR)) +#define GLADE_IS_SPIN_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SPIN_BUTTON_EDITOR)) +#define GLADE_SPIN_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_SPIN_BUTTON_EDITOR, GladeSpinButtonEditorClass)) typedef struct _GladeSpinButtonEditor GladeSpinButtonEditor; typedef struct _GladeSpinButtonEditorClass GladeSpinButtonEditorClass; diff --git a/plugins/gtk+/glade-stack-editor.h b/plugins/gtk+/glade-stack-editor.h index 29ba18dd..a68ead20 100644 --- a/plugins/gtk+/glade-stack-editor.h +++ b/plugins/gtk+/glade-stack-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_STACK_EDITOR (glade_stack_editor_get_type ()) -#define GLADE_STACK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STACK_EDITOR, GladeStackEditor)) -#define GLADE_STACK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STACK_EDITOR, GladeStackEditorClass)) -#define GLADE_IS_STACK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STACK_EDITOR)) -#define GLADE_IS_STACK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STACK_EDITOR)) -#define GLADE_STACK_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STACK_EDITOR, GladeStackEditorClass)) +#define GLADE_TYPE_STACK_EDITOR (glade_stack_editor_get_type ()) +#define GLADE_STACK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STACK_EDITOR, GladeStackEditor)) +#define GLADE_STACK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STACK_EDITOR, GladeStackEditorClass)) +#define GLADE_IS_STACK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STACK_EDITOR)) +#define GLADE_IS_STACK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STACK_EDITOR)) +#define GLADE_STACK_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STACK_EDITOR, GladeStackEditorClass)) typedef struct _GladeStackEditor GladeStackEditor; typedef struct _GladeStackEditorClass GladeStackEditorClass; diff --git a/plugins/gtk+/glade-stack-switcher-editor.h b/plugins/gtk+/glade-stack-switcher-editor.h index 343e37c6..fde25b39 100644 --- a/plugins/gtk+/glade-stack-switcher-editor.h +++ b/plugins/gtk+/glade-stack-switcher-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_STACK_SWITCHER_EDITOR (glade_stack_switcher_editor_get_type ()) -#define GLADE_STACK_SWITCHER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditor)) -#define GLADE_STACK_SWITCHER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditorClass)) -#define GLADE_IS_STACK_SWITCHER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR)) -#define GLADE_IS_STACK_SWITCHER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STACK_SWITCHER_EDITOR)) -#define GLADE_STACK_SWITCHER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditorClass)) +#define GLADE_TYPE_STACK_SWITCHER_EDITOR (glade_stack_switcher_editor_get_type ()) +#define GLADE_STACK_SWITCHER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditor)) +#define GLADE_STACK_SWITCHER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditorClass)) +#define GLADE_IS_STACK_SWITCHER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR)) +#define GLADE_IS_STACK_SWITCHER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STACK_SWITCHER_EDITOR)) +#define GLADE_STACK_SWITCHER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STACK_SWITCHER_EDITOR, GladeStackSwitcherEditorClass)) typedef struct _GladeStackSwitcherEditor GladeStackSwitcherEditor; typedef struct _GladeStackSwitcherEditorClass GladeStackSwitcherEditorClass; diff --git a/plugins/gtk+/glade-store-editor.c b/plugins/gtk+/glade-store-editor.c index 51003a07..802cf61b 100644 --- a/plugins/gtk+/glade-store-editor.c +++ b/plugins/gtk+/glade-store-editor.c @@ -27,11 +27,11 @@ #include "glade-store-editor.h" -static void glade_store_editor_finalize (GObject * object); +static void glade_store_editor_finalize (GObject *object); -static void glade_store_editor_editable_init (GladeEditableIface * iface); +static void glade_store_editor_editable_init (GladeEditableIface *iface); -static void glade_store_editor_grab_focus (GtkWidget * widget); +static void glade_store_editor_grab_focus (GtkWidget *widget); static GladeEditableIface *parent_editable_iface; @@ -42,7 +42,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeStoreEditor, glade_store_editor, GTK_TYPE_BOX, static void -glade_store_editor_class_init (GladeStoreEditorClass * klass) +glade_store_editor_class_init (GladeStoreEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -52,14 +52,14 @@ glade_store_editor_class_init (GladeStoreEditorClass * klass) } static void -glade_store_editor_init (GladeStoreEditor * self) +glade_store_editor_init (GladeStoreEditor *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); } static void -glade_store_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_store_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeStoreEditor *store_editor = GLADE_STORE_EDITOR (editable); GList *l; @@ -77,7 +77,7 @@ glade_store_editor_load (GladeEditable * editable, GladeWidget * widget) } static void -glade_store_editor_set_show_name (GladeEditable * editable, gboolean show_name) +glade_store_editor_set_show_name (GladeEditable *editable, gboolean show_name) { GladeStoreEditor *store_editor = GLADE_STORE_EDITOR (editable); @@ -86,7 +86,7 @@ glade_store_editor_set_show_name (GladeEditable * editable, gboolean show_name) } static void -glade_store_editor_editable_init (GladeEditableIface * iface) +glade_store_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); @@ -95,7 +95,7 @@ glade_store_editor_editable_init (GladeEditableIface * iface) } static void -glade_store_editor_finalize (GObject * object) +glade_store_editor_finalize (GObject *object) { GladeStoreEditor *store_editor = GLADE_STORE_EDITOR (object); @@ -110,7 +110,7 @@ glade_store_editor_finalize (GObject * object) } static void -glade_store_editor_grab_focus (GtkWidget * widget) +glade_store_editor_grab_focus (GtkWidget *widget) { GladeStoreEditor *store_editor = GLADE_STORE_EDITOR (widget); @@ -118,7 +118,7 @@ glade_store_editor_grab_focus (GtkWidget * widget) } GtkWidget * -glade_store_editor_new (GladeWidgetAdaptor * adaptor, GladeEditable * embed) +glade_store_editor_new (GladeWidgetAdaptor *adaptor, GladeEditable *embed) { GladeStoreEditor *store_editor; GladeEditorProperty *eprop; diff --git a/plugins/gtk+/glade-store-editor.h b/plugins/gtk+/glade-store-editor.h index d8942d68..77c3d416 100644 --- a/plugins/gtk+/glade-store-editor.h +++ b/plugins/gtk+/glade-store-editor.h @@ -25,33 +25,33 @@ G_BEGIN_DECLS -#define GLADE_TYPE_STORE_EDITOR (glade_store_editor_get_type ()) -#define GLADE_STORE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STORE_EDITOR, GladeStoreEditor)) -#define GLADE_STORE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STORE_EDITOR, GladeStoreEditorClass)) -#define GLADE_IS_STORE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STORE_EDITOR)) -#define GLADE_IS_STORE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STORE_EDITOR)) -#define GLADE_STORE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STORE_EDITOR, GladeStoreEditorClass)) +#define GLADE_TYPE_STORE_EDITOR (glade_store_editor_get_type ()) +#define GLADE_STORE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_STORE_EDITOR, GladeStoreEditor)) +#define GLADE_STORE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_STORE_EDITOR, GladeStoreEditorClass)) +#define GLADE_IS_STORE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_STORE_EDITOR)) +#define GLADE_IS_STORE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_STORE_EDITOR)) +#define GLADE_STORE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_STORE_EDITOR, GladeStoreEditorClass)) typedef struct _GladeStoreEditor GladeStoreEditor; typedef struct _GladeStoreEditorClass GladeStoreEditorClass; struct _GladeStoreEditor { - GtkBox parent; + GtkBox parent; - GtkWidget *embed; + GtkWidget *embed; - GList *properties; /* A list of eprops to update at load() time */ + GList *properties; /* A list of eprops to update at load() time */ }; struct _GladeStoreEditorClass { - GtkBoxClass parent; + GtkBoxClass parent; }; GType glade_store_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_store_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-string-list.c b/plugins/gtk+/glade-string-list.c index c4175a62..454e23de 100644 --- a/plugins/gtk+/glade-string-list.c +++ b/plugins/gtk+/glade-string-list.c @@ -37,10 +37,10 @@ **************************************************************/ static GladeString * glade_string_new (const gchar *string, - const gchar *comment, - const gchar *context, - gboolean translatable, - const gchar *id) + const gchar *comment, + const gchar *context, + gboolean translatable, + const gchar *id) { GladeString *gstring = g_slice_new0 (GladeString); @@ -57,10 +57,10 @@ static GladeString * glade_string_copy (GladeString *string) { return glade_string_new (string->string, - string->comment, - string->context, - string->translatable, - string->id); + string->comment, + string->context, + string->translatable, + string->id); } static void @@ -75,11 +75,11 @@ glade_string_free (GladeString *string) GList * glade_string_list_append (GList *list, - const gchar *string, - const gchar *comment, - const gchar *context, - gboolean translatable, - const gchar *id) + const gchar *string, + const gchar *comment, + const gchar *context, + gboolean translatable, + const gchar *id) { GladeString *gstring; @@ -107,7 +107,7 @@ glade_string_list_copy (GList *string_list) } void -glade_string_list_free (GList * string_list) +glade_string_list_free (GList *string_list) { g_list_foreach (string_list, (GFunc)glade_string_free, NULL); g_list_free (string_list); @@ -128,7 +128,7 @@ glade_string_list_get_type (void) gchar * -glade_string_list_to_string (GList *list) +glade_string_list_to_string (GList *list) { GString *string = g_string_new (""); GList *l; @@ -138,14 +138,14 @@ glade_string_list_to_string (GList *list) GladeString *str = l->data; if (l != list) - g_string_append_c (string, ','); + g_string_append_c (string, ','); g_string_append_printf (string, "%s:%s:%s:%d:%s", - str->string, - str->comment ? str->comment : "", - str->context ? str->context : "", - str->translatable, - str->id ? str->id : ""); + str->string, + str->comment ? str->comment : "", + str->context ? str->context : "", + str->translatable, + str->id ? str->id : ""); } return g_string_free (string, FALSE); @@ -182,11 +182,11 @@ enum }; GLADE_MAKE_EPROP (GladeEPropStringList, glade_eprop_string_list) -#define GLADE_EPROP_STRING_LIST(obj) \ +#define GLADE_EPROP_STRING_LIST(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_EPROP_STRING_LIST, GladeEPropStringList)) static void -glade_eprop_string_list_finalize (GObject * object) +glade_eprop_string_list_finalize (GObject *object) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (object); GObjectClass *parent_class = @@ -215,7 +215,7 @@ glade_eprop_string_list_finalize (GObject * object) } static gboolean -update_string_list_idle (GladeEditorProperty * eprop) +update_string_list_idle (GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GValue value = { 0, }; @@ -259,8 +259,8 @@ data_changed_idle (GladeEditorProperty *eprop) if ((string = g_list_nth_data (string_list, index)) != NULL) { - copy = glade_string_copy (string); - new_list = g_list_prepend (new_list, copy); + copy = glade_string_copy (string); + new_list = g_list_prepend (new_list, copy); } } while (gtk_tree_model_iter_next (eprop_string_list->model, &iter)); @@ -280,8 +280,9 @@ data_changed_idle (GladeEditorProperty *eprop) } static void -row_deleted (GtkTreeModel * tree_model, - GtkTreePath * path, GladeEditorProperty * eprop) +row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); @@ -296,7 +297,7 @@ row_deleted (GtkTreeModel * tree_model, } static void -glade_eprop_string_list_load (GladeEditorProperty * eprop, GladeProperty * property) +glade_eprop_string_list_load (GladeEditorProperty *eprop, GladeProperty *property) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GladeEditorPropertyClass *parent_class = @@ -322,20 +323,20 @@ glade_eprop_string_list_load (GladeEditorProperty * eprop, GladeProperty * prope gtk_list_store_append (GTK_LIST_STORE (eprop_string_list->model), &iter); gtk_list_store_set (GTK_LIST_STORE (eprop_string_list->model), &iter, - COLUMN_STRING, string->string, - COLUMN_INDEX, i, - COLUMN_DUMMY, FALSE, - COLUMN_ID, string->id, - -1); + COLUMN_STRING, string->string, + COLUMN_INDEX, i, + COLUMN_DUMMY, FALSE, + COLUMN_ID, string->id, + -1); } gtk_list_store_append (GTK_LIST_STORE (eprop_string_list->model), &iter); gtk_list_store_set (GTK_LIST_STORE (eprop_string_list->model), &iter, - COLUMN_STRING, _("<Type Here>"), - COLUMN_INDEX, i, - COLUMN_DUMMY, TRUE, - COLUMN_ID, NULL, - -1); + COLUMN_STRING, _("<Type Here>"), + COLUMN_INDEX, i, + COLUMN_DUMMY, TRUE, + COLUMN_ID, NULL, + -1); if (eprop_string_list->want_focus) { @@ -351,9 +352,9 @@ glade_eprop_string_list_load (GladeEditorProperty * eprop, GladeProperty * prope static void string_edited (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - GladeEditorProperty *eprop) + gchar *path, + gchar *new_text, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); @@ -365,9 +366,9 @@ string_edited (GtkCellRendererText *renderer, gtk_tree_model_get_iter (eprop_string_list->model, &iter, tree_path); gtk_tree_model_get (eprop_string_list->model, &iter, - COLUMN_INDEX, &index, - COLUMN_DUMMY, &dummy, - -1); + COLUMN_INDEX, &index, + COLUMN_DUMMY, &dummy, + -1); glade_property_get (property, &string_list); @@ -377,16 +378,16 @@ string_edited (GtkCellRendererText *renderer, if (dummy) { if (new_text && new_text[0] && strcmp (new_text, _("<Type Here>")) != 0) - string_list = - glade_string_list_append (string_list, - new_text, NULL, NULL, - eprop_string_list->translatable, - NULL); + string_list = + glade_string_list_append (string_list, + new_text, NULL, NULL, + eprop_string_list->translatable, + NULL); } else if (new_text && new_text[0]) { GladeString *string = - g_list_nth_data (string_list, index); + g_list_nth_data (string_list, index); g_free (string->string); string->string = g_strdup (new_text); @@ -396,7 +397,7 @@ string_edited (GtkCellRendererText *renderer, GList *node = g_list_nth (string_list, index); glade_string_free (node->data); string_list = - g_list_delete_link (string_list, node); + g_list_delete_link (string_list, node); } eprop_string_list->editing_index = index; @@ -414,9 +415,9 @@ string_edited (GtkCellRendererText *renderer, static void id_edited (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - GladeEditorProperty *eprop) + gchar *path, + gchar *new_text, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); @@ -428,8 +429,8 @@ id_edited (GtkCellRendererText *renderer, gtk_tree_model_get_iter (eprop_string_list->model, &iter, tree_path); gtk_tree_model_get (eprop_string_list->model, &iter, - COLUMN_INDEX, &index, - -1); + COLUMN_INDEX, &index, + -1); glade_property_get (property, &string_list); @@ -460,8 +461,8 @@ id_edited (GtkCellRendererText *renderer, static void i18n_icon_activate (GtkCellRenderer *renderer, - const gchar *path, - GladeEditorProperty *eprop) + const gchar *path, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); @@ -473,8 +474,8 @@ i18n_icon_activate (GtkCellRenderer *renderer, gtk_tree_model_get_iter (eprop_string_list->model, &iter, tree_path); gtk_tree_model_get (eprop_string_list->model, &iter, - COLUMN_INDEX, &index, - -1); + COLUMN_INDEX, &index, + -1); glade_property_get (property, &string_list); string_list = glade_string_list_copy (string_list); @@ -490,12 +491,12 @@ i18n_icon_activate (GtkCellRenderer *renderer, eprop_string_list->editing_index = index; if (eprop_string_list->pending_string_list) - glade_string_list_free (eprop_string_list->pending_string_list); + glade_string_list_free (eprop_string_list->pending_string_list); eprop_string_list->pending_string_list = string_list; if (eprop_string_list->update_id == 0) - eprop_string_list->update_id = - g_idle_add ((GSourceFunc) update_string_list_idle, eprop); + eprop_string_list->update_id = + g_idle_add ((GSourceFunc) update_string_list_idle, eprop); } else glade_string_list_free (string_list); @@ -505,10 +506,10 @@ i18n_icon_activate (GtkCellRenderer *renderer, static void cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - GladeEditorProperty *eprop) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); gboolean dummy; @@ -521,24 +522,24 @@ cell_data_func (GtkTreeViewColumn *column, GtkStyleContext* context = gtk_widget_get_style_context (eprop_string_list->view); if (dummy) - { + { gtk_style_context_save (context); gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_INSENSITIVE); - gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); gtk_style_context_restore (context); - g_object_set (renderer, - "style", PANGO_STYLE_ITALIC, - "foreground-rgba", &color, - NULL); - } + g_object_set (renderer, + "style", PANGO_STYLE_ITALIC, + "foreground-rgba", &color, + NULL); + } else - { - gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); - g_object_set (renderer, - "style", PANGO_STYLE_NORMAL, - "foreground-rgba", &color, - NULL); - } + { + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &color); + g_object_set (renderer, + "style", PANGO_STYLE_NORMAL, + "foreground-rgba", &color, + NULL); + } } else if (GLADE_IS_CELL_RENDERER_ICON (renderer)) g_object_set (renderer, "visible", !dummy && eprop_string_list->translatable, NULL); @@ -546,10 +547,10 @@ cell_data_func (GtkTreeViewColumn *column, static void id_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - GladeEditorProperty *eprop) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); @@ -562,41 +563,41 @@ id_cell_data_func (GtkTreeViewColumn *column, gchar *id = NULL; gtk_tree_model_get (eprop_string_list->model, iter, - COLUMN_INDEX, &index, - COLUMN_DUMMY, &dummy, - COLUMN_ID, &id, - -1); + COLUMN_INDEX, &index, + COLUMN_DUMMY, &dummy, + COLUMN_ID, &id, + -1); /* Dummy, no data yet */ if (dummy) - { - g_object_set (renderer, - "editable", FALSE, - "text", NULL, - NULL); - } + { + g_object_set (renderer, + "editable", FALSE, + "text", NULL, + NULL); + } /* Not dummy, and id already set */ else if (id) - { - gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &color); - g_object_set (renderer, - "style", PANGO_STYLE_NORMAL, - "foreground-rgba", &color, - "editable", TRUE, - "text", id, - NULL); - } + { + gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &color); + g_object_set (renderer, + "style", PANGO_STYLE_NORMAL, + "foreground-rgba", &color, + "editable", TRUE, + "text", id, + NULL); + } /* Not dummy, but no id yet */ else - { - gtk_style_context_get_color (context, GTK_STATE_FLAG_INSENSITIVE, &color); - g_object_set (renderer, - "style", PANGO_STYLE_ITALIC, - "foreground-rgba", &color, - "editable", TRUE, - "text", _("<Enter ID>"), - NULL); - } + { + gtk_style_context_get_color (context, GTK_STATE_FLAG_INSENSITIVE, &color); + g_object_set (renderer, + "style", PANGO_STYLE_ITALIC, + "foreground-rgba", &color, + "editable", TRUE, + "text", _("<Enter ID>"), + NULL); + } g_free (id); } @@ -607,8 +608,8 @@ id_cell_data_func (GtkTreeViewColumn *column, static gboolean treeview_key_press (GtkWidget *treeview, - GdkEventKey *event, - GladeEditorProperty *eprop) + GdkEventKey *event, + GladeEditorProperty *eprop) { /* Delete rows from the store, this will trigger "row-deleted" which will @@ -623,19 +624,19 @@ treeview_key_press (GtkWidget *treeview, selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); if ((selected_rows = - gtk_tree_selection_get_selected_rows (selection, NULL)) != NULL) - { - for (l = selected_rows; l; l = l->next) - { - GtkTreePath *path = l->data; - - if (gtk_tree_model_get_iter (eprop_string_list->model, &iter, path)) - gtk_list_store_remove (GTK_LIST_STORE (eprop_string_list->model), &iter); - } - - g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL); - g_list_free (selected_rows); - } + gtk_tree_selection_get_selected_rows (selection, NULL)) != NULL) + { + for (l = selected_rows; l; l = l->next) + { + GtkTreePath *path = l->data; + + if (gtk_tree_model_get_iter (eprop_string_list->model, &iter, path)) + gtk_list_store_remove (GTK_LIST_STORE (eprop_string_list->model), &iter); + } + + g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL); + g_list_free (selected_rows); + } return TRUE; } @@ -651,13 +652,13 @@ get_tree_view_height (void) { GtkWidget *label = gtk_label_new (NULL); PangoLayout *layout = - gtk_widget_create_pango_layout (label, - "The quick\n" - "brown fox\n" - "jumped\n" - "over\n" - "the lazy\n" - "dog"); + gtk_widget_create_pango_layout (label, + "The quick\n" + "brown fox\n" + "jumped\n" + "over\n" + "the lazy\n" + "dog"); pango_layout_get_pixel_size (layout, NULL, &height); @@ -670,7 +671,7 @@ get_tree_view_height (void) } static GtkWidget * -glade_eprop_string_list_create_input (GladeEditorProperty * eprop) +glade_eprop_string_list_create_input (GladeEditorProperty *eprop) { GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); GtkTreeViewColumn *column; @@ -683,54 +684,54 @@ glade_eprop_string_list_create_input (GladeEditorProperty * eprop) /* Text renderer */ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), - "editable", TRUE, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); + "editable", TRUE, + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (string_edited), eprop); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, "text", COLUMN_STRING, NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, - (GtkTreeCellDataFunc)cell_data_func, - eprop, NULL); + (GtkTreeCellDataFunc)cell_data_func, + eprop, NULL); /* "id" renderer */ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), - "editable", TRUE, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); + "editable", TRUE, + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (id_edited), eprop); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_cell_data_func (column, renderer, - (GtkTreeCellDataFunc)id_cell_data_func, - eprop, NULL); + (GtkTreeCellDataFunc)id_cell_data_func, + eprop, NULL); /* i18n icon renderer */ renderer = glade_cell_renderer_icon_new (); g_object_set (G_OBJECT (renderer), "icon-name", "gtk-edit", NULL); g_signal_connect (G_OBJECT (renderer), "activate", - G_CALLBACK (i18n_icon_activate), eprop); + G_CALLBACK (i18n_icon_activate), eprop); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer, - (GtkTreeCellDataFunc)cell_data_func, - eprop, NULL); + (GtkTreeCellDataFunc)cell_data_func, + eprop, NULL); eprop_string_list->model = (GtkTreeModel *)gtk_list_store_new (NUM_COLUMNS, - G_TYPE_STRING, - G_TYPE_UINT, - G_TYPE_BOOLEAN, - G_TYPE_STRING); + G_TYPE_STRING, + G_TYPE_UINT, + G_TYPE_BOOLEAN, + G_TYPE_STRING); g_signal_connect (G_OBJECT (eprop_string_list->model), "row-deleted", - G_CALLBACK (row_deleted), eprop); + G_CALLBACK (row_deleted), eprop); gtk_tree_view_append_column (GTK_TREE_VIEW (eprop_string_list->view), column); gtk_tree_view_set_model (GTK_TREE_VIEW (eprop_string_list->view), - eprop_string_list->model); + eprop_string_list->model); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (eprop_string_list->view), FALSE); gtk_tree_view_set_reorderable (GTK_TREE_VIEW (eprop_string_list->view), TRUE); @@ -742,8 +743,8 @@ glade_eprop_string_list_create_input (GladeEditorProperty * eprop) gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (swindow), get_tree_view_height ()); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (swindow), eprop_string_list->view); @@ -757,15 +758,15 @@ glade_eprop_string_list_create_input (GladeEditorProperty * eprop) GladeEditorProperty * glade_eprop_string_list_new (GladePropertyClass *pclass, - gboolean use_command, - gboolean translatable, - gboolean with_id) + gboolean use_command, + gboolean translatable, + gboolean with_id) { GladeEditorProperty *eprop = g_object_new (GLADE_TYPE_EPROP_STRING_LIST, - "property-class", pclass, - "use-command", use_command, - NULL); + "property-class", pclass, + "use-command", use_command, + NULL); GladeEPropStringList *eprop_string_list = GLADE_EPROP_STRING_LIST (eprop); diff --git a/plugins/gtk+/glade-string-list.h b/plugins/gtk+/glade-string-list.h index 44087dac..355bc451 100644 --- a/plugins/gtk+/glade-string-list.h +++ b/plugins/gtk+/glade-string-list.h @@ -8,7 +8,7 @@ G_BEGIN_DECLS #define GLADE_TYPE_EPROP_STRING_LIST (glade_eprop_string_list_get_type()) -#define GLADE_TYPE_STRING_LIST (glade_string_list_get_type()) +#define GLADE_TYPE_STRING_LIST (glade_string_list_get_type()) /* The GladeStringList boxed type is a GList * of GladeString structs */ typedef struct _GladeString GladeString; @@ -28,18 +28,18 @@ void glade_string_list_free (GList *list); GList *glade_string_list_copy (GList *list); GList *glade_string_list_append (GList *list, - const gchar *string, - const gchar *comment, - const gchar *context, - gboolean translatable, - const gchar *id); + const gchar *string, + const gchar *comment, + const gchar *context, + gboolean translatable, + const gchar *id); gchar *glade_string_list_to_string (GList *list); GladeEditorProperty *glade_eprop_string_list_new (GladePropertyClass *pclass, - gboolean use_command, - gboolean translatable, - gboolean with_id); + gboolean use_command, + gboolean translatable, + gboolean with_id); G_END_DECLS diff --git a/plugins/gtk+/glade-text-view-editor.h b/plugins/gtk+/glade-text-view-editor.h index 2e37d32c..b3ac2516 100644 --- a/plugins/gtk+/glade-text-view-editor.h +++ b/plugins/gtk+/glade-text-view-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_TEXT_VIEW_EDITOR (glade_text_view_editor_get_type ()) -#define GLADE_TEXT_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditor)) -#define GLADE_TEXT_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditorClass)) -#define GLADE_IS_TEXT_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR)) -#define GLADE_IS_TEXT_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TEXT_VIEW_EDITOR)) -#define GLADE_TEXT_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditorClass)) +#define GLADE_TYPE_TEXT_VIEW_EDITOR (glade_text_view_editor_get_type ()) +#define GLADE_TEXT_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditor)) +#define GLADE_TEXT_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditorClass)) +#define GLADE_IS_TEXT_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR)) +#define GLADE_IS_TEXT_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TEXT_VIEW_EDITOR)) +#define GLADE_TEXT_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TEXT_VIEW_EDITOR, GladeTextViewEditorClass)) typedef struct _GladeTextViewEditor GladeTextViewEditor; typedef struct _GladeTextViewEditorClass GladeTextViewEditorClass; diff --git a/plugins/gtk+/glade-tool-button-editor.c b/plugins/gtk+/glade-tool-button-editor.c index da270f9f..70bdf652 100644 --- a/plugins/gtk+/glade-tool-button-editor.c +++ b/plugins/gtk+/glade-tool-button-editor.c @@ -32,15 +32,15 @@ static void glade_tool_button_editor_grab_focus (GtkWidget * widget); /* Callbacks */ static void standard_label_toggled (GtkWidget *widget, - GladeToolButtonEditor *button_editor); + GladeToolButtonEditor *button_editor); static void custom_label_toggled (GtkWidget *widget, - GladeToolButtonEditor *button_editor); + GladeToolButtonEditor *button_editor); static void stock_toggled (GtkWidget *widget, - GladeToolButtonEditor *button_editor); + GladeToolButtonEditor *button_editor); static void icon_toggled (GtkWidget *widget, - GladeToolButtonEditor *button_editor); + GladeToolButtonEditor *button_editor); static void custom_toggled (GtkWidget *widget, - GladeToolButtonEditor *button_editor); + GladeToolButtonEditor *button_editor); struct _GladeToolButtonEditorPrivate { @@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeToolButtonEditor, glade_tool_button_editor, GLADE_ glade_tool_button_editor_editable_init)); static void -glade_tool_button_editor_class_init (GladeToolButtonEditorClass * klass) +glade_tool_button_editor_class_init (GladeToolButtonEditorClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -93,7 +93,7 @@ glade_tool_button_editor_class_init (GladeToolButtonEditorClass * klass) } static void -glade_tool_button_editor_init (GladeToolButtonEditor * self) +glade_tool_button_editor_init (GladeToolButtonEditor *self) { self->priv = glade_tool_button_editor_get_instance_private (self); @@ -101,7 +101,7 @@ glade_tool_button_editor_init (GladeToolButtonEditor * self) } static void -glade_tool_button_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_tool_button_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeToolButtonEditor *button_editor = GLADE_TOOL_BUTTON_EDITOR (editable); GladeToolButtonEditorPrivate *priv = button_editor->priv; @@ -146,8 +146,7 @@ glade_tool_button_editor_load (GladeEditable * editable, GladeWidget * widget) static void -standard_label_toggled (GtkWidget * widget, - GladeToolButtonEditor * button_editor) +standard_label_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor) { GladeToolButtonEditorPrivate *priv = button_editor->priv; GladeProperty *property; @@ -184,7 +183,7 @@ standard_label_toggled (GtkWidget * widget, } static void -custom_label_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) +custom_label_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor) { GladeToolButtonEditorPrivate *priv = button_editor->priv; GladeProperty *property; @@ -215,7 +214,7 @@ custom_label_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) } static void -stock_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) +stock_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor) { GladeToolButtonEditorPrivate *priv = button_editor->priv; GladeProperty *property; @@ -250,7 +249,7 @@ stock_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) } static void -icon_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) +icon_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor) { GladeToolButtonEditorPrivate *priv = button_editor->priv; GladeProperty *property; @@ -285,7 +284,7 @@ icon_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) } static void -custom_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) +custom_toggled (GtkWidget *widget, GladeToolButtonEditor *button_editor) { GladeToolButtonEditorPrivate *priv = button_editor->priv; GladeProperty *property; @@ -320,7 +319,7 @@ custom_toggled (GtkWidget * widget, GladeToolButtonEditor * button_editor) } static void -glade_tool_button_editor_editable_init (GladeEditableIface * iface) +glade_tool_button_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_interface_peek_parent (iface); @@ -328,7 +327,7 @@ glade_tool_button_editor_editable_init (GladeEditableIface * iface) } static void -glade_tool_button_editor_grab_focus (GtkWidget * widget) +glade_tool_button_editor_grab_focus (GtkWidget *widget) { GladeToolButtonEditor *button_editor = GLADE_TOOL_BUTTON_EDITOR (widget); diff --git a/plugins/gtk+/glade-tool-button-editor.h b/plugins/gtk+/glade-tool-button-editor.h index b79c228b..a1d072bd 100644 --- a/plugins/gtk+/glade-tool-button-editor.h +++ b/plugins/gtk+/glade-tool-button-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_TOOL_BUTTON_EDITOR (glade_tool_button_editor_get_type ()) -#define GLADE_TOOL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditor)) -#define GLADE_TOOL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditorClass)) -#define GLADE_IS_TOOL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR)) -#define GLADE_IS_TOOL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_BUTTON_EDITOR)) -#define GLADE_TOOL_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditorClass)) +#define GLADE_TYPE_TOOL_BUTTON_EDITOR (glade_tool_button_editor_get_type ()) +#define GLADE_TOOL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditor)) +#define GLADE_TOOL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditorClass)) +#define GLADE_IS_TOOL_BUTTON_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR)) +#define GLADE_IS_TOOL_BUTTON_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_BUTTON_EDITOR)) +#define GLADE_TOOL_BUTTON_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_BUTTON_EDITOR, GladeToolButtonEditorClass)) typedef struct _GladeToolButtonEditor GladeToolButtonEditor; typedef struct _GladeToolButtonEditorClass GladeToolButtonEditorClass; diff --git a/plugins/gtk+/glade-tool-item-group-editor.c b/plugins/gtk+/glade-tool-item-group-editor.c index 588961a9..47d98673 100644 --- a/plugins/gtk+/glade-tool-item-group-editor.c +++ b/plugins/gtk+/glade-tool-item-group-editor.c @@ -27,11 +27,11 @@ #include "glade-tool-item-group-editor.h" -static void glade_tool_item_group_editor_finalize (GObject * object); +static void glade_tool_item_group_editor_finalize (GObject *object); -static void glade_tool_item_group_editor_editable_init (GladeEditableIface * iface); +static void glade_tool_item_group_editor_editable_init (GladeEditableIface *iface); -static void glade_tool_item_group_editor_grab_focus (GtkWidget * widget); +static void glade_tool_item_group_editor_grab_focus (GtkWidget *widget); static GladeEditableIface *parent_editable_iface; @@ -42,7 +42,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeToolItemGroupEditor, glade_tool_item_group_editor, static void -glade_tool_item_group_editor_class_init (GladeToolItemGroupEditorClass * klass) +glade_tool_item_group_editor_class_init (GladeToolItemGroupEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -52,14 +52,14 @@ glade_tool_item_group_editor_class_init (GladeToolItemGroupEditorClass * klass) } static void -glade_tool_item_group_editor_init (GladeToolItemGroupEditor * self) +glade_tool_item_group_editor_init (GladeToolItemGroupEditor *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_VERTICAL); + GTK_ORIENTATION_VERTICAL); } static void -glade_tool_item_group_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_tool_item_group_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeToolItemGroupEditor *group_editor = GLADE_TOOL_ITEM_GROUP_EDITOR (editable); gboolean custom_label = FALSE; @@ -91,7 +91,7 @@ glade_tool_item_group_editor_load (GladeEditable * editable, GladeWidget * widge } static void -glade_tool_item_group_editor_set_show_name (GladeEditable * editable, gboolean show_name) +glade_tool_item_group_editor_set_show_name (GladeEditable *editable, gboolean show_name) { GladeToolItemGroupEditor *group_editor = GLADE_TOOL_ITEM_GROUP_EDITOR (editable); @@ -100,7 +100,7 @@ glade_tool_item_group_editor_set_show_name (GladeEditable * editable, gboolean s } static void -glade_tool_item_group_editor_editable_init (GladeEditableIface * iface) +glade_tool_item_group_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); @@ -109,7 +109,7 @@ glade_tool_item_group_editor_editable_init (GladeEditableIface * iface) } static void -glade_tool_item_group_editor_finalize (GObject * object) +glade_tool_item_group_editor_finalize (GObject *object) { GladeToolItemGroupEditor *group_editor = GLADE_TOOL_ITEM_GROUP_EDITOR (object); @@ -124,7 +124,7 @@ glade_tool_item_group_editor_finalize (GObject * object) } static void -glade_tool_item_group_editor_grab_focus (GtkWidget * widget) +glade_tool_item_group_editor_grab_focus (GtkWidget *widget) { GladeToolItemGroupEditor *group_editor = GLADE_TOOL_ITEM_GROUP_EDITOR (widget); @@ -133,8 +133,7 @@ glade_tool_item_group_editor_grab_focus (GtkWidget * widget) static void -label_toggled (GtkWidget * widget, - GladeToolItemGroupEditor *group_editor) +label_toggled (GtkWidget *widget, GladeToolItemGroupEditor *group_editor) { GladeProperty *property; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (group_editor)); @@ -171,7 +170,7 @@ label_toggled (GtkWidget * widget, } static void -label_widget_toggled (GtkWidget * widget, GladeToolItemGroupEditor * group_editor) +label_widget_toggled (GtkWidget *widget, GladeToolItemGroupEditor *group_editor) { GladeProperty *property; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (group_editor)); @@ -202,7 +201,7 @@ label_widget_toggled (GtkWidget * widget, GladeToolItemGroupEditor * group_edito } static void -table_attach (GtkWidget * table, GtkWidget * child, gint pos, gint row) +table_attach (GtkWidget *table, GtkWidget *child, gint pos, gint row) { gtk_grid_attach (GTK_GRID (table), child, pos, row, 1, 1); @@ -212,7 +211,7 @@ table_attach (GtkWidget * table, GtkWidget * child, gint pos, gint row) GtkWidget * glade_tool_item_group_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *embed) + GladeEditable *embed) { GladeToolItemGroupEditor *group_editor; GladeEditorProperty *eprop; diff --git a/plugins/gtk+/glade-tool-item-group-editor.h b/plugins/gtk+/glade-tool-item-group-editor.h index ac229ad3..56594703 100644 --- a/plugins/gtk+/glade-tool-item-group-editor.h +++ b/plugins/gtk+/glade-tool-item-group-editor.h @@ -25,36 +25,36 @@ G_BEGIN_DECLS -#define GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR (glade_tool_item_group_editor_get_type ()) -#define GLADE_TOOL_ITEM_GROUP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditor)) -#define GLADE_TOOL_ITEM_GROUP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditorClass)) -#define GLADE_IS_TOOL_ITEM_GROUP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR)) -#define GLADE_IS_TOOL_ITEM_GROUP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR)) -#define GLADE_TOOL_ITEM_GROUP_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditorClass)) +#define GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR (glade_tool_item_group_editor_get_type ()) +#define GLADE_TOOL_ITEM_GROUP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditor)) +#define GLADE_TOOL_ITEM_GROUP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditorClass)) +#define GLADE_IS_TOOL_ITEM_GROUP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR)) +#define GLADE_IS_TOOL_ITEM_GROUP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR)) +#define GLADE_TOOL_ITEM_GROUP_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_ITEM_GROUP_EDITOR, GladeToolItemGroupEditorClass)) typedef struct _GladeToolItemGroupEditor GladeToolItemGroupEditor; typedef struct _GladeToolItemGroupEditorClass GladeToolItemGroupEditorClass; struct _GladeToolItemGroupEditor { - GtkBox parent; + GtkBox parent; - GtkWidget *embed; + GtkWidget *embed; - GtkWidget *label_radio; /* Set the label directly */ - GtkWidget *label_widget_radio; /* Use the custom label widget */ + GtkWidget *label_radio; /* Set the label directly */ + GtkWidget *label_widget_radio; /* Use the custom label widget */ - GList *properties; /* A list of eprops to update at load() time */ + GList *properties; /* A list of eprops to update at load() time */ }; struct _GladeToolItemGroupEditorClass { - GtkBoxClass parent; + GtkBoxClass parent; }; GType glade_tool_item_group_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_tool_item_group_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-tool-palette-editor.h b/plugins/gtk+/glade-tool-palette-editor.h index 77db7e75..56925df2 100644 --- a/plugins/gtk+/glade-tool-palette-editor.h +++ b/plugins/gtk+/glade-tool-palette-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_TOOL_PALETTE_EDITOR (glade_tool_palette_editor_get_type ()) -#define GLADE_TOOL_PALETTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditor)) -#define GLADE_TOOL_PALETTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditorClass)) -#define GLADE_IS_TOOL_PALETTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR)) -#define GLADE_IS_TOOL_PALETTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_PALETTE_EDITOR)) -#define GLADE_TOOL_PALETTE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditorClass)) +#define GLADE_TYPE_TOOL_PALETTE_EDITOR (glade_tool_palette_editor_get_type ()) +#define GLADE_TOOL_PALETTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditor)) +#define GLADE_TOOL_PALETTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditorClass)) +#define GLADE_IS_TOOL_PALETTE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR)) +#define GLADE_IS_TOOL_PALETTE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TOOL_PALETTE_EDITOR)) +#define GLADE_TOOL_PALETTE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TOOL_PALETTE_EDITOR, GladeToolPaletteEditorClass)) typedef struct _GladeToolPaletteEditor GladeToolPaletteEditor; typedef struct _GladeToolPaletteEditorClass GladeToolPaletteEditorClass; diff --git a/plugins/gtk+/glade-treeview-editor.c b/plugins/gtk+/glade-treeview-editor.c index 73c406ea..d70a06d6 100644 --- a/plugins/gtk+/glade-treeview-editor.c +++ b/plugins/gtk+/glade-treeview-editor.c @@ -26,12 +26,12 @@ #include "glade-treeview-editor.h" -static void glade_tree_view_editor_finalize (GObject * object); +static void glade_tree_view_editor_finalize (GObject *object); -static void glade_tree_view_editor_editable_init (GladeEditableIface * iface); +static void glade_tree_view_editor_editable_init (GladeEditableIface *iface); -static void glade_tree_view_editor_realize (GtkWidget * widget); -static void glade_tree_view_editor_grab_focus (GtkWidget * widget); +static void glade_tree_view_editor_realize (GtkWidget *widget); +static void glade_tree_view_editor_grab_focus (GtkWidget *widget); @@ -43,7 +43,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeTreeViewEditor, glade_tree_view_editor, GTK_TYPE_B static void -glade_tree_view_editor_class_init (GladeTreeViewEditorClass * klass) +glade_tree_view_editor_class_init (GladeTreeViewEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -55,14 +55,14 @@ glade_tree_view_editor_class_init (GladeTreeViewEditorClass * klass) } static void -glade_tree_view_editor_init (GladeTreeViewEditor * self) +glade_tree_view_editor_init (GladeTreeViewEditor *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), - GTK_ORIENTATION_HORIZONTAL); + GTK_ORIENTATION_HORIZONTAL); } static GladeWidget * -get_model_widget (GladeWidget * view) +get_model_widget (GladeWidget *view) { GtkTreeModel *model = NULL; @@ -82,7 +82,7 @@ get_model_widget (GladeWidget * view) } static void -glade_tree_view_editor_load (GladeEditable * editable, GladeWidget * widget) +glade_tree_view_editor_load (GladeEditable *editable, GladeWidget *widget) { GladeTreeViewEditor *view_editor = GLADE_TREE_VIEW_EDITOR (editable); GladeWidget *model_widget; @@ -130,8 +130,8 @@ glade_tree_view_editor_load (GladeEditable * editable, GladeWidget * widget) } static void -glade_tree_view_editor_set_show_name (GladeEditable * editable, - gboolean show_name) +glade_tree_view_editor_set_show_name (GladeEditable *editable, + gboolean show_name) { GladeTreeViewEditor *view_editor = GLADE_TREE_VIEW_EDITOR (editable); @@ -139,7 +139,7 @@ glade_tree_view_editor_set_show_name (GladeEditable * editable, } static void -glade_tree_view_editor_editable_init (GladeEditableIface * iface) +glade_tree_view_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_default_interface_peek (GLADE_TYPE_EDITABLE); @@ -148,7 +148,7 @@ glade_tree_view_editor_editable_init (GladeEditableIface * iface) } static void -glade_tree_view_editor_finalize (GObject * object) +glade_tree_view_editor_finalize (GObject *object) { GladeTreeViewEditor *view_editor = GLADE_TREE_VIEW_EDITOR (object); @@ -163,7 +163,7 @@ glade_tree_view_editor_finalize (GObject * object) static void -glade_tree_view_editor_realize (GtkWidget * widget) +glade_tree_view_editor_realize (GtkWidget *widget) { GladeTreeViewEditor *view_editor = GLADE_TREE_VIEW_EDITOR (widget); GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (view_editor)); @@ -182,7 +182,7 @@ glade_tree_view_editor_grab_focus (GtkWidget * widget) } GtkWidget * -glade_tree_view_editor_new (GladeWidgetAdaptor * adaptor, GladeEditable * embed) +glade_tree_view_editor_new (GladeWidgetAdaptor *adaptor, GladeEditable *embed) { GladeTreeViewEditor *view_editor; GtkWidget *vbox, *separator; diff --git a/plugins/gtk+/glade-treeview-editor.h b/plugins/gtk+/glade-treeview-editor.h index d9c43623..6c0d5c4f 100644 --- a/plugins/gtk+/glade-treeview-editor.h +++ b/plugins/gtk+/glade-treeview-editor.h @@ -25,34 +25,34 @@ G_BEGIN_DECLS -#define GLADE_TYPE_TREE_VIEW_EDITOR (glade_tree_view_editor_get_type ()) -#define GLADE_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditor)) -#define GLADE_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditorClass)) -#define GLADE_IS_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TREE_VIEW_EDITOR)) -#define GLADE_IS_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TREE_VIEW_EDITOR)) -#define GLADE_TREE_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditorClass)) +#define GLADE_TYPE_TREE_VIEW_EDITOR (glade_tree_view_editor_get_type ()) +#define GLADE_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditor)) +#define GLADE_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditorClass)) +#define GLADE_IS_TREE_VIEW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_TREE_VIEW_EDITOR)) +#define GLADE_IS_TREE_VIEW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_TREE_VIEW_EDITOR)) +#define GLADE_TREE_VIEW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_TREE_VIEW_EDITOR, GladeTreeViewEditorClass)) typedef struct _GladeTreeViewEditor GladeTreeViewEditor; typedef struct _GladeTreeViewEditorClass GladeTreeViewEditorClass; struct _GladeTreeViewEditor { - GtkBox parent; + GtkBox parent; - GtkWidget *embed; - GtkWidget *embed_list_store; - GtkWidget *embed_tree_store; - GtkWidget *no_model_message; + GtkWidget *embed; + GtkWidget *embed_list_store; + GtkWidget *embed_tree_store; + GtkWidget *no_model_message; }; struct _GladeTreeViewEditorClass { - GtkBoxClass parent; + GtkBoxClass parent; }; GType glade_tree_view_editor_get_type (void) G_GNUC_CONST; GtkWidget *glade_tree_view_editor_new (GladeWidgetAdaptor *adaptor, - GladeEditable *editable); + GladeEditable *editable); G_END_DECLS diff --git a/plugins/gtk+/glade-viewport-editor.h b/plugins/gtk+/glade-viewport-editor.h index 77ba5901..98900a8a 100644 --- a/plugins/gtk+/glade-viewport-editor.h +++ b/plugins/gtk+/glade-viewport-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_VIEWPORT_EDITOR (glade_viewport_editor_get_type ()) -#define GLADE_VIEWPORT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditor)) -#define GLADE_VIEWPORT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditorClass)) -#define GLADE_IS_VIEWPORT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_VIEWPORT_EDITOR)) -#define GLADE_IS_VIEWPORT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_VIEWPORT_EDITOR)) -#define GLADE_VIEWPORT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditorClass)) +#define GLADE_TYPE_VIEWPORT_EDITOR (glade_viewport_editor_get_type ()) +#define GLADE_VIEWPORT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditor)) +#define GLADE_VIEWPORT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditorClass)) +#define GLADE_IS_VIEWPORT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_VIEWPORT_EDITOR)) +#define GLADE_IS_VIEWPORT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_VIEWPORT_EDITOR)) +#define GLADE_VIEWPORT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_VIEWPORT_EDITOR, GladeViewportEditorClass)) typedef struct _GladeViewportEditor GladeViewportEditor; typedef struct _GladeViewportEditorClass GladeViewportEditorClass; diff --git a/plugins/gtk+/glade-widget-editor.c b/plugins/gtk+/glade-widget-editor.c index c477efef..ddf3367c 100644 --- a/plugins/gtk+/glade-widget-editor.c +++ b/plugins/gtk+/glade-widget-editor.c @@ -27,12 +27,12 @@ #include "glade-widget-editor.h" -static void glade_widget_editor_finalize (GObject * object); +static void glade_widget_editor_finalize (GObject *object); -static void glade_widget_editor_editable_init (GladeEditableIface * iface); +static void glade_widget_editor_editable_init (GladeEditableIface *iface); -static void markup_toggled (GtkWidget * widget, GladeWidgetEditor * widget_editor); -static void custom_tooltip_toggled (GtkWidget * widget, GladeWidgetEditor * widget_editor); +static void markup_toggled (GtkWidget * widget, GladeWidgetEditor *widget_editor); +static void custom_tooltip_toggled (GtkWidget *widget, GladeWidgetEditor *widget_editor); struct _GladeWidgetEditorPrivate { @@ -59,7 +59,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeWidgetEditor, glade_widget_editor, GLADE_TYPE_EDIT glade_widget_editor_editable_init)); static void -glade_widget_editor_class_init (GladeWidgetEditorClass * klass) +glade_widget_editor_class_init (GladeWidgetEditorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -82,7 +82,7 @@ glade_widget_editor_class_init (GladeWidgetEditorClass * klass) } static void -glade_widget_editor_init (GladeWidgetEditor * self) +glade_widget_editor_init (GladeWidgetEditor *self) { self->priv = glade_widget_editor_get_instance_private (self); @@ -90,7 +90,7 @@ glade_widget_editor_init (GladeWidgetEditor * self) } static void -glade_widget_editor_load (GladeEditable * editable, GladeWidget * gwidget) +glade_widget_editor_load (GladeEditable *editable, GladeWidget *gwidget) { GladeWidgetEditor *widget_editor = GLADE_WIDGET_EDITOR (editable); GladeWidgetEditorPrivate *priv = widget_editor->priv; @@ -110,9 +110,9 @@ glade_widget_editor_load (GladeEditable * editable, GladeWidget * gwidget) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->tooltip_markup_check), tooltip_markup); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->tooltip_label_notebook), - tooltip_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + tooltip_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->tooltip_editor_notebook), - tooltip_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); + tooltip_markup ? TOOLTIP_MARKUP_PAGE : TOOLTIP_TEXT_PAGE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->custom_tooltip_check), custom_tooltip); gtk_widget_set_sensitive (priv->tooltip_markup_check, !custom_tooltip); @@ -128,7 +128,7 @@ glade_widget_editor_load (GladeEditable * editable, GladeWidget * gwidget) } static void -glade_widget_editor_editable_init (GladeEditableIface * iface) +glade_widget_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_interface_peek_parent (iface); @@ -136,7 +136,7 @@ glade_widget_editor_editable_init (GladeEditableIface * iface) } static void -glade_widget_editor_finalize (GObject * object) +glade_widget_editor_finalize (GObject *object) { glade_editable_load (GLADE_EDITABLE (object), NULL); @@ -145,7 +145,7 @@ glade_widget_editor_finalize (GObject * object) static void custom_tooltip_toggled (GtkWidget *widget, - GladeWidgetEditor *widget_editor) + GladeWidgetEditor *widget_editor) { GladeProperty *property; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (widget_editor)); @@ -161,7 +161,7 @@ custom_tooltip_toggled (GtkWidget *widget, if (active) { glade_command_push_group (_("Setting %s to use a custom tooltip"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* clear out some things... */ property = glade_widget_get_property (gwidget, "tooltip-text"); @@ -181,7 +181,7 @@ custom_tooltip_toggled (GtkWidget *widget, else { glade_command_push_group (_("Setting %s to use a custom tooltip"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* clear out some things... */ property = glade_widget_get_property (gwidget, "tooltip-text"); @@ -207,8 +207,8 @@ custom_tooltip_toggled (GtkWidget *widget, static void transfer_text_property (GladeWidget *gwidget, - const gchar *from, - const gchar *to) + const gchar *from, + const gchar *to) { gchar *value = NULL; gchar *comment = NULL, *context = NULL; @@ -246,7 +246,7 @@ transfer_text_property (GladeWidget *gwidget, static void markup_toggled (GtkWidget *widget, - GladeWidgetEditor *widget_editor) + GladeWidgetEditor *widget_editor) { GladeProperty *property; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (widget_editor)); @@ -263,7 +263,7 @@ markup_toggled (GtkWidget *widget, if (active) { glade_command_push_group (_("Setting %s to use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); transfer_text_property (gwidget, "tooltip-text", "tooltip-markup"); @@ -275,7 +275,7 @@ markup_toggled (GtkWidget *widget, else { glade_command_push_group (_("Setting %s to not use tooltip markup"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); transfer_text_property (gwidget, "tooltip-markup", "tooltip-text"); diff --git a/plugins/gtk+/glade-widget-editor.h b/plugins/gtk+/glade-widget-editor.h index 7d313401..605254a6 100644 --- a/plugins/gtk+/glade-widget-editor.h +++ b/plugins/gtk+/glade-widget-editor.h @@ -25,12 +25,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_WIDGET_EDITOR (glade_widget_editor_get_type ()) -#define GLADE_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditor)) -#define GLADE_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditorClass)) -#define GLADE_IS_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_WIDGET_EDITOR)) -#define GLADE_IS_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_WIDGET_EDITOR)) -#define GLADE_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditorClass)) +#define GLADE_TYPE_WIDGET_EDITOR (glade_widget_editor_get_type ()) +#define GLADE_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditor)) +#define GLADE_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditorClass)) +#define GLADE_IS_WIDGET_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_WIDGET_EDITOR)) +#define GLADE_IS_WIDGET_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_WIDGET_EDITOR)) +#define GLADE_WIDGET_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_WIDGET_EDITOR, GladeWidgetEditorClass)) typedef struct _GladeWidgetEditor GladeWidgetEditor; typedef struct _GladeWidgetEditorClass GladeWidgetEditorClass; diff --git a/plugins/gtk+/glade-window-editor.c b/plugins/gtk+/glade-window-editor.c index 0ea7c79d..fbf73a95 100644 --- a/plugins/gtk+/glade-window-editor.c +++ b/plugins/gtk+/glade-window-editor.c @@ -25,13 +25,13 @@ #include "glade-window-editor.h" -static void glade_window_editor_editable_init (GladeEditableIface * iface); -static void glade_window_editor_grab_focus (GtkWidget * widget); +static void glade_window_editor_editable_init (GladeEditableIface *iface); +static void glade_window_editor_grab_focus (GtkWidget *widget); /* Callbacks */ -static void icon_name_toggled (GtkWidget *widget, GladeWindowEditor * window_editor); -static void icon_file_toggled (GtkWidget *widget, GladeWindowEditor * window_editor); -static void use_csd_toggled (GtkWidget *widget, GladeWindowEditor * window_editor); +static void icon_name_toggled (GtkWidget *widget, GladeWindowEditor *window_editor); +static void icon_file_toggled (GtkWidget *widget, GladeWindowEditor *window_editor); +static void use_csd_toggled (GtkWidget *widget, GladeWindowEditor *window_editor); struct _GladeWindowEditorPrivate { GtkWidget *embed; @@ -53,7 +53,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeWindowEditor, glade_window_editor, GLADE_TYPE_EDIT glade_window_editor_editable_init)); static void -glade_window_editor_class_init (GladeWindowEditorClass * klass) +glade_window_editor_class_init (GladeWindowEditorClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -75,7 +75,7 @@ glade_window_editor_class_init (GladeWindowEditorClass * klass) } static void -glade_window_editor_init (GladeWindowEditor * self) +glade_window_editor_init (GladeWindowEditor *self) { self->priv = glade_window_editor_get_instance_private (self); @@ -83,7 +83,7 @@ glade_window_editor_init (GladeWindowEditor * self) } static void -glade_window_editor_grab_focus (GtkWidget * widget) +glade_window_editor_grab_focus (GtkWidget *widget) { GladeWindowEditor *window_editor = GLADE_WINDOW_EDITOR (widget); @@ -93,7 +93,7 @@ glade_window_editor_grab_focus (GtkWidget * widget) static void glade_window_editor_load (GladeEditable *editable, - GladeWidget *gwidget) + GladeWidget *gwidget) { GladeWindowEditor *window_editor = GLADE_WINDOW_EDITOR (editable); GladeWindowEditorPrivate *priv = window_editor->priv; @@ -110,16 +110,16 @@ glade_window_editor_load (GladeEditable *editable, glade_widget_property_get (gwidget, "use-csd", &use_csd); if (icon_name) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->icon_name_radio), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->icon_name_radio), TRUE); else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->icon_file_radio), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->icon_file_radio), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_csd_check), use_csd); } } static void -glade_window_editor_editable_init (GladeEditableIface * iface) +glade_window_editor_editable_init (GladeEditableIface *iface) { parent_editable_iface = g_type_interface_peek_parent (iface); @@ -128,7 +128,7 @@ glade_window_editor_editable_init (GladeEditableIface * iface) static void icon_name_toggled (GtkWidget *widget, - GladeWindowEditor *window_editor) + GladeWindowEditor *window_editor) { GladeWindowEditorPrivate *priv = window_editor->priv; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (window_editor)); @@ -162,7 +162,7 @@ icon_name_toggled (GtkWidget *widget, static void icon_file_toggled (GtkWidget *widget, - GladeWindowEditor *window_editor) + GladeWindowEditor *window_editor) { GladeWindowEditorPrivate *priv = window_editor->priv; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (window_editor)); @@ -196,7 +196,7 @@ icon_file_toggled (GtkWidget *widget, static void use_csd_toggled (GtkWidget *widget, - GladeWindowEditor *window_editor) + GladeWindowEditor *window_editor) { GladeWindowEditorPrivate *priv = window_editor->priv; GladeWidget *gwidget = glade_editable_loaded_widget (GLADE_EDITABLE (window_editor)); @@ -223,10 +223,10 @@ use_csd_toggled (GtkWidget *widget, if (use_csd) glade_command_push_group (_("Setting %s to use a custom titlebar"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); else glade_command_push_group (_("Setting %s to use a system provided titlebar"), - glade_widget_get_name (gwidget)); + glade_widget_get_name (gwidget)); /* If a project widget exists when were disabling CSD, it needs * to be removed first as a part of the issuing GladeCommand group @@ -274,8 +274,8 @@ glade_window_editor_new (void) *************************************/ void glade_window_editor_post_create (GladeWidgetAdaptor *adaptor, - GObject *editor, - GladeCreateReason reason) + GObject *editor, + GladeCreateReason reason) { GladeWindowEditorPrivate *priv = GLADE_WINDOW_EDITOR (editor)->priv; diff --git a/plugins/gtk+/glade-window-editor.h b/plugins/gtk+/glade-window-editor.h index 9e9883c2..afd906bb 100644 --- a/plugins/gtk+/glade-window-editor.h +++ b/plugins/gtk+/glade-window-editor.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS -#define GLADE_TYPE_WINDOW_EDITOR (glade_window_editor_get_type ()) -#define GLADE_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditor)) -#define GLADE_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditorClass)) -#define GLADE_IS_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_WINDOW_EDITOR)) -#define GLADE_IS_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_WINDOW_EDITOR)) -#define GLADE_WINDOW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditorClass)) +#define GLADE_TYPE_WINDOW_EDITOR (glade_window_editor_get_type ()) +#define GLADE_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditor)) +#define GLADE_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditorClass)) +#define GLADE_IS_WINDOW_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_WINDOW_EDITOR)) +#define GLADE_IS_WINDOW_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_WINDOW_EDITOR)) +#define GLADE_WINDOW_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_WINDOW_EDITOR, GladeWindowEditorClass)) typedef struct _GladeWindowEditor GladeWindowEditor; typedef struct _GladeWindowEditorClass GladeWindowEditorClass; |