diff options
author | Denis Washington <denisw@src.gnome.org> | 2011-08-17 11:15:19 +0200 |
---|---|---|
committer | Denis Washington <denisw@src.gnome.org> | 2011-08-17 11:26:41 +0200 |
commit | 6e40ddf5369c5048681c0b599474de40980087c9 (patch) | |
tree | 6cd2e0ef193cf7f07939a6512c4c2b2202761675 | |
parent | 6cf251e15d5352b837a909962b5a933869eed9e4 (diff) | |
download | glade-6e40ddf5369c5048681c0b599474de40980087c9.tar.gz |
Remove trailing whitespace
-rw-r--r-- | gladeui/glade-command.c | 8 | ||||
-rw-r--r-- | gladeui/glade-editor-property.c | 53 | ||||
-rw-r--r-- | gladeui/glade-popup.c | 2 | ||||
-rw-r--r-- | gladeui/glade-project.c | 4 | ||||
-rw-r--r-- | gladeui/glade-property.c | 31 | ||||
-rw-r--r-- | gladeui/glade-widget-adaptor.c | 6 |
6 files changed, 52 insertions, 52 deletions
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c index d9b594bb..8ab8cfc2 100644 --- a/gladeui/glade-command.c +++ b/gladeui/glade-command.c @@ -821,18 +821,18 @@ glade_command_bind_property_undo (GladeCommand * cmd) } /* - * Execute the set property command and revert it. IE, after the execution of + * Execute the set property command and revert it. IE, after the execution of * this function cmd will point to the undo action */ static gboolean glade_command_bind_property_execute (GladeCommand * cmd) { - GladeCommandBindProperty *bcmd; + GladeCommandBindProperty *bcmd; GladeProperty *target, *source; gchar *transform_func; g_return_val_if_fail (GLADE_IS_COMMAND_BIND_PROPERTY (cmd), TRUE); - + bcmd = GLADE_COMMAND_BIND_PROPERTY (cmd); target = bcmd->target; source = bcmd->undo ? bcmd->old_source : bcmd->new_source; @@ -896,7 +896,7 @@ glade_command_bind_property (GladeProperty * target, { GladeCommandBindProperty *me; GladeCommand *cmd; - + g_return_if_fail (GLADE_IS_PROPERTY (target)); g_return_if_fail (!source || GLADE_IS_PROPERTY (source)); diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index bc294c76..779f8940 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -90,7 +90,7 @@ struct _GladeEditorPropertyPrivate gulong enabled_id; /* signal connection id for enable/disable changes */ gulong state_id; /* signal connection id for state changes */ gulong binding_id; /* signal connection id for binding source changes */ - + gboolean loading; /* True during glade_editor_property_load calls, this * is used to avoid feedback from input widgets. */ @@ -159,7 +159,8 @@ GladePropertyClass * glade_editor_property_get_pclass (GladeEditorProperty *eprop) { g_return_val_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop), NULL); - return eprop->priv->klass; + + return eprop->priv->klass; } GladeProperty * @@ -212,7 +213,7 @@ glade_bind_dialog_update_property_view (GladeBindDialog *dialog, (GtkTreeModel **) &obj_model, &iter)) return; - + gtk_tree_model_get (GTK_TREE_MODEL (obj_model), &iter, 0, &widget, -1); /* Do nothing if the selected widget hasn't really changed */ @@ -221,7 +222,7 @@ glade_bind_dialog_update_property_view (GladeBindDialog *dialog, if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) { GladeProperty *prop; - + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, PROPERTY_COLUMN_PROP, &prop, -1); @@ -248,7 +249,7 @@ glade_bind_dialog_update_property_view (GladeBindDialog *dialog, glade_property_class_get_virtual (pclass) || glade_property_class_get_ignore (pclass)) continue; - + gtk_list_store_append (model, &iter); gtk_list_store_set (model, &iter, PROPERTY_COLUMN_PROP, prop, @@ -257,14 +258,14 @@ glade_bind_dialog_update_property_view (GladeBindDialog *dialog, PROPERTY_COLUMN_PROP_SELECTABLE, dialog->transform_func_enabled || g_type_is_a (type, target_type), - -1); + -1); } } static void glade_bind_dialog_update_buttons (GladeBindDialog *dialog, GtkTreeSelection *prop_selection) -{ +{ GtkTreeModel *model; GtkTreeIter iter; @@ -276,14 +277,14 @@ glade_bind_dialog_update_buttons (GladeBindDialog *dialog, gtk_tree_model_get (model, &iter, PROPERTY_COLUMN_PROP_SELECTABLE, &selectable, -1); - + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->widget), GTK_RESPONSE_OK, selectable); } else gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog->widget), GTK_RESPONSE_OK, FALSE); - + } static int @@ -320,7 +321,7 @@ glade_bind_dialog_setup_property_view (GladeBindDialog *dialog) GtkTreeSelection *selection; GtkCellRenderer *renderer; GladeProperty *source; - + model = (GtkTreeModel *) gtk_list_store_new (PROPERTY_NUM_COLUMNS, G_TYPE_STRING, /* The property name */ G_TYPE_BOOLEAN, /* Whether this GladeProperty's @@ -334,7 +335,7 @@ glade_bind_dialog_setup_property_view (GladeBindDialog *dialog) gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); /* Pass ownership to the view */ - g_object_unref (G_OBJECT (model)); + g_object_unref (G_OBJECT (model)); /* Property name column */ renderer = gtk_cell_renderer_text_new (); @@ -436,7 +437,7 @@ glade_bind_dialog_update_property_selectability (GladeBindDialog *dialog, dialog->transform_func_enabled || g_type_is_a (type, target_type), -1); } - while (gtk_tree_model_iter_next (prop_model, &iter)); + while (gtk_tree_model_iter_next (prop_model, &iter)); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (prop_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, @@ -541,7 +542,7 @@ glade_editor_property_show_bind_dialog (GladeProject * project, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0); - + obj_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (hbox), obj_vbox, TRUE, TRUE, 0); prop_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); @@ -561,7 +562,7 @@ glade_editor_property_show_bind_dialog (GladeProject * project, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (obj_sw), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (obj_vbox), obj_sw, TRUE, TRUE, 0); - + prop_sw = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (prop_sw); gtk_widget_set_size_request (prop_sw, 400, 200); @@ -572,7 +573,7 @@ glade_editor_property_show_bind_dialog (GladeProject * project, /* Select the existing binding source object if existent */ current_source = glade_property_get_binding_source (target); - if (current_source) + if (current_source) selected = g_list_append (NULL, glade_property_get_widget (current_source)); obj_view = dialog->object_view = glade_eprop_object_view (OBJECT_VIEW_BROWSE); @@ -623,7 +624,7 @@ glade_editor_property_show_bind_dialog (GladeProject * project, "changed", G_CALLBACK (glade_bind_dialog_update_buttons), dialog); - + g_object_bind_property (trans_check, "active", trans_hbox, "sensitive", G_BINDING_SYNC_CREATE); @@ -689,14 +690,14 @@ glade_editor_property_tooltip_cb (GladeProperty * property, if (glade_property_get_sensitive (property)) { GladeProperty *source; - + if ((source = glade_property_get_binding_source (property)) != NULL) { const gchar *source_obj, *source_prop; source_prop = glade_property_class_id (glade_property_get_class (source)); source_obj = glade_widget_get_name (glade_property_get_widget (source)); - + tip = markup = g_strdup_printf ("%s\n" "<span size=\"smaller\">" "(Bound to property <b>%s</b>" @@ -816,12 +817,12 @@ glade_editor_property_binding_source_cb (GladeProperty *property, GladeEditorProperty *eprop) { GladePropertyClass *pclass = glade_property_get_class (property); - + /* disable value input for bound properties */ if (glade_property_get_binding_source (property)) gtk_widget_set_sensitive (eprop->priv->input, FALSE); - /* refresh label formatting*/ + /* refresh label formatting */ glade_editor_property_fix_label (eprop); /* update tooltip to describe the binding */ @@ -990,7 +991,7 @@ glade_eprop_property_finalized (GladeEditorProperty * eprop, eprop->priv->changed_id = 0; eprop->priv->enabled_id = 0; eprop->priv->state_id = 0; - eprop->priv->binding_id = 0; + eprop->priv->binding_id = 0; eprop->priv->property = NULL; glade_editor_property_load (eprop, NULL); @@ -1024,7 +1025,7 @@ glade_editor_property_load_common (GladeEditorProperty * eprop, eprop->priv->enabled_id = 0; eprop->priv->state_id = 0; eprop->priv->binding_id = 0; - + /* Unref it here */ g_object_weak_unref (G_OBJECT (eprop->priv->property), (GWeakNotify) glade_eprop_property_finalized, eprop); @@ -3102,7 +3103,7 @@ glade_eprop_object_populate_view_real (ObjectViewKind kind, if (good_type || has_decendant) { gboolean selected; - + gtk_tree_store_append (model, &iter, parent_iter); /* Literally select a selected widget when in browse mode */ @@ -3110,7 +3111,7 @@ glade_eprop_object_populate_view_real (ObjectViewKind kind, if (selected && kind == OBJECT_VIEW_BROWSE) { GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); - + /* Wee need to expand all parents of the row so that it is * visible, otherwise we can't select it */ gtk_tree_view_expand_to_path (gtk_tree_selection_get_tree_view (selection), @@ -3266,7 +3267,7 @@ glade_eprop_object_view (ObjectViewKind kind) if (kind == OBJECT_VIEW_BROWSE) { GtkTreeSelection *selection; - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view_widget)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); } @@ -3429,7 +3430,7 @@ glade_editor_property_show_object_dialog (GladeProject * project, exception_list = g_list_prepend (exception_list, exception); tree_view = glade_eprop_object_view (OBJECT_VIEW_RADIO); - glade_eprop_object_populate_view (project, + glade_eprop_object_populate_view (project, GTK_TREE_VIEW (tree_view), OBJECT_VIEW_RADIO, selected_list, exception_list, diff --git a/gladeui/glade-popup.c b/gladeui/glade-popup.c index c8a51746..16c0b5e3 100644 --- a/gladeui/glade-popup.c +++ b/gladeui/glade-popup.c @@ -626,7 +626,7 @@ glade_popup_bind_property_cb (GtkMenuItem * item, GladeProperty * property) gchar *transform_func; GtkWidget *parent = gtk_widget_get_toplevel (GTK_WIDGET (glade_widget_get_object (widget))); - + if (glade_editor_property_show_bind_dialog (project, parent, property, &source, &transform_func)) { diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c index e750d447..874ef8d0 100644 --- a/gladeui/glade-project.c +++ b/gladeui/glade-project.c @@ -1028,7 +1028,7 @@ glade_project_fix_props (GladeProject *project) GladeWidget *gwidget; GladeProperty *property; gchar *txt, *txt2; - + objects = g_list_copy (project->priv->objects); for (l = objects; l; l = l->next) { @@ -1074,7 +1074,7 @@ glade_project_fix_props (GladeProject *project) source_prop = glade_widget_get_property (source_obj, txt2); if (!source_prop) continue; - + glade_property_set_binding_source (property, source_prop); } } diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c index 548aee0a..b7823e08 100644 --- a/gladeui/glade-property.c +++ b/gladeui/glade-property.c @@ -34,7 +34,7 @@ * a #GladeProperty to interface with, #GladeProperty provides a means * to handle properties in the runtime environment. * - * A #GladeProperty can be seen as an instance of a #GladePropertyClass, + * A #GladeProperty can be seen as an instance of a #GladePropertyClass, * the #GladePropertyClass describes how a #GladeProperty will function. */ @@ -138,7 +138,7 @@ struct _GladePropertyPrivate { * binding_source_valid when the * binding source widget is removed */ - + gulong binding_widget_add_handler; /* Signal handler to update * binding_source_valid when the * binding source widget is added back @@ -148,7 +148,7 @@ struct _GladePropertyPrivate { guint i18n_translatable : 1; gchar *i18n_context; gchar *i18n_comment; - + gint syncing; /* Avoid recursion while synchronizing object with value */ gint sync_tolerance; }; @@ -595,11 +595,11 @@ glade_property_get_real_property (GObject * object, case PROP_BINDING_SOURCE: g_value_set_pointer (value, glade_property_get_binding_source (property)); - break; + break; case PROP_BINDING_TRANSFORM_FUNC: g_value_set_string (value, glade_property_get_binding_transform_func (property)); - break; + break; case PROP_I18N_TRANSLATABLE: g_value_set_boolean (value, glade_property_i18n_get_translatable (property)); @@ -663,7 +663,7 @@ glade_property_init (GladeProperty * property) property->priv->binding_enabled_handler = 0; property->priv->binding_sensitive_handler = 0; property->priv->binding_widget_remove_handler = 0; - property->priv->binding_widget_add_handler = 0; + property->priv->binding_widget_add_handler = 0; property->priv->i18n_translatable = TRUE; property->priv->i18n_comment = NULL; property->priv->sync_tolerance = 1; @@ -1252,7 +1252,7 @@ glade_property_write (GladeProperty * property, { GladeXmlNode *prop_node; gchar *name, *value, *tmp; - + g_return_if_fail (GLADE_IS_PROPERTY (property)); g_return_if_fail (node != NULL); @@ -1314,7 +1314,6 @@ glade_property_write (GladeProperty * property, GLADE_TAG_COMMENT, property->priv->i18n_comment); } - g_free (name); g_free (value); } @@ -1336,7 +1335,7 @@ glade_property_binding_read (GladeXmlNode *node, { gchar *to, *from, *source; GladeProperty *target; - + g_return_if_fail (node && glade_xml_node_verify (node, GLADE_XML_TAG_BINDING)); g_return_if_fail (GLADE_IS_WIDGET (widget)); @@ -1401,7 +1400,7 @@ glade_property_binding_write (GladeProperty *property, if (!glade_property_get_binding_source (property)) return; - + if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET))) return; @@ -1410,12 +1409,12 @@ glade_property_binding_write (GladeProperty *property, to = glade_property_class_id (glade_property_get_class (property)); - source_prop = glade_property_get_binding_source (property); + source_prop = glade_property_get_binding_source (property); from = glade_property_class_id (glade_property_get_class (source_prop)); widget = glade_property_get_widget (source_prop); source = glade_widget_get_name (widget); - + glade_xml_node_set_property_string (binding_node, GLADE_XML_TAG_TO, to); @@ -1793,7 +1792,7 @@ static void glade_property_binding_source_weak_notify_cb (GladeProperty *property, GObject *binding_source) { - property->priv->binding_source = NULL; + property->priv->binding_source = NULL; property->priv->binding_value_handler = 0; glade_property_remove_binding_source (property); } @@ -1898,7 +1897,7 @@ glade_property_set_binding_source (GladeProperty *property, GladeProperty *binding_source) { GladeProperty *old_source; - + g_return_if_fail (GLADE_IS_PROPERTY (property)); g_return_if_fail (!binding_source || GLADE_IS_PROPERTY (binding_source)); @@ -1910,7 +1909,7 @@ glade_property_set_binding_source (GladeProperty *property, GParamSpec *source_pspec = glade_property_class_get_pspec (source_pclass); g_return_if_fail (source_pspec->flags | G_PARAM_READABLE); - g_return_if_fail (prop_pspec->flags | G_PARAM_WRITABLE); + g_return_if_fail (prop_pspec->flags | G_PARAM_WRITABLE); g_return_if_fail (glade_property_binding_source_valid (binding_source)); if (property->priv->binding_transform_func) @@ -2013,7 +2012,7 @@ glade_property_set_binding_transform_func (GladeProperty *property, glade_property_set_binding_source (property, property->priv->binding_source); g_object_notify_by_pspec (G_OBJECT (property), - properties[PROP_BINDING_TRANSFORM_FUNC]); + properties[PROP_BINDING_TRANSFORM_FUNC]); } static gint glade_property_su_stack = 0; diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c index 66f24132..99489e3d 100644 --- a/gladeui/glade-widget-adaptor.c +++ b/gladeui/glade-widget-adaptor.c @@ -1053,13 +1053,13 @@ glade_widget_adaptor_object_write_widget (GladeWidgetAdaptor * adaptor, GladeXmlNode * node) { GList *props; - + /* Write the properties */ for (props = glade_widget_get_properties (widget); props; props = props->next) { GladeProperty *property = props->data; GladePropertyClass *klass = glade_property_get_class (property); - + if (glade_property_class_save (klass) && glade_property_get_enabled (property)) glade_property_write (GLADE_PROPERTY (props->data), context, node); @@ -1069,7 +1069,7 @@ glade_widget_adaptor_object_write_widget (GladeWidgetAdaptor * adaptor, for (props = glade_widget_get_properties (widget); props; props = props->next) { GladeProperty *property = props->data; - + if (glade_property_get_binding_source (property)) glade_property_binding_write (property, context, node); } |