From f575a7626a769b0a99e080944749958d644d4aef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 May 2009 11:54:43 -0400 Subject: Eliminate redundant E_ICON_SIZE_* enumeration. --- shell/e-shell-importer.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-window-commands.c | 24 ++++++++++++------------ shell/e-user-creatable-items-handler.c | 4 ++-- shell/evolution-shell-component-utils.h | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 68ce5abec0..8bc3b12c5c 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -700,7 +700,7 @@ e_shell_importer_start_import (EShellWindow *shell_window) data->import = e_import_new("org.gnome.evolution.shell.importer"); - icon = e_icon_factory_get_icon ("stock_mail-import", E_ICON_SIZE_DIALOG); + icon = e_icon_factory_get_icon ("stock_mail-import", GTK_ICON_SIZE_DIALOG); dialog_open = TRUE; data->window = shell_window; diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 11b8ad7719..4d735eba7d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -202,7 +202,7 @@ load_pages (EShellSettingsDialog *dialog) if (g_path_is_absolute (icon_path)) { icon = gdk_pixbuf_new_from_file (icon_path, NULL); } else { - icon = e_icon_factory_get_icon (icon_path, E_ICON_SIZE_DIALOG); + icon = e_icon_factory_get_icon (icon_path, GTK_ICON_SIZE_DIALOG); } } diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 289c5cbea8..3d148781f1 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -1125,27 +1125,27 @@ static BonoboUIVerb help_verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/Print/FilePageSetup", "stock_print-setup", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Help/HelpOpenFAQ", "help-faq", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/Print/FilePageSetup", "stock_print-setup", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileClose", "window-close", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileExit", "application-exit", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Help/HelpOpenFAQ", "help-faq", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; static EPixmap offline_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; static EPixmap online_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 30b0d1dfa2..abc4848663 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -260,9 +260,9 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) item->icon = NULL; item->icon_toolbar = NULL; } else { - item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU); + item->icon = e_icon_factory_get_icon (corba_item->iconName, GTK_ICON_SIZE_MENU); if (item_is_default (item, component->alias)) - item->icon_toolbar = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_LARGE_TOOLBAR); + item->icon_toolbar = e_icon_factory_get_icon (corba_item->iconName, GTK_ICON_SIZE_LARGE_TOOLBAR); else item->icon_toolbar = NULL; } diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index 0fe71de8f4..eb04edae52 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -33,7 +33,7 @@ extern "C" { typedef struct _EPixmap { const char *path; const char *name; - gint size; + GtkIconSize size; char *pixbuf; } EPixmap; -- cgit v1.2.3 From a361cff4042770c35b2ae9f5dcfb6153711d2c41 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 May 2009 23:17:51 -0400 Subject: Fix compiler warnings in shell. --- shell/e-shell-importer.c | 4 ++-- shell/e-shell-window-commands.c | 2 +- shell/e-user-creatable-items-handler.c | 3 ++- shell/main.c | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 8bc3b12c5c..cb990f973b 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -121,8 +121,8 @@ typedef struct _ImportData { #endif static struct { - char *name; - char *text; + const gchar *name; + const gchar *text; } info[] = { { "type_html", N_("Choose the type of importer to run:") diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 3d148781f1..cdd9e3b82e 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -123,7 +123,7 @@ command_submit_bug (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - gchar *command_line; + const gchar *command_line; GError *error = NULL; command_line = "bug-buddy --sm-disable --package=Evolution"; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index abc4848663..ef58e3d659 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -158,7 +158,8 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler) Bonobo_ServerInfoList *info_list; Bonobo_ActivationProperty *property; CORBA_Environment ev; - char *iid, *alias; + const gchar *alias; + char *iid; GNOME_Evolution_Component corba_component; Component *component; int i; diff --git a/shell/main.c b/shell/main.c index 2abd30eec1..5ffe316c26 100644 --- a/shell/main.c +++ b/shell/main.c @@ -155,7 +155,8 @@ kill_old_dataserver (void) CORBA_exception_init (&ev); /* FIXME Should we really kill it off? We also shouldn't hard code the version */ - iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { kill_dataserver (); CORBA_exception_free (&ev); @@ -345,7 +346,8 @@ idle_cb (gchar **uris) break; case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER: - corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); + corba_shell = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) E_SHELL_OAFIID, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) { e_error_run(NULL, "shell:noshell", NULL); CORBA_exception_free (&ev); -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- shell/e-component-registry.c | 2 +- shell/e-component-registry.h | 2 +- shell/e-component-view.c | 2 +- shell/e-component-view.h | 2 +- shell/e-config-upgrade.c | 2 +- shell/e-config-upgrade.h | 2 +- shell/e-corba-config-page.c | 2 +- shell/e-corba-config-page.h | 2 +- shell/e-shell-constants.h | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-importer.h | 2 +- shell/e-shell-nm.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-settings-dialog.h | 2 +- shell/e-shell-view.c | 2 +- shell/e-shell-view.h | 2 +- shell/e-shell-window-commands.c | 2 +- shell/e-shell-window-commands.h | 2 +- shell/e-shell-window.c | 8 ++++---- shell/e-shell-window.h | 2 +- shell/e-shell.c | 2 +- shell/e-shell.h | 4 ++-- shell/e-sidebar.c | 2 +- shell/e-sidebar.h | 2 +- shell/e-user-creatable-items-handler.c | 2 +- shell/e-user-creatable-items-handler.h | 2 +- shell/es-event.c | 2 +- shell/es-event.h | 2 +- shell/es-menu.c | 2 +- shell/es-menu.h | 2 +- shell/evolution-component.c | 2 +- shell/evolution-component.h | 2 +- shell/evolution-config-control.c | 2 +- shell/evolution-config-control.h | 2 +- shell/evolution-listener.c | 2 +- shell/evolution-listener.h | 2 +- shell/evolution-shell-component-utils.c | 2 +- shell/evolution-shell-component-utils.h | 2 +- shell/importer/evolution-importer-client.c | 2 +- shell/importer/evolution-importer-client.h | 2 +- shell/importer/evolution-importer-listener.c | 2 +- shell/importer/evolution-importer-listener.h | 2 +- shell/importer/evolution-importer.c | 2 +- shell/importer/evolution-importer.h | 2 +- shell/importer/evolution-intelligent-importer.c | 2 +- shell/importer/evolution-intelligent-importer.h | 2 +- shell/importer/intelligent.c | 2 +- shell/importer/intelligent.h | 2 +- shell/main.c | 6 +++--- shell/test/evolution-test-component.c | 2 +- shell/test/evolution-test-component.h | 2 +- 51 files changed, 57 insertions(+), 57 deletions(-) (limited to 'shell') diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index cff9369aee..18092979d2 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 474dba871d..927fcf0120 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.c b/shell/e-component-view.c index cbe59529c4..b87078e974 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.h b/shell/e-component-view.h index 96a48d1e02..51004e489e 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 09c9281ab7..9aa71d3278 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index 27d9393058..f4580425bd 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index 603a8fd21f..f0fc89298c 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h index 9a6747cf22..8f0690ff69 100644 --- a/shell/e-corba-config-page.h +++ b/shell/e-corba-config-page.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h index 25aec79d6f..13beed8aec 100644 --- a/shell/e-shell-constants.h +++ b/shell/e-shell-constants.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index cb990f973b..74a89cc2ec 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h index f4489c3020..d9dffcfb0b 100644 --- a/shell/e-shell-importer.h +++ b/shell/e-shell-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index f7e4d3e63b..f51a565486 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 4d735eba7d..291a46c187 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h index 90c09627e2..55cce4a52f 100644 --- a/shell/e-shell-settings-dialog.h +++ b/shell/e-shell-settings-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 022e7ecca1..a6d071cc78 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index f284604d92..dd500efa94 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index cdd9e3b82e..6f180012cb 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window-commands.h b/shell/e-shell-window-commands.h index 3d3843c8f0..0696a8a5d0 100644 --- a/shell/e-shell-window-commands.h +++ b/shell/e-shell-window-commands.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 548e987588..83e537c31b 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -321,7 +321,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) } if (component_view->title == NULL) { - /* To translators: This is the window title and %s is the + /* To translators: This is the window title and %s is the component name. Most translators will want to keep it as is. */ title = g_strdup_printf (_("%s - Evolution"), info->button_label); gtk_window_set_title (GTK_WINDOW (window), title); @@ -343,7 +343,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) /** @Event: Shell component activated or switched to. * @Id: component.activated * @Target: ESEventTargetComponent - * + * * This event is emitted whenever the shell successfully activates component * view. */ @@ -408,7 +408,7 @@ update_offline_toggle_status (EShellWindow *window) static void update_send_receive_sensitivity (EShellWindow *window) { - if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || + if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE) bonobo_ui_component_set_prop (window->priv->ui_component, "/commands/SendReceive", diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index d94aef0f4f..869352b01c 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.c b/shell/e-shell.c index 061071efb8..9b4e6bc53a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.h b/shell/e-shell.h index ab16ea819e..e8451e3b5b 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Ettore Perazzoli + * Ettore Perazzoli * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 7b8ba1a53a..d4c02e63ce 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index a3d3b43fee..2585592363 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index ef58e3d659..a49d7dbdc4 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h index 5d51612539..b9be272af1 100644 --- a/shell/e-user-creatable-items-handler.h +++ b/shell/e-user-creatable-items-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.c b/shell/es-event.c index 8aeeb7b912..43a55c3fd5 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.h b/shell/es-event.h index ed248d11df..5ac363b8c8 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.c b/shell/es-menu.c index ac2736b52a..3b459268a3 100644 --- a/shell/es-menu.c +++ b/shell/es-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.h b/shell/es-menu.h index 89f60112c6..9e9e0613b0 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.c b/shell/evolution-component.c index 62cddb6a32..49824c9545 100644 --- a/shell/evolution-component.c +++ b/shell/evolution-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.h b/shell/evolution-component.h index 9202829708..302263a657 100644 --- a/shell/evolution-component.h +++ b/shell/evolution-component.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 35044c9dba..a0d3f473a2 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h index 10e320c4a8..59d7aba210 100644 --- a/shell/evolution-config-control.h +++ b/shell/evolution-config-control.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c index 516c04abb2..4bf9a76376 100644 --- a/shell/evolution-listener.c +++ b/shell/evolution-listener.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h index c85ae53613..7b79b3bab8 100644 --- a/shell/evolution-listener.h +++ b/shell/evolution-listener.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 9dc1c3323b..a8ce855268 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index eb04edae52..ce4fa11229 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 5f32241b17..06d30d5733 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 35cde858d6..3ae4b2f7b0 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index e8256971f1..8915202d30 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index 7e09ff2da8..63f480e4dd 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 9fb7e66f5e..f8e6847891 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index a684aecfb2..4925fad4fc 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index bce7d75fa8..d867c120b8 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 35ad7d0010..2d36d498e9 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index 6503fc8ad6..20927d2742 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h index bbdf00cc18..5f5f7187f2 100644 --- a/shell/importer/intelligent.h +++ b/shell/importer/intelligent.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/main.c b/shell/main.c index 5ffe316c26..c6959d7663 100644 --- a/shell/main.c +++ b/shell/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,7 +398,7 @@ idle_cb (gchar **uris) bonobo_main_quit (); } - /* This must be done after Bonobo has created all the components. For + /* This must be done after Bonobo has created all the components. For * example the mail component makes the global variable `session` which * is being used by several EPlugins */ @@ -630,7 +630,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); #ifdef DEVELOPMENT - + if (force_migrate) { destroy_config (client); } diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 16aed882d0..9fdeab7a3f 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h index 18a86f1baf..18dd40c7ff 100644 --- a/shell/test/evolution-test-component.h +++ b/shell/test/evolution-test-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3