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 /plugins | |
| parent | 583e024ef8f3ccdfc2d4aa9886f77aee46cd1caf (diff) | |
| download | glade-0b1d4e99e1f12b61f473d70c86eef03caa88a537.tar.gz | |
Fix tab/space identation
Diffstat (limited to 'plugins')
156 files changed, 2831 insertions, 2663 deletions
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; |