diff options
Diffstat (limited to 'shell')
38 files changed, 46 insertions, 45 deletions
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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index e1b29aea00..06e1469f58 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h index 570199c44e..57663d8619 100644 --- a/shell/e-shell-backend.h +++ b/shell/e-shell-backend.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-common.h b/shell/e-shell-common.h index 50c84152c9..7ff35091aa 100644 --- a/shell/e-shell-common.h +++ b/shell/e-shell-common.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index ff344ae986..b5579088e1 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -812,7 +812,7 @@ shell_content_init (EShellContent *shell_content) widget = e_action_combo_box_new (); gtk_box_pack_end (box, widget, FALSE, FALSE, 0); shell_content->priv->scope_combo_box = g_object_ref (widget); - gtk_widget_show (widget); + gtk_widget_show (widget); mnemonic = widget; diff --git a/shell/e-shell-content.h b/shell/e-shell-content.h index 04639771f3..2259dbd972 100644 --- a/shell/e-shell-content.h +++ b/shell/e-shell-content.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 69a30ee3a6..84d5d64877 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -120,8 +120,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-importer.h b/shell/e-shell-importer.h index d78c04ab5d..bd57fbd4f0 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index b141ba4c7c..53df4106b4 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-migrate.h b/shell/e-shell-migrate.h index 45907ce7ce..8ebe69709b 100644 --- a/shell/e-shell-migrate.h +++ b/shell/e-shell-migrate.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 7696c1809e..581e505111 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c index 9f03f38ce1..0883382ffc 100644 --- a/shell/e-shell-settings.c +++ b/shell/e-shell-settings.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-settings.h b/shell/e-shell-settings.h index a9f6a20f93..c400facfd3 100644 --- a/shell/e-shell-settings.h +++ b/shell/e-shell-settings.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c index 671bcad9a0..ad4cb92970 100644 --- a/shell/e-shell-sidebar.c +++ b/shell/e-shell-sidebar.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -635,7 +635,7 @@ e_shell_sidebar_set_primary_text (EShellSidebar *shell_sidebar, * selected items, etc. * * Returns: the secondary text for @shell_sidebar - **/ + **/ const gchar * e_shell_sidebar_get_secondary_text (EShellSidebar *shell_sidebar) { diff --git a/shell/e-shell-sidebar.h b/shell/e-shell-sidebar.h index 27966e5429..5999aa9de2 100644 --- a/shell/e-shell-sidebar.h +++ b/shell/e-shell-sidebar.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c index 2980bd983d..2944aace0e 100644 --- a/shell/e-shell-switcher.c +++ b/shell/e-shell-switcher.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-switcher.h b/shell/e-shell-switcher.h index f04cec13e6..1cc644595b 100644 --- a/shell/e-shell-switcher.h +++ b/shell/e-shell-switcher.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c index c81f40827b..61f27fbc79 100644 --- a/shell/e-shell-taskbar.c +++ b/shell/e-shell-taskbar.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-taskbar.h b/shell/e-shell-taskbar.h index b0aab3bdde..3c3d40010e 100644 --- a/shell/e-shell-taskbar.h +++ b/shell/e-shell-taskbar.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 7c5332a8d0..cf89442c7c 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 99730ef689..664094e3a8 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 846bb82d98..a53412c00b 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -1776,7 +1776,7 @@ shell_window_extract_actions (EShellWindow *shell_window, * | | * match_list = [ ] --------> [ ] * - * + * * destination_list = [1] -> [2] (other actions) */ for (iter = *source_list; iter != NULL; iter = iter->next) { diff --git a/shell/e-shell-window-actions.h b/shell/e-shell-window-actions.h index 87ae13221c..3b8774a494 100644 --- a/shell/e-shell-window-actions.h +++ b/shell/e-shell-window-actions.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 38d3926d67..bb74e35ced 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h index 3ac03883f5..b0bfe7c63a 100644 --- a/shell/e-shell-window-private.h +++ b/shell/e-shell-window-private.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index c39d856e32..bb913f74ea 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index d78fb19774..b867490afb 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell.c b/shell/e-shell.c index d95853dffa..785485320f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell.h b/shell/e-shell.h index c76b649124..1d0b9ab705 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/es-event.c b/shell/es-event.c index 80d3896023..e0ebb45d29 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/shell/es-event.h b/shell/es-event.h index 415a0ee959..a23cb99b4f 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/shell/main.c b/shell/main.c index c71d6869ae..928a321e61 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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -139,7 +139,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); @@ -504,7 +505,7 @@ slowly_and_stupidly_obtain_timestamp (GdkDisplay *display) XSetWindowAttributes attrs; Atom atom_name; Atom atom_type; - char *name; + const gchar *name; xdisplay = GDK_DISPLAY_XDISPLAY (display); diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c index 0fc6c203aa..e5fd3c6a43 100644 --- a/shell/test/e-test-shell-backend.c +++ b/shell/test/e-test-shell-backend.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/test/e-test-shell-backend.h b/shell/test/e-test-shell-backend.h index 0768e48a8f..0d342bfbcc 100644 --- a/shell/test/e-test-shell-backend.h +++ b/shell/test/e-test-shell-backend.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c index f05abfff06..b4464cc68f 100644 --- a/shell/test/e-test-shell-view.c +++ b/shell/test/e-test-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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/test/e-test-shell-view.h b/shell/test/e-test-shell-view.h index b84fba9c44..85c33bfb39 100644 --- a/shell/test/e-test-shell-view.h +++ b/shell/test/e-test-shell-view.h @@ -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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/test/evolution-module-test.c b/shell/test/evolution-module-test.c index ceae63cf7c..1fe3c7c0d0 100644 --- a/shell/test/evolution-module-test.c +++ b/shell/test/evolution-module-test.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 <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) |