diff options
Diffstat (limited to 'widgets/menus')
-rw-r--r-- | widgets/menus/gal-define-views-dialog.c | 18 | ||||
-rw-r--r-- | widgets/menus/gal-define-views-dialog.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-define-views-model.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-define-views-model.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-collection.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view-collection.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-etable.c | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-etable.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-factory-etable.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-factory.c | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view-factory.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance-save-as-dialog.c | 8 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance-save-as-dialog.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance.c | 18 | ||||
-rw-r--r-- | widgets/menus/gal-view-instance.h | 2 | ||||
-rw-r--r-- | widgets/menus/gal-view-menus.c | 14 | ||||
-rw-r--r-- | widgets/menus/gal-view-new-dialog.c | 12 | ||||
-rw-r--r-- | widgets/menus/gal-view-new-dialog.h | 4 | ||||
-rw-r--r-- | widgets/menus/gal-view.c | 10 | ||||
-rw-r--r-- | widgets/menus/gal-view.h | 2 |
20 files changed, 58 insertions, 58 deletions
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 7b286daa30..08db6c9402 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -73,7 +73,7 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass) object_class->get_property = gal_define_views_dialog_get_property; object_class->dispose = gal_define_views_dialog_dispose; - g_object_class_install_property (object_class, PROP_COLLECTION, + g_object_class_install_property (object_class, PROP_COLLECTION, g_param_spec_object ("collection", _("Collection"), /*_( */"XXX blurb" /*)*/, @@ -109,7 +109,7 @@ gdvd_button_new_dialog_callback (GtkWidget *widget, int id, GalDefineViewsDialog gtk_list_store_append (GTK_LIST_STORE (dialog->model), &iter); gtk_list_store_set (GTK_LIST_STORE (dialog->model), &iter, COL_GALVIEW_NAME, name, - COL_GALVIEW_DATA, item, + COL_GALVIEW_DATA, item, -1); gal_view_edit (view, GTK_WINDOW (dialog)); @@ -168,7 +168,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) gal_view_collection_delete_view (dialog->collection, row); path = gtk_tree_model_get_path (dialog->model, &iter); gtk_list_store_remove (GTK_LIST_STORE (dialog->model), &iter); - + if (gtk_tree_path_prev (path)) { gtk_tree_model_get_iter (dialog->model, &iter, path); } else { @@ -201,7 +201,7 @@ gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) } #endif - + static void gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog) { @@ -237,7 +237,7 @@ static void dialog_response (GalDefineViewsDialog *dialog, int response_id, gpointer data) { gal_view_collection_save (dialog->collection); -} +} static void gal_define_views_dialog_init (GalDefineViewsDialog *dialog) @@ -321,7 +321,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, /* hide built in views */ /*if (item->built_in == 1) continue;*/ - + char *title = NULL; title = e_str_without_underscores (item->title); @@ -348,7 +348,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, COL_GALVIEW_NAME, _("Name"), renderer, "text", COL_GALVIEW_NAME, NULL); - + /* set sort column */ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->model), COL_GALVIEW_NAME, GTK_SORT_ASCENDING); @@ -394,7 +394,7 @@ gal_define_views_dialog_set_property (GObject *object, guint prop_id, const GVal GalDefineViewsDialog *dialog; dialog = GAL_DEFINE_VIEWS_DIALOG (object); - + switch (prop_id){ case PROP_COLLECTION: if (g_value_get_object (value)) diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 2978c997ad..e353886d21 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 55435876b4..09bedf2381 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -174,14 +174,14 @@ gal_define_views_model_class_init (GalDefineViewsModelClass *klass) object_class->set_property = gal_define_views_model_set_property; object_class->get_property = gal_define_views_model_get_property; - g_object_class_install_property (object_class, PROP_EDITABLE, + g_object_class_install_property (object_class, PROP_EDITABLE, g_param_spec_boolean ("editable", _("Editable"), /*_( */"XXX blurb" /*)*/, FALSE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_COLLECTION, + g_object_class_install_property (object_class, PROP_COLLECTION, g_param_spec_object ("collection", _("Collection"), /*_( */"XXX blurb" /*)*/, diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index 75a2cb75cb..339439680d 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-model.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 728ed5544c..f286ee445d 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -395,7 +395,7 @@ load_single_dir (GalViewCollection *collection, xmlNode *child; char *filename = g_build_filename(dir, "galview.xml", NULL); char *default_view; - + if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { #ifdef G_OS_WIN32 gchar *locale_filename = g_win32_locale_filename_from_utf8 (filename); @@ -406,7 +406,7 @@ load_single_dir (GalViewCollection *collection, doc = xmlParseFile (filename); #endif } - + if (!doc) { g_free (filename); return; diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index a74d6fa869..d5a1e493ef 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-collection.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index d27cbdbae1..de58cf91e9 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -87,7 +87,7 @@ gal_view_etable_edit (GalView *view, GtkWindow *parent) G_CALLBACK(config_changed), view); } -static void +static void gal_view_etable_load (GalView *view, const char *filename) { diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index e44f09ae33..83d1259fca 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-etable.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index 6bce7d7fd3..2535ef01b4 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-factory-etable.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index b570e3491b..e1fd210bd2 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -92,8 +92,8 @@ gal_view_factory_get_type_code (GalViewFactory *factory) static void gal_view_factory_class_init (GalViewFactoryClass *klass) { - klass->get_title = NULL; - klass->new_view = NULL; + klass->get_title = NULL; + klass->new_view = NULL; } static void diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index de119f1596..939917d488 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-factory.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 50428b80fc..1a3b917c28 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -117,7 +117,7 @@ gal_view_instance_save_as_dialog_set_property (GObject *object, guint prop_id, c GalViewInstanceSaveAsDialog *dialog; dialog = GAL_VIEW_INSTANCE_SAVE_AS_DIALOG (object); - + switch (prop_id){ case PROP_INSTANCE: if (g_value_get_object (value)) @@ -174,7 +174,7 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k object_class->get_property = gal_view_instance_save_as_dialog_get_property; object_class->dispose = gal_view_instance_save_as_dialog_dispose; - g_object_class_install_property (object_class, PROP_INSTANCE, + g_object_class_install_property (object_class, PROP_INSTANCE, g_param_spec_object ("instance", _("Instance"), /*_( */"XXX blurb" /*)*/, @@ -223,7 +223,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) gal_view_instance_save_as_dialog_set_instance (dialog, dialog->instance); gtk_widget_show_all (table); } - + gvisad_setup_radio_buttons (dialog); gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Save Current View")); diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index c2fda0996b..5808d9840c 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-define-views-dialog.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 0cb8b0934e..fbdcf608cc 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-instance.c * Copyright 2000, 2001, Ximian, Inc. * @@ -243,7 +243,7 @@ load_current_view (GalViewInstance *instance) xmlDoc *doc = NULL; xmlNode *root; GalView *view = NULL; - + if (g_file_test (instance->current_view_filename, G_FILE_TEST_IS_REGULAR)) { #ifdef G_OS_WIN32 gchar *locale_filename = g_win32_locale_filename_from_utf8 (instance->current_view_filename); @@ -254,7 +254,7 @@ load_current_view (GalViewInstance *instance) doc = xmlParseFile(instance->current_view_filename); #endif } - + if (doc == NULL) { instance->current_id = g_strdup (gal_view_instance_get_default_view (instance)); @@ -303,9 +303,9 @@ load_current_view (GalViewInstance *instance) * gal_view_instance_new: * @collection: This %GalViewCollection should be loaded before being passed to this function. * @instance_id: Which instance of this type of object is this (for most of evo, this is the folder id.) - * + * * Create a new %GalViewInstance. - * + * * Return value: The new %GalViewInstance. **/ GalViewInstance * @@ -466,7 +466,7 @@ gal_view_instance_exists (GalViewInstance *instance) return TRUE; else return FALSE; - + } typedef struct { @@ -492,7 +492,7 @@ add_popup_radio_item (EPopupMenu *menu_item, gpointer closure, gboolean value) { - EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_RADIO_ITEM_CC (title, fn, closure, @@ -509,7 +509,7 @@ add_popup_menu_item (EPopupMenu *menu_item, GCallback fn, gpointer closure) { - EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_ITEM_CC (title, fn, closure, @@ -598,7 +598,7 @@ gal_view_instance_free_popup_menu (GalViewInstance *instance, EPopupMenu *menu) { int i; /* This depends on the first non-custom closure to be a separator or a terminator. */ - for (i = 0; menu[i].name && *(menu[i].name); i++) { + for (i = 0; menu[i].name && *(menu[i].name); i++) { g_object_unref (((ListenerClosure *)(menu[i].closure))->instance); g_free (menu[i].closure); } diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 1d1c6a3310..f1ebf1cdfa 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-instance.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 26b592fa98..d2b9929a2a 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -99,7 +99,7 @@ remove_instance (GalViewMenus *gvm) if (gvm->priv->instance) { if (gvm->priv->instance_changed_id != 0) g_signal_handler_disconnect (gvm->priv->instance, gvm->priv->instance_changed_id); - + if (gvm->priv->instance->collection && gvm->priv->collection_changed_id != 0) g_signal_handler_disconnect (gvm->priv->instance->collection, gvm->priv->collection_changed_id); } @@ -154,7 +154,7 @@ gal_view_menus_finalize (GObject *object) if (gvm->priv->component) bonobo_object_unref (gvm->priv->component); - + if (gvm->priv->define_views_dialog) g_object_weak_unref (G_OBJECT (gvm->priv->define_views_dialog), clear_define_views_dialog, gvm); @@ -285,7 +285,7 @@ build_menus(GalViewMenus *menus) place = bonobo_ui_node_new_child(submenu, "placeholder"); bonobo_ui_node_set_attr(place, "name", "ViewBegin"); - + submenu = bonobo_ui_node_new_child(place, "submenu"); bonobo_ui_node_set_attr(submenu, "name", "CurrentView"); bonobo_ui_node_set_attr(submenu, "_label", N_("C_urrent View")); @@ -302,7 +302,7 @@ build_menus(GalViewMenus *menus) ListenerClosure *closure; char *label; char *tip; - + menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", item->id); bonobo_ui_node_set_attr(menuitem, "id", item->id); @@ -343,7 +343,7 @@ build_menus(GalViewMenus *menus) menuitem = bonobo_ui_node_new_child(submenu, "separator"); bonobo_ui_node_set_attr(menuitem, "name", "GalView:first_sep"); bonobo_ui_node_set_attr(menuitem, "f", ""); - + menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", "custom_view"); @@ -366,7 +366,7 @@ build_menus(GalViewMenus *menus) command = bonobo_ui_node_new_child(commands, "cmd"); bonobo_ui_node_set_attr(command, "name", "SaveCurrentView"); - bonobo_ui_node_set_attr(command, "_tip", N_("Save current custom view")); + bonobo_ui_node_set_attr(command, "_tip", N_("Save current custom view")); } menuitem = bonobo_ui_node_new_child(submenu, "separator"); @@ -380,7 +380,7 @@ build_menus(GalViewMenus *menus) command = bonobo_ui_node_new_child(commands, "cmd"); bonobo_ui_node_set_attr(command, "name", "DefineViews"); - bonobo_ui_node_set_attr(command, "_tip", N_("Create or edit views")); + bonobo_ui_node_set_attr(command, "_tip", N_("Create or edit views")); } xml = bonobo_ui_node_to_string(root, TRUE); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 89ead8d7b9..b87d1064f9 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-new-dialog.c * Copyright 2000, 2001, Ximian, Inc. * @@ -60,14 +60,14 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass) object_class->get_property = gal_view_new_dialog_get_property; object_class->dispose = gal_view_new_dialog_dispose; - g_object_class_install_property (object_class, PROP_NAME, + g_object_class_install_property (object_class, PROP_NAME, g_param_spec_string ("name", _("Name"), /*_( */"XXX blurb" /*)*/, NULL, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_FACTORY, + g_object_class_install_property (object_class, PROP_FACTORY, g_param_spec_object ("factory", _("Factory"), /*_( */"XXX blurb" /*)*/, @@ -114,7 +114,7 @@ static void gal_view_new_dialog_dispose (GObject *object) { GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object); - + if (gal_view_new_dialog->gui) g_object_unref(gal_view_new_dialog->gui); gal_view_new_dialog->gui = NULL; @@ -137,7 +137,7 @@ sensitize_ok_response (GalViewNewDialog *dialog) { gboolean ok = TRUE; const char *text; - + text = gtk_entry_get_text (GTK_ENTRY (dialog->entry)); if (!text || !text[0]) ok = FALSE; @@ -244,7 +244,7 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue * GtkWidget *entry; dialog = GAL_VIEW_NEW_DIALOG (object); - + switch (prop_id){ case PROP_NAME: entry = glade_xml_get_widget(dialog->gui, "entry-name"); diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 6aceb28031..3d898d45cd 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view-new-dialog.h * Copyright 2000, 2001, Ximian, Inc. * @@ -54,7 +54,7 @@ typedef struct _GalViewNewDialogClass GalViewNewDialogClass; struct _GalViewNewDialog { GtkDialog parent; - + /* item specific fields */ GladeXML *gui; diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index 4a2403eedb..66d7d3ffa6 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -63,7 +63,7 @@ gal_view_edit (GalView *view, * @view: The view to load to * @filename: The file to load from */ -void +void gal_view_load (GalView *view, const char *filename) { @@ -179,10 +179,10 @@ gal_view_class_init (GalViewClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - klass->edit = NULL; - klass->load = NULL; - klass->save = NULL; - klass->get_title = NULL; + klass->edit = NULL; + klass->load = NULL; + klass->save = NULL; + klass->get_title = NULL; klass->clone = NULL; klass->changed = NULL; diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index 428053fa57..bad347e824 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * gal-view.h * Copyright 2000, 2001, Ximian, Inc. * |