From 7692685cafc443e62069fbe76cb0322daeed324d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 19 Jul 2008 18:51:50 +0000 Subject: Bug 543758 - Never mark empty strings for translations 2008-07-19 Tor Lillqvist Bug 543758 - Never mark empty strings for translations * main.c (main): Change _("") to explicit gettext ("") to avoid potentially confusing translation tools or translators. svn path=/trunk/; revision=35759 --- shell/ChangeLog | 7 +++++++ shell/main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 7c9dbea21e..9f116e1870 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-07-19 Tor Lillqvist + + Bug 543758 - Never mark empty strings for translations + + * main.c (main): Change _("") to explicit gettext ("") to avoid + potentially confusing translation tools or translators. + 2008-17-14 Paolo Borelli ** Fix for bug #542889 diff --git a/shell/main.c b/shell/main.c index 7b566a99dc..27ebb4a9a5 100644 --- a/shell/main.c +++ b/shell/main.c @@ -680,7 +680,7 @@ main (int argc, char **argv) NULL); #ifdef G_OS_WIN32 - if (strcmp (_(""), "") == 0) { + if (strcmp (gettext (""), "") == 0) { /* No message catalog installed for the current locale language, * so don't bother with the localisations provided by other things then * either. Reset thread locale to "en-US" and C library locale to "C". -- cgit v1.2.3 From 3e0962231032ae53af4310b43dbced810cdc6100 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 20 Jul 2008 16:37:22 +0000 Subject: ** Fixes bug #542587 2008-07-20 Matthew Barnes ** Fixes bug #542587 * shell/e-shell-window.c: Use new EOnlineButton widget. * widgets/misc/e-online-button.c: * widgets/misc/e-online-button.h: New widget implements the online/offline button used in the main window. The button just maintains an "online" flag and displays the appropriate button image for the flag. svn path=/trunk/; revision=35777 --- shell/ChangeLog | 6 ++++ shell/e-shell-window.c | 74 +++++++++++++++++--------------------------------- 2 files changed, 31 insertions(+), 49 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 9f116e1870..083d4a798d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-07-20 Matthew Barnes + + ** Fixes bug #542587 + + * e-shell-window.c: Use new EOnlineButton widget. + 2008-07-19 Tor Lillqvist Bug 543758 - Never mark empty strings for translations diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 7d772fd2af..6f906b00e7 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -30,6 +30,7 @@ #include "Evolution.h" #include "e-util/e-util-private.h" +#include "widgets/misc/e-online-button.h" #include "e-component-registry.h" #include "e-shell-window-commands.h" @@ -115,7 +116,6 @@ struct _EShellWindowPrivate { /* The status bar widgetry. */ GtkWidget *status_bar; GtkWidget *offline_toggle; - GtkWidget *offline_toggle_image; GtkWidget *menu_hint_label; /* The timeout for saving the window size */ @@ -133,10 +133,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (EShellWindow, e_shell_window, BONOBO_TYPE_WINDOW) -/* The icons for the offline/online status. */ -#define OFFLINE_ICON "offline.png" -#define ONLINE_ICON "online.png" - static gboolean store_window_size (GtkWidget* widget); /* ComponentView handling. */ @@ -365,9 +361,9 @@ static void update_offline_toggle_status (EShellWindow *window) { EShellWindowPrivate *priv; - const char *icon; - char *icon_file; - const char *tooltip; + GtkWidget *widget; + const gchar *tooltip; + gboolean online; gboolean sensitive; guint32 flags = 0; ESMenuTargetShell *t; @@ -376,23 +372,23 @@ update_offline_toggle_status (EShellWindow *window) switch (e_shell_get_line_status (priv->shell.eshell)) { case E_SHELL_LINE_STATUS_ONLINE: - icon = ONLINE_ICON; + online = TRUE; sensitive = TRUE; - tooltip = _("Evolution is currently online. " + tooltip = _("Evolution is currently online.\n" "Click on this button to work offline."); flags = ES_MENU_SHELL_ONLINE; break; case E_SHELL_LINE_STATUS_GOING_OFFLINE: - icon = ONLINE_ICON; + online = TRUE; sensitive = FALSE; tooltip = _("Evolution is in the process of going offline."); flags = ES_MENU_SHELL_OFFLINE; break; case E_SHELL_LINE_STATUS_OFFLINE: case E_SHELL_LINE_STATUS_FORCED_OFFLINE: - icon = OFFLINE_ICON; + online = FALSE; sensitive = TRUE; - tooltip = _("Evolution is currently offline. " + tooltip = _("Evolution is currently offline.\n" "Click on this button to work online."); flags = ES_MENU_SHELL_OFFLINE; break; @@ -400,11 +396,10 @@ update_offline_toggle_status (EShellWindow *window) g_return_if_reached (); } - icon_file = g_build_filename (EVOLUTION_IMAGESDIR, icon, NULL); - gtk_image_set_from_file (GTK_IMAGE (priv->offline_toggle_image), icon_file); - g_free (icon_file); - gtk_widget_set_sensitive (priv->offline_toggle, sensitive); - gtk_widget_set_tooltip_text (priv->offline_toggle, tooltip); + widget = window->priv->offline_toggle; + gtk_widget_set_sensitive (widget, sensitive); + gtk_widget_set_tooltip_text (widget, tooltip); + e_online_button_set_online (E_ONLINE_BUTTON (widget), online); /* TODO: If we get more shell flags, this should be centralised */ t = es_menu_target_new_shell(priv->menu, flags); @@ -476,8 +471,7 @@ sidebar_button_pressed_callback (ESidebar *sidebar, } static void -offline_toggle_clicked_callback (GtkButton *button, - EShellWindow *window) +offline_toggle_clicked_cb (EShellWindow *window) { EShellWindowPrivate *priv = window->priv; @@ -527,39 +521,21 @@ ui_engine_remove_hint_callback (BonoboUIEngine *engine, static void setup_offline_toggle (EShellWindow *window) { - EShellWindowPrivate *priv; - GtkWidget *toggle; - GtkWidget *image; - GtkWidget *label; - GtkWidget *hbox; - - priv = window->priv; - - toggle = gtk_button_new (); - GTK_WIDGET_UNSET_FLAGS (toggle, GTK_CAN_FOCUS); - gtk_button_set_relief (GTK_BUTTON (toggle), GTK_RELIEF_NONE); + GtkWidget *widget; - g_signal_connect (toggle, "clicked", - G_CALLBACK (offline_toggle_clicked_callback), window); - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (toggle), hbox); + g_return_if_fail (window->priv->status_bar != NULL); - image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - - label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - - gtk_widget_show_all (toggle); - - priv->offline_toggle = toggle; - priv->offline_toggle_image = image; + widget = e_online_button_new (); + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (offline_toggle_clicked_cb), window); + gtk_box_pack_start ( + GTK_BOX (window->priv->status_bar), + widget, FALSE, TRUE, 0); + window->priv->offline_toggle = widget; + gtk_widget_show (widget); update_offline_toggle_status (window); - - g_return_if_fail (priv->status_bar != NULL); - - gtk_box_pack_start (GTK_BOX (priv->status_bar), priv->offline_toggle, FALSE, TRUE, 0); } static void -- cgit v1.2.3 From 0aa642c443dea52bec45217e6981b7b9210eac0d Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sun, 20 Jul 2008 23:54:33 +0000 Subject: ** Fixes bug #542828 2008-07-20 Andre Klapper ** Fixes bug #542828 * e-shell-window-commands.c: update and fix list of contributors. Patch by Maxim Ermilov. svn path=/trunk/; revision=35796 --- shell/ChangeLog | 7 +++++++ shell/e-shell-window-commands.c | 25 ++++++------------------- 2 files changed, 13 insertions(+), 19 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 083d4a798d..cd5901f2bf 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-07-20 Andre Klapper + + ** Fixes bug #542828 + + * e-shell-window-commands.c: + update and fix list of contributors. Patch by Maxim Ermilov. + 2008-07-20 Matthew Barnes ** Fixes bug #542587 diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index a780a1e4f9..666be38e50 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -187,7 +187,6 @@ static const char *authors[] = { "Andreas Hyden", "Andreas J. Guelzow", "Andreas K\xC3\xB6hler", - "Andreas Köhler", "Andrew Ruthven", "Andrew T. Veliath", "Andrew Wu", @@ -204,7 +203,6 @@ static const char *authors[] = { "Arulanandan P", "Arun Prakash", "Arvind Sundararajan", - "Arvind", "Ashish", "B S Srinidhi", "Bastien Nocera", @@ -218,7 +216,7 @@ static const char *authors[] = { "Bharath Acharya", "Bill Zhu", "Bj\xC3\xB6rn Torkelsson", - "Björn Lindqvist", + "Bj\xC3\xB6rn Lindqvist", "Bob Doan", "Bob Mauchin", "Boby Wang", @@ -239,7 +237,7 @@ static const char *authors[] = { "Charles Zhang", "Chema Celorio", "Chenthill Palanisamy", - "Chpe", + "Christian Persch", "Chris Halls", "Chris Heath", "Chris Phelps", @@ -274,8 +272,7 @@ static const char *authors[] = { "Daniel van Eeden", "Daniel Veillard", "Daniel Yacob", - "Danilo \xC5\xA0" "egan", - "Danilo Segan", + "Danilo \xC5\xA0egan", "Darin Adler", "Dave Benson", "Dave Camp", @@ -358,7 +355,6 @@ static const char *authors[] = { "Hans Petter Jansson", "Hao Sheng", "Hari Prasad Nadig", - "Harish K", "Harish Krishnaswamy", "Harry Lu", "Hasbullah Bin Pit", @@ -374,12 +370,8 @@ static const char *authors[] = { "Irene Huang", "Ismael Olea", "Israel Escalante", - "Iv\xC3\xA1" "n Frade", - "Iván Frade", + "Iv\xC3\xA1n Frade", "J.H.M. Dassen (Ray)", - "JP Rosevear", - "J\xC3\xBC" "rg Billeter", - "Jürg Billeter", "Jack Jia", "Jacob Ulysses Berkman", "Jacob Berkman", @@ -418,7 +410,6 @@ static const char *authors[] = { "Joe Shaw", "John Gotts", "Johnny Jacob", - "Johnny", "Jon Ander Hernandez", "Jon K Hellan", "Jon Oberheide", @@ -426,9 +417,10 @@ static const char *authors[] = { "Jonas Borgstr", "Jonathan Blandford", "Jonathan Dieter", + "J\xC3\xBCrg Billeter", "Jos Dehaes", "Josselin Mouette", - "JP Rosvear", + "JP Rosevear", "Jukka Zitting", "Jules Colding", "Julian Missig", @@ -456,7 +448,6 @@ static const char *authors[] = { "Lauris Kaplinski", "Leon Zhang", "Li Yuan", - "Loïc Minier", "Loïc Minier", "Lorenzo Gil Sanchez", "Luca Ferretti", @@ -541,7 +532,6 @@ static const char *authors[] = { "Oswald Rodrigues", "Owen Taylor", "Oystein Gisnas", - "P Chenthill", "P S Chakravarthi", "Pablo Gonzalo del Campo", "Pablo Saratxaga", @@ -592,7 +582,6 @@ static const char *authors[] = { "Rodney Dawes", "Rodrigo Moya", "Rohini S", - "Rohini", "Roland Illig", "Ronald Kuetemeier", "Roozbeh Pournader", @@ -605,8 +594,6 @@ static const char *authors[] = { "S Antony Vincent Pandian", "S N Tejasvi", "S. \xC3\x87" "a\xC4\x9F" "lar Onur", - "S.Antony Vincent Pandian", - "S. Caglar Onur", "Sam Creasey", "Sam Yang", "Sam\xC3\xBA" "el J\xC3\xB3" "n Gunnarsson", -- cgit v1.2.3 From 5e4b6fcb89797b533b9a741c491ec592d2a06721 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 22 Jul 2008 08:43:06 +0000 Subject: ** Fix for bug #544022 2008-07-22 Milan Crha ** Fix for bug #544022 * configure.in: Do not redefine DBUS_VERSION define supplied by dbus itself, rather rename our define to FOUND_DBUS_VERSION. * mail/e-searching-tokenizer.c: (dump_trie): Define function only when required. (Compiler warning cleanup.) * shell/e-shell-window-commands.c: (char *authors[]): Break the escape sequence properly (compiler warning cleanup). * plugins/email-custom-header/email-custom-header.c: Compiler warning cleanup. * plugins/mail-notification/Makefile.am: * plugins/mail-notification/mail-notification.c: (send_dbus_message): Do not redefine DBUS_VERSION define, it's supplied by dbus itself. svn path=/trunk/; revision=35819 --- shell/ChangeLog | 7 +++++++ shell/e-shell-window-commands.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index cd5901f2bf..df4ac19595 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-07-22 Milan Crha + + ** Part of fix for bug #544022 + + * e-shell-window-commands.c: (char *authors[]): + Break the escape sequence properly (compiler warning cleanup). + 2008-07-20 Andre Klapper ** Fixes bug #542828 diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 666be38e50..a9f46205bb 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -272,7 +272,7 @@ static const char *authors[] = { "Daniel van Eeden", "Daniel Veillard", "Daniel Yacob", - "Danilo \xC5\xA0egan", + "Danilo \xC5\xA0" "egan", "Darin Adler", "Dave Benson", "Dave Camp", -- cgit v1.2.3 From c8693868b0da3bc01c7d6797e3734b931ece291e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 Aug 2008 17:28:23 +0000 Subject: ** Fixes bug #544862 2008-08-01 Matthew Barnes ** Fixes bug #544862 * shell/apps_evolution_shell.scheams.in: Clarify description of "use_authentication" key. svn path=/trunk/; revision=35880 --- shell/ChangeLog | 7 +++++++ shell/apps_evolution_shell.schemas.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index df4ac19595..47d6b785e9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-08-01 Matthew Barnes + + ** Fixes bug #544862 + + * apps_evolution_shell.scheams.in: + Clarify description of "use_authentication" key. + 2008-07-22 Milan Crha ** Part of fix for bug #544022 diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in index 1ff66d7a64..036417ea16 100644 --- a/shell/apps_evolution_shell.schemas.in +++ b/shell/apps_evolution_shell.schemas.in @@ -326,7 +326,7 @@ bool Authenticate proxy server connections - If true, then connections to the proxy server require authentication. The username/password combo is defined by "/apps/evolution/shell/network_config/authentication_user" and locally stored password in .gnome2_private/. + If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file. -- cgit v1.2.3 From 6dd3a55a40a84a8666069d5122f715f93fc03251 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 4 Aug 2008 03:40:06 +0000 Subject: Matthew Barnes ** Fixes bug #249844 (Use C_() macro instead of Q_() macro, Use fully qualified names for New submenu entries). svn path=/trunk/; revision=35897 --- shell/ChangeLog | 8 ++++++++ shell/test/evolution-test-component.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 47d6b785e9..6f12b5bd4b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2008-08-04 Matthew Barnes + + ** Fixes bug #249844 + + * test/evolution-test-component.c (impl__get_userCreatableItems): + Use C_() macro instead of Q_() macro. + Use fully qualified names for "New" submenu entries. + 2008-08-01 Matthew Barnes ** Fixes bug #544862 diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 3f2b39278c..1ce8006ea5 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = CREATE_TEST_ID; list->_buffer[0].description = _("New Test"); - list->_buffer[0].menuDescription = _("_Test"); + list->_buffer[0].menuDescription = C_("New", "_Test"); list->_buffer[0].tooltip = _("Create a new test item"); list->_buffer[0].menuShortcut = 'i'; list->_buffer[0].iconName = ""; -- cgit v1.2.3 From 670e6d167863d4c8d8dde107e7d8ac7a288e0b52 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Aug 2008 15:44:47 +0000 Subject: ** Fix for bug #249844 2008-08-06 Milan Crha ** Fix for bug #249844 * addressbook/gui/component/addressbook-component.c: * calendar/gui/tasks-component.c: (impl__get_userCreatableItems): * calendar/gui/memos-component.c: (impl__get_userCreatableItems): * mail/mail-component.c: (impl__get_userCreatableItems): * shell/test/evolution-test-component.c: (impl__get_userCreatableItems): (impl__get_userCreatableItems): Do not let compiler claim. * mail/em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name' as const char * to let compiler happy; no copy of the pointer anyway. * calendar/gui/calendar-component.c: (impl__get_userCreatableItems): Use C_() macro instead of Q_() macro. Use fully qualified names for "New" submenu entries. svn path=/trunk/; revision=35916 --- shell/ChangeLog | 7 +++++++ shell/test/evolution-test-component.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 6f12b5bd4b..b4df3e0962 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-08-06 Milan Crha + + ** Fix for bug #249844 + + * test/evolution-test-component.c: (impl__get_userCreatableItems): + Do not let compiler claim. + 2008-08-04 Matthew Barnes ** Fixes bug #249844 diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 1ce8006ea5..88a7b05bf9 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = CREATE_TEST_ID; list->_buffer[0].description = _("New Test"); - list->_buffer[0].menuDescription = C_("New", "_Test"); + list->_buffer[0].menuDescription = (char *) C_("New", "_Test"); list->_buffer[0].tooltip = _("Create a new test item"); list->_buffer[0].menuShortcut = 'i'; list->_buffer[0].iconName = ""; -- cgit v1.2.3 From c714d8efd156f22661de6d2055e82522de17b382 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 7 Aug 2008 14:29:49 +0000 Subject: ** Fixes bug #467115 2008-08-07 Matthew Barnes ** Fixes bug #467115 * shell/e-component-registry.h: Replace button and menu icon pixbufs with an icon name string. * shell/e-component-registry.c (query_components): No need to create pixbufs, just save the icon name. * shell/e-sidebar.c: Remember a default icon name rather than a default pixbuf. * shell/e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon): * shell/e-shell-window.c (e_shell_window_change_component_button_icon): Take an icon name instead of a pixbuf. * shell/e-shell-window.c (switch_view): Call gtk_window_set_icon_name() instead of gtk_window_set_icon(). * shell/e-shell-window.c (setup_widgets): Change XML from pixtype="pixbuf" to pixbuf="filename" and derive an appropriate filename from the icon name. svn path=/trunk/; revision=35924 --- shell/ChangeLog | 24 ++++++++++++++++++++++++ shell/e-component-registry.c | 31 ++++--------------------------- shell/e-component-registry.h | 3 +-- shell/e-shell-view.c | 12 +++--------- shell/e-shell-window.c | 23 ++++++++++++++--------- shell/e-shell-window.h | 2 +- shell/e-sidebar.c | 44 +++++++++++++++++++++----------------------- shell/e-sidebar.h | 4 ++-- 8 files changed, 70 insertions(+), 73 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index b4df3e0962..6ecd53c350 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,27 @@ +2008-08-07 Matthew Barnes + + ** Fixes bug #467115 + + * e-component-registry.h: + Replace button and menu icon pixbufs with an icon name string. + + * e-component-registry.c (query_components): + No need to create pixbufs, just save the icon name. + + * e-sidebar.c: + Remember a default icon name rather than a default pixbuf. + + * e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon): + * e-shell-window.c (e_shell_window_change_component_button_icon): + Take an icon name instead of a pixbuf. + + * e-shell-window.c (switch_view): + Call gtk_window_set_icon_name() instead of gtk_window_set_icon(). + + * e-shell-window.c (setup_widgets): + Change XML from pixtype="pixbuf" to pixbuf="filename" and derive + an appropriate filename from the icon name. + 2008-08-06 Milan Crha ** Fix for bug #249844 diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index ebb4cd9b9c..146ceb26a6 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -54,9 +54,8 @@ component_info_new (const char *id, const char *button_tooltips, const char *menu_label, const char *menu_accelerator, - int sort_order, - GdkPixbuf *button_icon, - GdkPixbuf *menu_icon) + const char *icon_name, + int sort_order) { EComponentInfo *info = g_new0 (EComponentInfo, 1); @@ -67,16 +66,9 @@ component_info_new (const char *id, info->button_tooltips = g_strdup (button_tooltips); info->menu_label = g_strdup (menu_label); info->menu_accelerator = g_strdup (menu_accelerator); + info->icon_name = g_strdup (icon_name); info->sort_order = sort_order; - info->button_icon = button_icon; - if (info->button_icon) - g_object_ref (info->button_icon); - - info->menu_icon = menu_icon; - if (info->menu_icon) - g_object_ref (info->menu_icon); - return info; } @@ -90,12 +82,6 @@ component_info_free (EComponentInfo *info) g_free (info->menu_label); g_free (info->menu_accelerator); - if (info->button_icon) - g_object_unref (info->button_icon); - - if (info->menu_icon) - g_object_unref (info->menu_icon); - if (info->iface != NULL) bonobo_object_release_unref (info->iface, NULL); @@ -183,7 +169,6 @@ query_components (EComponentRegistry *registry) const char *icon_name; const char *sort_order_string; const char *tooltips; - GdkPixbuf *icon = NULL, *menuicon = NULL; EComponentInfo *info; int sort_order; GNOME_Evolution_Component iface; @@ -211,10 +196,6 @@ query_components (EComponentRegistry *registry) alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL); icon_name = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_icon", NULL); - if (icon_name) { - icon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_LARGE_TOOLBAR); - menuicon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_MENU); - } sort_order_string = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_sort_order", NULL); @@ -224,15 +205,11 @@ query_components (EComponentRegistry *registry) sort_order = atoi (sort_order_string); info = component_info_new (id, iface, alias, label, tooltips, menu_label, - menu_accelerator, sort_order, icon, menuicon); + menu_accelerator, icon_name, sort_order); set_schemas (info, & info_list->_buffer [i]); registry->priv->infos = g_slist_prepend (registry->priv->infos, info); - if (icon != NULL) - g_object_unref (icon); - if (menuicon != NULL) - g_object_unref (menuicon); bonobo_object_release_unref(iface, NULL); } g_slist_free(languages); diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 0c7ff03b0e..1d5943537c 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -73,10 +73,9 @@ struct _EComponentInfo { char *button_label; char *button_tooltips; - GdkPixbuf *button_icon; char *menu_label; char *menu_accelerator; - GdkPixbuf *menu_icon; + char *icon_name; int sort_order; diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index ebcc9c03fe..daa9794e3b 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -61,7 +61,7 @@ impl_ShellView_setComponent(PortableServer_Servant _servant, const CORBA_char *i struct change_icon_struct { const char *component_name; - GdkPixbuf *icon; + const char *icon_name; }; static gboolean @@ -72,7 +72,7 @@ change_button_icon_func (EShell *shell, EShellWindow *window, gpointer user_data g_return_val_if_fail (window != NULL, FALSE); g_return_val_if_fail (cis != NULL, FALSE); - e_shell_window_change_component_button_icon (window, cis->component_name, cis->icon); + e_shell_window_change_component_button_icon (window, cis->component_name, cis->icon_name); return TRUE; } @@ -85,15 +85,9 @@ impl_ShellView_setButtonIcon (PortableServer_Servant _servant, const CORBA_char struct change_icon_struct cis; cis.component_name = id; - cis.icon = NULL; - - if (iconName) - cis.icon = e_icon_factory_get_icon (iconName, E_ICON_SIZE_BUTTON); + cis.icon_name = iconName; e_shell_foreach_shell_window (shell, change_button_icon_func, &cis); - - if (cis.icon) - g_object_unref (cis.icon); } static void diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 6f906b00e7..cf188e27e7 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -331,8 +331,8 @@ switch_view (EShellWindow *window, ComponentView *component_view) } else gtk_window_set_title (GTK_WINDOW (window), component_view->title); - if (info->button_icon) - gtk_window_set_icon (GTK_WINDOW (window), info->button_icon); + if (info->icon_name) + gtk_window_set_icon_name (GTK_WINDOW (window), info->icon_name); gconf_client_set_string (gconf_client, "/apps/evolution/shell/view_defaults/component_id", (component_view->component_alias != NULL @@ -756,12 +756,14 @@ setup_widgets (EShellWindow *window) char *tmp, *tmp2; EComponentInfo *info = p->data; ComponentView *view = component_view_new (info->id, info->alias, button_id); + GtkIconInfo *icon_info; + gint width; window->priv->component_views = g_slist_prepend (window->priv->component_views, view); if (!info->button_label || !info->menu_label) continue; - e_sidebar_add_button (E_SIDEBAR (priv->sidebar), info->button_label, info->button_tooltips, info->button_icon, button_id); + e_sidebar_add_button (E_SIDEBAR (priv->sidebar), info->button_label, info->button_tooltips, info->icon_name, button_id); g_string_printf(xml, "SwitchComponent-%s", info->alias); bonobo_ui_component_add_verb (e_shell_window_peek_bonobo_ui_component (window), @@ -783,11 +785,14 @@ setup_widgets (EShellWindow *window) g_free (tmp2); g_free (tmp); - tmp = bonobo_ui_util_pixbuf_to_xml (info->menu_icon), - g_string_append_printf(xml, "\" pixtype=\"pixbuf\" pixname=\"%s\"/>" + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, NULL); + icon_info = gtk_icon_theme_lookup_icon ( + gtk_icon_theme_get_default (), + info->icon_name, width, 0); + g_string_append_printf(xml, "\" pixtype=\"filename\" pixname=\"%s\"/>" "\n", - tmp); - g_free(tmp); + gtk_icon_info_get_filename (icon_info)); + gtk_icon_info_free (icon_info); bonobo_ui_component_set_translate (e_shell_window_peek_bonobo_ui_component (window), "/menu", xml->str, @@ -1246,7 +1251,7 @@ e_shell_window_set_title(EShellWindow *window, const char *component_id, const c * @param icon Icon buffer. **/ void -e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, GdkPixbuf *icon) +e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, const char *icon_name) { EShellWindowPrivate *priv; GSList *p; @@ -1265,7 +1270,7 @@ e_shell_window_change_component_button_icon (EShellWindow *window, const char *c if (strcmp (this_view->component_id, component_id) == 0 || (this_view->component_alias != NULL && strcmp (this_view->component_alias, component_id) == 0)) { - e_sidebar_change_button_icon (E_SIDEBAR (priv->sidebar), icon, this_view->button_id); + e_sidebar_change_button_icon (E_SIDEBAR (priv->sidebar), icon_name, this_view->button_id); break; } } diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index 07b8586e2e..400d68bc19 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -73,6 +73,6 @@ void e_shell_window_set_title(EShellWindow *window, const char *component_id, co void e_shell_window_save_defaults (EShellWindow *window); void e_shell_window_show_settings (EShellWindow *window); -void e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, GdkPixbuf *icon); +void e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, const char *icon_name); #endif /* _E_SHELL_WINDOW_H_ */ diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index d3404b5813..bd822b25da 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -36,7 +36,7 @@ typedef struct { GtkWidget *label; GtkWidget *icon; GtkWidget *hbox; - GdkPixbuf *default_icon; + gchar *default_icon_name; int id; } Button; @@ -79,17 +79,20 @@ button_new (GtkWidget *button_widget, int id) { Button *button = g_new (Button, 1); + const gchar *icon_name; button->button_widget = button_widget; button->label = label; - button->icon = icon; + button->icon = icon; button->hbox = hbox; button->id = id; - button->default_icon = NULL; + + gtk_image_get_icon_name (GTK_IMAGE (icon), &icon_name, NULL); + button->default_icon_name = g_strdup (icon_name); g_object_ref (button_widget); g_object_ref (label); - g_object_ref (icon); + g_object_ref (icon); g_object_ref (hbox); return button; @@ -102,8 +105,7 @@ button_free (Button *button) g_object_unref (button->label); g_object_unref (button->icon); g_object_unref (button->hbox); - if (button->default_icon) - g_object_unref (button->default_icon); + g_free (button->default_icon_name); g_free (button); } @@ -545,7 +547,7 @@ void e_sidebar_add_button (ESidebar *sidebar, const char *label, const char *tooltips, - GdkPixbuf *icon, + const char *icon_name, int id) { GtkWidget *button_widget; @@ -564,7 +566,8 @@ e_sidebar_add_button (ESidebar *sidebar, gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); gtk_widget_show (hbox); - icon_widget = gtk_image_new_from_pixbuf (icon); + icon_widget = gtk_image_new_from_icon_name ( + icon_name, GTK_ICON_SIZE_BUTTON); gtk_widget_show (icon_widget); label_widget = gtk_label_new (label); @@ -603,16 +606,15 @@ e_sidebar_add_button (ESidebar *sidebar, /** * e_sidebar_change_button_icon + * @sidebar: an #ESidebar + * @icon_name: button icon name, or %NULL + * @button_id: component's button ID, for which change the icon. + * * This will change icon in icon_widget of the button of known component. * You cannot change icon as in a stack, only one default icon will be stored. - * @param sidebar ESidebar instance. - * @param icon Pointer to buffer with icon. Can by NULL, in this case the icon will be - * put back to default one for the component. - * @param button_id Component's button ID, for which change the icon. **/ - void -e_sidebar_change_button_icon (ESidebar *sidebar, GdkPixbuf *icon, int button_id) +e_sidebar_change_button_icon (ESidebar *sidebar, const gchar *icon_name, int button_id) { GSList *p; @@ -625,16 +627,12 @@ e_sidebar_change_button_icon (ESidebar *sidebar, GdkPixbuf *icon, int button_id if (!button->icon) break; - if (icon) { - if (!button->default_icon) - button->default_icon = gdk_pixbuf_copy (gtk_image_get_pixbuf (GTK_IMAGE (button->icon))); + if (icon_name == NULL) + icon_name = button->default_icon_name; - gtk_image_set_from_pixbuf (GTK_IMAGE (button->icon), icon); - } else if (button->default_icon) { - gtk_image_set_from_pixbuf (GTK_IMAGE (button->icon), button->default_icon); - g_object_unref (button->default_icon); - button->default_icon = NULL; - } + gtk_image_set_from_icon_name ( + GTK_IMAGE (button->icon), + icon_name, GTK_ICON_SIZE_BUTTON); break; } diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index 319f7e8f04..3ab9350e55 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -67,14 +67,14 @@ void e_sidebar_set_selection_widget (ESidebar *sidebar, void e_sidebar_add_button (ESidebar *sidebar, const char *label, const char *tooltips, - GdkPixbuf *icon, + const char *icon_name, int id); void e_sidebar_select_button (ESidebar *sidebar, int id); void e_sidebar_change_button_icon (ESidebar *sidebar, - GdkPixbuf *icon, + const char *icon_name, int button_id); ESidebarMode e_sidebar_get_mode (ESidebar *sidebar); -- cgit v1.2.3 From 0a5a436616621bd3cbf9eefa69ca25abe8ef2b11 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Aug 2008 16:06:30 +0000 Subject: Remove unused EShell pointer from ImportData. 2008-08-08 Matthew Barnes * shell/e-shell-importer.c: Remove unused EShell pointer from ImportData. svn path=/trunk/; revision=35939 --- shell/ChangeLog | 5 +++++ shell/e-shell-importer.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 6ecd53c350..1296ec35c8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2008-08-08 Matthew Barnes + + * e-shell-importer.c: + Remove unused EShell pointer from ImportData. + 2008-08-07 Matthew Barnes ** Fixes bug #467115 diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index bf2a67f9b0..23b473a0a9 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -85,7 +85,6 @@ typedef struct _ImportDialogImporterPage { } ImportDialogImporterPage; typedef struct _ImportData { - EShell *shell; EShellWindow *window; GladeXML *wizard; @@ -678,7 +677,6 @@ e_shell_importer_start_import (EShellWindow *shell_window) dialog_open = TRUE; data->window = shell_window; - data->shell = e_shell_window_peek_shell (data->window); gladefile = g_build_filename (EVOLUTION_GLADEDIR, "import.glade", NULL); data->wizard = glade_xml_new (gladefile, NULL, NULL); -- cgit v1.2.3 From 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Aug 2008 17:04:32 +0000 Subject: ** Fixes bug #546892 2008-08-11 Matthew Barnes ** Fixes bug #546892 * e-util/e-icon-factory.c (e_icon_factory_get_image): Kill this function. Use gtk_image_new_from_icon_name(). * e-util/e-icon-factory.c (e_icon_factory_get_icon_list): Kill this function. Use gtk_window_set_icon_name(). * widgets/misc/e-activity-handler.c: * widgets/misc/e-task-widget.c: Purge the GdkPixbuf arguments from the API. We've been ignoring them since the spinner icon was added. * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * calendar/gui/alarm-notify/alarm-notify-dialog.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/alarm-list-dialog.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/select-source-dialog.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: * widgets/misc/e-combo-button.c: * widgets/misc/e-info-label.c: * widgets/misc/e-url-entry.c: * widgets/misc/e-task-widget.c: Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). * addressbook/gui/contact-editor/e-contact-editor-im.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/e-timezone-entry.c: * e-util/e-gui-utils.c: * e-util/e-popup.c: * plugins/import-ics-attachments/icsimporter.c: * plugins/itip-formatter/itip-view.c: * mail/em-folder-browser.c: * mail/em-format-html-display.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). * calendar/gui/alarm-notify/alarm-queue.c: * plugins/mail-notification/mail-notification.c: Prefer gtk_status_icon_set_from_icon_name() over gtk_status_icon_set_from_pixbuf(). * addressbook/gui/component/addressbook-view.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-memo-table.c: * mail/mail-mt.c: e_activity_handler_operation_started() no longer takes a GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a spinner icon. svn path=/trunk/; revision=35958 --- shell/e-component-registry.c | 2 -- shell/e-shell-view.c | 1 - shell/e-shell-window-commands.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 146ceb26a6..1dfac47561 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -26,8 +26,6 @@ #include "e-component-registry.h" -#include - #include #include diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index daa9794e3b..a71c3f3ab3 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -31,7 +31,6 @@ #include "e-shell-view.h" #include "e-shell-window.h" -#include "e-util/e-icon-factory.h" static BonoboObjectClass *parent_class = NULL; diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index a9f46205bb..eaf3fbd82e 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -39,9 +39,9 @@ #include -#include "e-util/e-icon-factory.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-error.h" +#include "e-util/e-icon-factory.h" #include "e-util/e-print.h" #include "e-util/e-util-private.h" -- cgit v1.2.3 From af89ff7eddf0c3214be4ef23acf235d8540fd157 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 18 Aug 2008 04:05:13 +0000 Subject: Milan Crha ** Fix for bug #416258 (Evolution "New Mail" icon is wrong size). svn path=/trunk/; revision=36007 --- shell/ChangeLog | 8 ++++++++ shell/e-user-creatable-items-handler.c | 13 +++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 1296ec35c8..74feafdaf9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2008-08-18 Milan Crha + + ** Fix for bug #416258 + + * e-user-creatable-items-handler.c (ensure_menu_items), + (free_menu_items), (new_button_change), (setup_toolbar_button): + Added icon_toolbar for default items which is used instead of menu icon. + 2008-08-08 Matthew Barnes * e-shell-importer.c: diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index f18deeb527..24ba4acd39 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -60,6 +60,7 @@ struct _MenuItem { char *tooltip; char *component; GdkPixbuf *icon; + GdkPixbuf *icon_toolbar; }; typedef struct _MenuItem MenuItem; @@ -258,8 +259,13 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) if (corba_item->iconName == NULL || *corba_item->iconName == '\0') { item->icon = NULL; + item->icon_toolbar = NULL; } else { item->icon = e_icon_factory_get_icon (corba_item->iconName, E_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); + else + item->icon_toolbar = NULL; } if (corba_item->type == GNOME_Evolution_CREATABLE_OBJECT) @@ -304,6 +310,9 @@ free_menu_items (GSList *menu_items) if (item->icon != NULL) g_object_unref (item->icon); + if (item->icon_toolbar != NULL) + g_object_unref (item->icon_toolbar); + g_free (item->component); g_free (item); } @@ -698,7 +707,7 @@ new_button_change (GConfClient *gconf, val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL); set_combo_button_style (E_COMBO_BUTTON (priv->new_button), - val, priv->default_menu_item->icon); + val, priv->default_menu_item->icon_toolbar ? priv->default_menu_item->icon_toolbar : priv->default_menu_item->icon); g_free (val); gtk_widget_show (priv->new_button); @@ -738,7 +747,7 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler) gtk_widget_set_sensitive (priv->new_button, TRUE); set_combo_button_style (E_COMBO_BUTTON (priv->new_button), - val, priv->default_menu_item->icon); + val, priv->default_menu_item->icon_toolbar ? priv->default_menu_item->icon_toolbar : priv->default_menu_item->icon); gconf_client_notify_add(gconf,"/desktop/gnome/interface/toolbar_style", (GConfClientNotifyFunc)new_button_change, handler, NULL, NULL); -- cgit v1.2.3 From f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Aug 2008 04:37:15 +0000 Subject: ** Fixes bug #508732 2008-08-18 Matthew Barnes ** Fixes bug #508732 * shell/e-shell.c: Add a "crash_recovery" flag, with accessor functions for it. * shell/e-shell-window (init_view): Check and reset the "crash_recovery" flag before creating a new shell view. The components can use this flag to take steps to recover from the previous crash. * shell/apps_evolution_shell.schemas.in: Remove the "skip_recovery_dialog" and "recovery" keys. * shell/Evolution-Component.idl (createView): Add a "select_item" boolean parameter. * shell/main.c: Kill the crash recovery dialog. Instead just set the crash recovery flag in e-shell appropriately. * mail/mail-component.c (impl_createView): Add a "select_item" argument for crash recovery, which we forward to EMFolderBrowser as a "suppress_message_selection" flag. * mail/em-folder-browser.c (emfb_set_folder): Suppress automatic message selection if we are recovering from a crash. * addressbook/gui/component/addressbook-component.c (impl_createView): * calendar/gui/calendar-component.c (impl_createView): * calendar/gui/memos-component.c (impl_createView): * calendar/gui/tasks-component.c (impl_createView): Add a "select_item" argument for crash recovery, which these components do not use. * help/C/evolution.xml: Remove the bit about crash recovery. svn path=/trunk/; revision=36009 --- shell/ChangeLog | 22 ++++++++ shell/Evolution-Component.idl | 3 +- shell/apps_evolution_shell.schemas.in | 25 --------- shell/e-shell-window.c | 6 ++- shell/e-shell.c | 20 +++++++ shell/e-shell.h | 4 ++ shell/main.c | 98 +---------------------------------- 7 files changed, 55 insertions(+), 123 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 74feafdaf9..60181ad24e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,25 @@ +2008-08-18 Matthew Barnes + + ** Fixes part of bug #508732 + + * e-shell.c: + Add a "crash_recovery" flag, with accessor functions for it. + + * e-shell-window (init_view): + Check and reset the "crash_recovery" flag before creating a + new shell view. The components can use this flag to take + steps to recover from the previous crash. + + * apps_evolution_shell.schemas.in: + Remove the "skip_recovery_dialog" and "recovery" keys. + + * Evolution-Component.idl (createView): + Add a "select_item" boolean parameter. + + * main.c: + Kill the crash recovery dialog. Instead just set the crash + recovery flag in e-shell appropriately. + 2008-08-18 Milan Crha ** Fix for bug #416258 diff --git a/shell/Evolution-Component.idl b/shell/Evolution-Component.idl index 8f52fa95ba..ccf806ff91 100644 --- a/shell/Evolution-Component.idl +++ b/shell/Evolution-Component.idl @@ -75,7 +75,8 @@ module Evolution { raises (UnsupportedVersion, UpgradeFailed); /*** Basic functionality. ***/ - ComponentView createView(in ShellView parent) + ComponentView createView(in ShellView parent, + in boolean select_item) raises (Failed); diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in index 036417ea16..24172f25ba 100644 --- a/shell/apps_evolution_shell.schemas.in +++ b/shell/apps_evolution_shell.schemas.in @@ -41,31 +41,6 @@ - - - /schemas/apps/evolution/shell/skip_recovery_dialog - /apps/evolution/shell/skip_recovery_dialog - evolution - bool - false - - Skip recovery warning dialog - Whether the warning dialog in recovery of Evolution is skipped. - - - - - /schemas/apps/evolution/shell/recovery - /apps/evolution/shell/recovery - evolution - bool - true - - Whether crash detection should be done or not - Decides whether the crash detection should be run or not. - - - diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index cf188e27e7..0bef6caaee 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -210,6 +210,7 @@ init_view (EShellWindow *window, Bonobo_Control sidebar_control; Bonobo_Control view_control; Bonobo_Control statusbar_control; + CORBA_boolean select_item; CORBA_Environment ev; int sidebar_notebook_page_num; int view_notebook_page_num; @@ -218,6 +219,9 @@ init_view (EShellWindow *window, g_return_if_fail (view->sidebar_widget == NULL); g_return_if_fail (view->notebook_page_num == -1); + select_item = !e_shell_get_crash_recovery (priv->shell.eshell); + e_shell_set_crash_recovery (priv->shell.eshell, FALSE); + CORBA_exception_init (&ev); /* 1. Activate component. (FIXME: Shouldn't do this here.) */ @@ -238,7 +242,7 @@ init_view (EShellWindow *window, (e.g. methods not implemented)... So handle it as if there was no component at all. */ - component_view = GNOME_Evolution_Component_createView(component_iface, BONOBO_OBJREF(priv->shell_view), &ev); + component_view = GNOME_Evolution_Component_createView(component_iface, BONOBO_OBJREF(priv->shell_view), select_item, &ev); if (component_view == NULL || BONOBO_EX (&ev)) { g_warning ("Cannot create view for %s", view->component_id); bonobo_object_release_unref (component_iface, NULL); diff --git a/shell/e-shell.c b/shell/e-shell.c index 6173f47498..948f7c41e3 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -117,6 +117,9 @@ struct _EShellPrivate { /* Whether quit has been requested, and the shell is now waiting for permissions from all the components to quit. */ unsigned int preparing_to_quit : 1; + + /* Whether we are recovering from a crash in the previous session. */ + unsigned int crash_recovery : 1; }; @@ -1214,6 +1217,23 @@ e_shell_go_online (EShell *shell, set_line_status(shell, shell_state); } +gboolean +e_shell_get_crash_recovery (EShell *shell) +{ + g_return_val_if_fail (E_IS_SHELL (shell), NULL); + + return shell->priv->crash_recovery; +} + +void +e_shell_set_crash_recovery (EShell *shell, + gboolean crash_recovery) +{ + g_return_if_fail (E_IS_SHELL (shell)); + + shell->priv->crash_recovery = crash_recovery; +} + void e_shell_send_receive (EShell *shell) { diff --git a/shell/e-shell.h b/shell/e-shell.h index b06e480c69..5dfaafac93 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -124,6 +124,10 @@ void e_shell_go_offline (EShell *shell, void e_shell_go_online (EShell *shell, EShellWindow *action_window, GNOME_Evolution_ShellState shell_state); +gboolean e_shell_get_crash_recovery (EShell *shell); +void e_shell_set_crash_recovery (EShell *shell, + gboolean crash_recovery); + void e_shell_send_receive (EShell *shell); void e_shell_show_settings (EShell *shell, diff --git a/shell/main.c b/shell/main.c index 27ebb4a9a5..4d71e902d7 100644 --- a/shell/main.c +++ b/shell/main.c @@ -87,11 +87,6 @@ #define SKIP_WARNING_DIALOG_KEY \ "/apps/evolution/shell/skip_warning_dialog" -#define SKIP_RECOVERY_DIALOG_KEY \ - "/apps/evolution/shell/skip_recovery_dialog" -#define RECOVERY_KEY \ - "/apps/evolution/shell/recovery" - static EShell *shell = NULL; @@ -287,70 +282,6 @@ destroy_config (GConfClient *client) #endif /* DEVELOPMENT */ -static int -show_recovery_warning(void) -{ - GtkWidget *vbox; - GtkWidget *label; - GtkWidget *warning_dialog; - GtkWidget *checkbox; - GtkWidget *alignment; - gboolean skip; - char *text; - int flags = 0, response; - - warning_dialog = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Evolution Crash Detection")); - gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE); - gtk_dialog_add_button (GTK_DIALOG (warning_dialog), _("Ig_nore"), GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (warning_dialog), _("_Recover"), GTK_RESPONSE_OK); - - gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE); - - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->vbox), 0); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->action_area), 12); - - vbox = gtk_vbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), vbox, - TRUE, TRUE, 0); - - text = g_strdup( - /* xgettext:no-c-format */ - _("Evolution appears to have exited unexpectedly the last time it was\n" - "run. As a precautionary measure, all preview panes will be hidden.\n" - "You can restore the preview panes from the View menu.\n")); - label = gtk_label_new (text); - g_free(text); - - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); - - checkbox = gtk_check_button_new_with_mnemonic (_("_Do not show this message again")); - - alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - - gtk_container_add (GTK_CONTAINER (alignment), checkbox); - gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); - - gtk_widget_show_all (warning_dialog); - - response = gtk_dialog_run (GTK_DIALOG (warning_dialog)); - - if (response != GTK_RESPONSE_CANCEL) - flags = flags|(1<<1); - - skip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); - if (skip) - flags = flags|(1<<2); - - gtk_widget_destroy (warning_dialog); - - return flags; -} - static void open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris) { @@ -399,6 +330,7 @@ idle_cb (gchar **uris) startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE; shell = e_shell_new (startup_line_mode, &result); + e_shell_set_crash_recovery (shell, e_file_lock_exists ()); switch (result) { case E_SHELL_CONSTRUCT_RESULT_OK: @@ -431,33 +363,7 @@ idle_cb (gchar **uris) if (uris != NULL) open_uris (corba_shell, uris); else { - GConfClient *client = gconf_client_get_default (); - - if (gconf_client_get_bool (client, RECOVERY_KEY, NULL) && e_file_lock_exists ()) { - /* It should have crashed last time or a force-shutdown */ - gboolean skip = gconf_client_get_bool (client, SKIP_RECOVERY_DIALOG_KEY, NULL); - gboolean recover = TRUE; - if (!skip){ - int flags = show_recovery_warning (); - - gconf_client_set_bool (client, SKIP_RECOVERY_DIALOG_KEY, (flags & (1<<2)) ? TRUE : FALSE, NULL); - recover = (flags & (1<<1)) ? TRUE: FALSE; - } - - if (recover) { - /* Disable the previews */ - gconf_client_set_bool (client, "/apps/evolution/mail/display/show_preview", FALSE, NULL); - gconf_client_set_bool (client, "/apps/evolution/mail/display/safe_list", TRUE, NULL); - gconf_client_set_bool (client, "/apps/evolution/addressbook/display/show_preview", FALSE, NULL); - gconf_client_set_bool (client, "/apps/evolution/calendar/display/show_task_preview", FALSE, NULL); - } - /* Let us not delete and recreate a lock, instead reuse it. We don't use timestamps anyways */ - } else { - /* What great can we do, if lock creation fails ?*/ - e_file_lock_create (); - } - g_object_unref (client); - + e_file_lock_create (); e_shell_create_window (shell, default_component_id, NULL); } } else { -- cgit v1.2.3 From a763c26876c7e56401452f76e1d372bb945aa8b7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Aug 2008 04:43:06 +0000 Subject: Fix a little compiler warning I caused. svn path=/trunk/; revision=36010 --- shell/e-shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/e-shell.c b/shell/e-shell.c index 948f7c41e3..f48978dfd5 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1220,7 +1220,7 @@ e_shell_go_online (EShell *shell, gboolean e_shell_get_crash_recovery (EShell *shell) { - g_return_val_if_fail (E_IS_SHELL (shell), NULL); + g_return_val_if_fail (E_IS_SHELL (shell), FALSE); return shell->priv->crash_recovery; } -- cgit v1.2.3 From 6a753a24990e14b9b896bf419747723fe828f748 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Aug 2008 14:06:17 +0000 Subject: Fix the function signature to conform to the component interface. 2008-08-18 Matthew Barnes * shell/test/evolution-test-component.c (impl_upgradeFromVersion): Fix the function signature to conform to the component interface. svn path=/trunk/; revision=36015 --- shell/ChangeLog | 5 +++++ shell/test/evolution-test-component.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 60181ad24e..0aa3bb8359 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2008-08-18 Matthew Barnes + + * test/evolution-test-component.c (impl_upgradeFromVersion): + Fix the function signature to conform to the component interface. + 2008-08-18 Matthew Barnes ** Fixes part of bug #508732 diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 88a7b05bf9..6e437e55f4 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -73,11 +73,11 @@ impl_finalize (GObject *object) /* Evolution::Component CORBA methods */ -static CORBA_boolean +static void impl_upgradeFromVersion (PortableServer_Servant servant, - CORBA_short major, - CORBA_short minor, - CORBA_short revision, + const CORBA_short major, + const CORBA_short minor, + const CORBA_short revision, CORBA_Environment *ev) { EvolutionTestComponent *component = EVOLUTION_TEST_COMPONENT (bonobo_object_from_servant (servant)); @@ -86,8 +86,6 @@ impl_upgradeFromVersion (PortableServer_Servant servant, priv = component->priv; g_message ("Upgrading from %d.%d.%d", major, minor, revision); - - return CORBA_TRUE; } -- cgit v1.2.3 From 879d84ab6eda1254ecfa7b9eef230850d6088576 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 19 Aug 2008 15:02:36 +0000 Subject: Coding style cleanups. svn path=/trunk/; revision=36025 --- shell/e-shell-nm-glib.c | 31 ++++++++++++++++--------------- shell/e-shell-nm.c | 29 ++++++++++++++--------------- shell/e-shell-window.c | 4 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-nm-glib.c b/shell/e-shell-nm-glib.c index 0af9e5d811..1325572f0f 100644 --- a/shell/e-shell-nm-glib.c +++ b/shell/e-shell-nm-glib.c @@ -33,9 +33,10 @@ static libnm_glib_ctx *nm_ctx = NULL; static guint id = 0; -static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) +static void +e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) { - libnm_glib_state state; + libnm_glib_state state; EShellLineStatus line_status; EShellWindow *window = E_SHELL_WINDOW (user_data); EShell *shell = e_shell_window_peek_shell (window); @@ -47,26 +48,26 @@ static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_dat line_status = e_shell_get_line_status (shell); if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); + shell_state = GNOME_Evolution_FORCED_OFFLINE; + e_shell_go_offline (shell, window, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); + shell_state = GNOME_Evolution_USER_ONLINE; + e_shell_go_online (shell, window, shell_state); } } -int e_shell_nm_glib_initialise (EShellWindow *window); +gboolean e_shell_nm_glib_initialise (EShellWindow *window); void e_shell_nm_glib_dispose (EShellWindow *window); -int e_shell_nm_glib_initialise (EShellWindow *window) +gboolean +e_shell_nm_glib_initialise (EShellWindow *window) { - if (!nm_ctx) - { + if (!nm_ctx) { nm_ctx = libnm_glib_init (); if (!nm_ctx) { - fprintf (stderr, "Could not initialize libnm.\n"); - return FALSE; - } + fprintf (stderr, "Could not initialize libnm.\n"); + return FALSE; + } } id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL); @@ -74,7 +75,8 @@ int e_shell_nm_glib_initialise (EShellWindow *window) return TRUE; } -void e_shell_nm_glib_dispose (EShellWindow *window) +void +e_shell_nm_glib_dispose (EShellWindow *window) { if (id != 0 && nm_ctx != NULL) { libnm_glib_unregister_callback (nm_ctx, id); @@ -83,4 +85,3 @@ void e_shell_nm_glib_dispose (EShellWindow *window) id = 0; } } - diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index e6a9c2930e..b2e84030b6 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -40,12 +40,10 @@ typedef enum _ShellLineStatus { E_SHELL_LINE_UP } ShellLineStatus; - static gboolean init_dbus (EShellWindow *window); static DBusConnection *dbus_connection = NULL; - static gboolean reinit_dbus (gpointer user_data) { @@ -59,7 +57,7 @@ reinit_dbus (gpointer user_data) static DBusHandlerResult e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, void *user_data) + DBusMessage *message, void *user_data) { DBusError error; const char *object; @@ -69,11 +67,11 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, GNOME_Evolution_ShellState shell_state; EShellLineStatus line_status; - if (!user_data || !E_IS_SHELL_WINDOW (user_data)) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + if (!user_data || !E_IS_SHELL_WINDOW (user_data)) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - window = E_SHELL_WINDOW (user_data); - shell = e_shell_window_peek_shell (window); + window = E_SHELL_WINDOW (user_data); + shell = e_shell_window_peek_shell (window); dbus_error_init (&error); object = dbus_message_get_path (message); @@ -102,11 +100,11 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, line_status = e_shell_get_line_status (shell); if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { - shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); + shell_state = GNOME_Evolution_FORCED_OFFLINE; + e_shell_go_offline (shell, window, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && status == E_SHELL_LINE_UP) { - shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); + shell_state = GNOME_Evolution_USER_ONLINE; + e_shell_go_online (shell, window, shell_state); } return DBUS_HANDLER_RESULT_HANDLED; @@ -145,7 +143,7 @@ init_dbus (EShellWindow *window) return TRUE; - exception: +exception: dbus_connection_unref (dbus_connection); dbus_connection = NULL; @@ -153,16 +151,17 @@ init_dbus (EShellWindow *window) return FALSE; } -int e_shell_dbus_initialise (EShellWindow *window) +gboolean +e_shell_dbus_initialise (EShellWindow *window) { g_type_init (); return init_dbus (window); } -void e_shell_dbus_dispose (EShellWindow *window) +void +e_shell_dbus_dispose (EShellWindow *window) { //FIXME return; } - diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 0bef6caaee..81de5627ce 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -54,10 +54,10 @@ #include #ifdef NM_SUPPORT_GLIB -void e_shell_nm_glib_initialise (EShellWindow *window); +gboolean e_shell_nm_glib_initialise (EShellWindow *window); void e_shell_nm_glib_dispose (EShellWindow *window); #elif NM_SUPPORT -void e_shell_dbus_initialise (EShellWindow *window); +gboolean e_shell_dbus_initialise (EShellWindow *window); void e_shell_dbus_dispose (EShellWindow *window); #endif -- cgit v1.2.3 From 1bad915150e2d5e97cbbf1a77f7a85e338c07f28 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 27 Aug 2008 10:33:22 +0000 Subject: License Changes svn path=/trunk/; revision=36116 --- shell/ChangeLog | 17 +++++++++++++++++ shell/e-component-view.h | 26 +++++++++++++------------- shell/e-config-upgrade.h | 27 ++++++++++++++------------- shell/e-shell-settings-dialog.h | 26 +++++++++++++------------- shell/e-shell-view.h | 22 +++++++++++----------- shell/e-shell-window-commands.h | 25 +++++++++++++------------ shell/e-shell-window.h | 25 +++++++++++++------------ shell/e-sidebar.h | 25 +++++++++++++------------ shell/es-event.h | 29 +++++++++++++++-------------- shell/es-menu.h | 29 +++++++++++++++-------------- shell/evolution-component.h | 24 +++++++++++++----------- shell/evolution-listener.c | 24 +++++++++++++----------- shell/evolution-listener.h | 24 +++++++++++++----------- 13 files changed, 176 insertions(+), 147 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 0aa3bb8359..c37515e259 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,20 @@ +2008-08-27 Sankar P + +License Changes + + * e-component-view.h: + * e-config-upgrade.h: + * e-shell-settings-dialog.h: + * e-shell-view.h: + * e-shell-window-commands.h: + * e-shell-window.h: + * e-sidebar.h: + * es-event.h: + * es-menu.h: + * evolution-component.h: + * evolution-listener.c: + * evolution-listener.h: + 2008-08-18 Matthew Barnes * test/evolution-test-component.c (impl_upgradeFromVersion): diff --git a/shell/e-component-view.h b/shell/e-component-view.h index d932292ac2..96a48d1e02 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - * e-component-view.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author(s): Michael Zucchi +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index e6f53b0e4a..27d9393058 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-config-upgrade.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author: Michael Zucchi +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifndef _E_CONFIG_UPGRADE_H diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h index aeab973959..90c09627e2 100644 --- a/shell/e-shell-settings-dialog.h +++ b/shell/e-shell-settings-dialog.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-settings-dialog.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SHELL_SETTINGS_DIALOG_H_ diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 598dcf5f69..f284604d92 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-view.h +/* * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This is only a CORBA wrapper around e_shell_window. * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * This is only a CORBA wrapper around e_shell_window. */ #ifndef _E_SHELL_VIEW_H_ diff --git a/shell/e-shell-window-commands.h b/shell/e-shell-window-commands.h index d71352af47..3d3843c8f0 100644 --- a/shell/e-shell-window-commands.h +++ b/shell/e-shell-window-commands.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-window-commands.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SHELL_WINDOW_COMMANDS_H_ diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index 400d68bc19..d94aef0f4f 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-window.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SHELL_WINDOW_H_ diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index 3ab9350e55..a3d3b43fee 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-sidebar.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SIDEBAR_H_ diff --git a/shell/es-event.h b/shell/es-event.h index bb707050a7..ca12eb22dd 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/es-menu.h b/shell/es-menu.h index 7b9126d93b..7ea4df5576 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/evolution-component.h b/shell/evolution-component.h index 00d232774c..9202829708 100644 --- a/shell/evolution-component.h +++ b/shell/evolution-component.h @@ -1,24 +1,26 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + * Abstract class wrapper for EvolutionComponent * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * Author: Michael Zucchi * - * Abstract class wrapper for EvolutionComponent + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _EVOLUTION_COMPONENT_H_ diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c index c9b8985107..516c04abb2 100644 --- a/shell/evolution-listener.c +++ b/shell/evolution-listener.c @@ -1,22 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Michael Zucchi * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h index 48e00cad68..c85ae53613 100644 --- a/shell/evolution-listener.h +++ b/shell/evolution-listener.h @@ -1,24 +1,26 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + * Abstract class wrapper for EvolutionListener * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * Author: Michael Zucchi * - * Abstract class wrapper for EvolutionListener + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _EVOLUTION_LISTENER_H_ -- cgit v1.2.3 From cc482c3d1a50cc0f5398b3140cda70b1d0d9e12f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 30 Aug 2008 11:43:22 +0000 Subject: ** Fixes bug #549554 (patch from Paul Bolle) 2008-08-30 Matthew Barnes ** Fixes bug #549554 (patch from Paul Bolle) * shell/e-shell-importer.c: (struct info): Drop sentence about an "Automatic" option. svn path=/trunk/; revision=36218 --- shell/ChangeLog | 7 +++++++ shell/e-shell-importer.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index c37515e259..2349fa7198 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-08-30 Matthew Barnes + + ** Fixes bug #549554 (patch from Paul Bolle) + + * e-shell-importer.c: (struct info): + Drop sentence about an "Automatic" option. + 2008-08-27 Sankar P License Changes diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 23b473a0a9..6826c44f67 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -132,9 +132,7 @@ static struct { }, { "file_html", N_("Choose the file that you want to import into Evolution, " - "and select what type of file it is from the list.\n\n" - "You can select \"Automatic\" if you do not know, and " - "Evolution will attempt to work it out.") + "and select what type of file it is from the list.") }, { "dest_html", N_("Choose the destination for this import") -- cgit v1.2.3 From 14fa5c8a8cf736e3207b9d9e414586d9ff3a623f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 2 Sep 2008 16:25:53 +0000 Subject: Change License from GPL to LGPL. 2nd batch. More changes to come. svn path=/trunk/; revision=36247 --- shell/ChangeLog | 31 +++++++++++++++++++++++++ shell/e-component-registry.h | 25 ++++++++++---------- shell/e-component-view.c | 28 +++++++++++----------- shell/e-corba-config-page.c | 26 ++++++++++----------- shell/e-corba-config-page.h | 26 ++++++++++----------- shell/e-shell-constants.h | 26 ++++++++++----------- shell/e-shell-importer.h | 26 ++++++++++----------- shell/e-shell.h | 26 ++++++++++----------- shell/e-user-creatable-items-handler.h | 26 ++++++++++----------- shell/es-event.c | 28 +++++++++++----------- shell/es-menu.c | 28 +++++++++++----------- shell/evolution-component.c | 25 ++++++++++---------- shell/evolution-config-control.c | 26 ++++++++++----------- shell/evolution-config-control.h | 26 ++++++++++----------- shell/evolution-shell-component-utils.c | 24 +++++++++---------- shell/evolution-shell-component-utils.h | 25 ++++++++++---------- shell/importer/evolution-importer-client.c | 27 ++++++++++----------- shell/importer/evolution-importer-client.h | 26 ++++++++++----------- shell/importer/evolution-importer-listener.c | 26 ++++++++++----------- shell/importer/evolution-importer-listener.h | 26 ++++++++++----------- shell/importer/evolution-importer.c | 26 ++++++++++----------- shell/importer/evolution-importer.h | 26 ++++++++++----------- shell/importer/evolution-intelligent-importer.c | 26 ++++++++++----------- shell/importer/evolution-intelligent-importer.h | 26 ++++++++++----------- shell/importer/intelligent.c | 31 ++++++++++++------------- shell/importer/intelligent.h | 26 ++++++++++----------- shell/test/evolution-test-component.h | 26 ++++++++++----------- 27 files changed, 373 insertions(+), 341 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 2349fa7198..a32bde66ce 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,34 @@ +2008-09-02 Sankar P + +License Changes + + * e-component-registry.h: + * e-component-view.c: + * e-corba-config-page.c: + * e-corba-config-page.h: + * e-shell-constants.h: + * e-shell-importer.h: + * e-shell.h: + * e-user-creatable-items-handler.h: + * es-event.c: + * es-menu.c: + * evolution-component.c: + * evolution-config-control.c: + * evolution-config-control.h: + * evolution-shell-component-utils.c: + * evolution-shell-component-utils.h: + * importer/evolution-importer-client.c: + * importer/evolution-importer-client.h: + * importer/evolution-importer-listener.c: + * importer/evolution-importer-listener.h: + * importer/evolution-importer.c: + * importer/evolution-importer.h: + * importer/evolution-intelligent-importer.c: + * importer/evolution-intelligent-importer.h: + * importer/intelligent.c: + * importer/intelligent.h: + * test/evolution-test-component.h: + 2008-08-30 Matthew Barnes ** Fixes bug #549554 (patch from Paul Bolle) diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 1d5943537c..fa0de9c5c1 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -1,23 +1,22 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-component-registry.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __E_COMPONENT_REGISTRY_H__ diff --git a/shell/e-component-view.c b/shell/e-component-view.c index 0aeb6d2189..cbe59529c4 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -1,25 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - * e-component-view.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author(s): Michael Zucchi +/* + * Helper class for evolution components to setup a view * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Helper class for evolution components to setup a view */ #ifdef HAVE_CONFIG_H diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index f464568381..603a8fd21f 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-corba-config-page.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h index 0cf6b9f0da..9a6747cf22 100644 --- a/shell/e-corba-config-page.h +++ b/shell/e-corba-config-page.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-corba-config-page.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_CORBA_CONFIG_PAGE_H_ diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h index 1adeffaf4f..25aec79d6f 100644 --- a/shell/e-shell-constants.h +++ b/shell/e-shell-constants.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_SHELL_CONSTANTS_H diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h index 72fdd11ffc..f4489c3020 100644 --- a/shell/e-shell-importer.h +++ b/shell/e-shell-importer.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* importer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SHELL_IMPORTER_H_ diff --git a/shell/e-shell.h b/shell/e-shell.h index 5dfaafac93..9a36594042 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SHELL_H_ diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h index e220e6c5a1..5d51612539 100644 --- a/shell/e-user-creatable-items-handler.h +++ b/shell/e-user-creatable-items-handler.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-user-creatable-items-handler.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_USER_CREATABLE_ITEMS_HANDLER_H_ diff --git a/shell/es-event.c b/shell/es-event.c index 4146cbccae..8aeeb7b912 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/es-menu.c b/shell/es-menu.c index cd573a9642..ac2736b52a 100644 --- a/shell/es-menu.c +++ b/shell/es-menu.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/evolution-component.c b/shell/evolution-component.c index 4477d176d6..62cddb6a32 100644 --- a/shell/evolution-component.c +++ b/shell/evolution-component.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Michael Zucchi - * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index b50bcf5072..56c5b60048 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-config-control.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h index e265be0a40..10e320c4a8 100644 --- a/shell/evolution-config-control.h +++ b/shell/evolution-config-control.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-config-control.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef EVOLUTION_CONFIG_CONTROL_H diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 68a9995481..7400cb23c4 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -1,21 +1,21 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-shell-component-utils.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index b3f1b0b8eb..0fe71de8f4 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -1,21 +1,22 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-shell-component-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifndef __EVOLUTION_SHELL_COMPONENT_UTILS_H__ diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 73ae4a1d68..5f32241b17 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -1,24 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer-client.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * * Based on evolution-shell-component-client.c by Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index f4e157e6bb..043a639c5d 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer-client.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef EVOLUTION_IMPORTER_CLIENT_H diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index 2ee9697e69..e8256971f1 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer-client.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index f7a815a28b..7e09ff2da8 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer-listener.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef EVOLUTION_IMPORTER_LISTENER_H diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 35afc924ce..9fb7e66f5e 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index 1e69d064d0..a684aecfb2 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-importer.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef EVOLUTION_IMPORTER_H diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index e0a7230411..bce7d75fa8 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-intelligent-importer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 77e7245fac..35ad7d0010 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-intelligent-importer.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef EVOLUTION_INTELLIGENT_IMPORTER_H diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index a60c65e6a6..a9a8fed024 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* intelligent.c - * - * Authors: - * Iain Holmes - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * 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 + * + * + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA */ #ifdef HAVE_CONFIG_H diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h index 3bb349a653..bbdf00cc18 100644 --- a/shell/importer/intelligent.h +++ b/shell/importer/intelligent.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* importer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Kjartan Maraas + * Authors: + * Kjartan Maraas + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __INTELLIGENT_H__ diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h index 2f8cc3722a..18a86f1baf 100644 --- a/shell/test/evolution-test-component.h +++ b/shell/test/evolution-test-component.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* evolution-test-component.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: JP Rosevear + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _EVOLUTION_TEST_COMPONENT_H_ -- cgit v1.2.3 From 76dbf9df1f0126d695925c3c012387976951452d Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Thu, 4 Sep 2008 14:56:39 +0000 Subject: License changes. Changed license from GPL to LGPL. More to come. svn path=/trunk/; revision=36255 --- shell/ChangeLog | 7 +++++++ shell/e-component-registry.c | 26 +++++++++++++------------- shell/e-shell-settings-dialog.c | 27 +++++++++++++-------------- 3 files changed, 33 insertions(+), 27 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index a32bde66ce..599e2f32ec 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-09-04 Sankar P + +License Changes + + * e-component-registry.c: + * e-shell-settings-dialog.c: + 2008-09-02 Sankar P License Changes diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 1dfac47561..cff9369aee 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-component-registry.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 27c4fde6df..11b8ad7719 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-settings-dialog.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From b7fc5caefe4aded8d0ffd7088ecbbf1f370b995e Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 12 Sep 2008 16:19:36 +0000 Subject: License Changes from GPL to LGPL svn path=/trunk/; revision=36313 --- shell/ChangeLog | 9 +++++++++ shell/e-config-upgrade.c | 29 +++++++++++++++-------------- shell/e-shell-importer.c | 26 +++++++++++++------------- shell/e-shell-nm-glib.c | 26 ++++++++++++++------------ shell/e-shell-nm.c | 27 ++++++++++++++------------- 5 files changed, 65 insertions(+), 52 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 599e2f32ec..4033db2db8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2008-09-12 Sankar P + +License Changes + + * e-config-upgrade.c: + * e-shell-importer.c: + * e-shell-nm-glib.c: + * e-shell-nm.c: + 2008-09-04 Sankar P License Changes diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 4868d99bf7..09c9281ab7 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -1,24 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-upgrade.c - upgrade previous config versions - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Michael Zucchi - * Jeffery Stedfast +/* + * e-upgrade.c - upgrade previous config versions * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * + * Authors: + * Michael Zucchi + * Jeffery Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 6826c44f67..ff347d7fe2 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* importer.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Iain Holmes + * Authors: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/shell/e-shell-nm-glib.c b/shell/e-shell-nm-glib.c index 1325572f0f..458d87af8e 100644 --- a/shell/e-shell-nm-glib.c +++ b/shell/e-shell-nm-glib.c @@ -1,21 +1,23 @@ /* - * Shreyas Srinivasan - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * 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 + * + * + * Authors: + * Shreyas Srinivasan * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) Copyright 2005 Novell, Inc. */ #ifdef HAVE_CONFIG_H diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index b2e84030b6..58923831e4 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Shreyas Srinivasan - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * 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 + * + * + * Authors: + * Shreyas Srinivasan * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) Copyright 2005 Novell, Inc. */ #define DBUS_API_SUBJECT_TO_CHANGE 1 -- cgit v1.2.3 From 7f1cb586fb197b23b9aec62cd27c3de99af9eb7c Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Mon, 15 Sep 2008 03:48:41 +0000 Subject: Updated the list of Contributors. 2008-09-15 Bharath Acharya Updated the list of Contributors. * e-shell-window-commands.c: svn path=/trunk/; revision=36329 --- shell/ChangeLog | 6 + shell/e-shell-window-commands.c | 313 +++++++++++++++++++++++++++++++++------- 2 files changed, 269 insertions(+), 50 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 4033db2db8..9492fcc002 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-09-15 Bharath Acharya + + Updated the list of Contributors. + + * e-shell-window-commands.c: + 2008-09-12 Sankar P License Changes diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index eaf3fbd82e..41db2bd456 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -168,28 +168,42 @@ static const char *authors[] = { "Alastair McKinstry", "Alastair Tse", "Alejandro Andres", + "Ales Nyakhaychyk", "Alessandro Decina", + "Alessio Frusciante", "Alex Graveley", "Alex Jiang", "Alex Jones", "Alex Kloss", + "Alex Rostovtsev", + "Alexander Didebulidze", "Alexander Shopov", + "Alexander Winston", + "Alexandre Folle de Menezes", "Alfred Peng", "Ali Abdin", "Ali Akcaagac", + "Alireza Kheirkhahan", "Almer S. Tigelaar", + "Alp Toker", + "Amanpreet Singh Alam", + "Ambuj Chitranshi", "Amish", + "Amitakhya Phukan", "Anand V M", "Anders Carlsson", - "Andre Klapper", + "Andras Timar", "Andrea Campi", "Andreas Henriksson", "Andreas Hyden", "Andreas J. Guelzow", - "Andreas K\xC3\xB6hler", + "Andreas Köhler", "Andrew Ruthven", + "Andre Klapper", "Andrew T. Veliath", + "Andrew V. Samoilov", "Andrew Wu", + "Ani Peter", "Ankit Patel", "Anna Marie Dirks", "Antonio Xu", @@ -199,14 +213,22 @@ static const char *authors[] = { "Ariel Rios", "Arik Devens", "Armin Bauer", + "Arjan Scherpenisse", + "Arkadiusz Lipiec", + "Artis Trops", + "Artur Flinta", "Arturo Espinosa Aldama", "Arulanandan P", "Arun Prakash", "Arvind Sundararajan", - "Ashish", - "B S Srinidhi", + "Ashish Shrivastava", + "Åsmund Skjæveland", + "Audrey Simons", + "Baptiste Mille-Mathias", + "Baris Cicek", "Bastien Nocera", "Behnam Esfahbod", + "Benedikt Roth", "Ben Gamari", "Benjamin Berg", "Benjamin Kahn", @@ -214,22 +236,29 @@ static const char *authors[] = { "Bernard Leach", "Bertrand Guiheneuf", "Bharath Acharya", + "Bharat Kumar", + "Bharathi Gauthaman", + "Big Iain Holmes", "Bill Zhu", - "Bj\xC3\xB6rn Torkelsson", - "Bj\xC3\xB6rn Lindqvist", + "Björn Torkelsson", + "Björn Lindqvist", "Bob Doan", "Bob Mauchin", "Boby Wang", "Bolian Yin", + "Borislav Aleksandrov", + "Boulton", "Brian Mury", "Brian Pepple", + "Brigitte Le Grand", "Bruce Tao", + "B S Srinidhi", "Calvin Liu", "Cantona Su", - "Carl Sun", "Carlos Garcia Campos", "Carlos Garnacho Parro", - "Carlos Perell\xC3\xB3" " Mar\xC3\xAD" "n", + "Carlos Perelló Marín", + "Carl Sun", "Carsten Guenther", "Carsten Schaar", "Changwoo Ryu", @@ -240,39 +269,52 @@ static const char *authors[] = { "Christian Persch", "Chris Halls", "Chris Heath", - "Chris Phelps", - "Chris Toshok", + "Chris Lahey", "Christian Hammond", "Christian Kellner", + "Christian Kintner", "Christian Kirbach", "Christian Krause", "Christian Kreibich", + "Christian Meyer", "Christian Neumair", + "Christian Persch", + "Christian Rose", "Christophe Fergeau", "Christophe Merlet", "Christopher Blizzard", - "Christopher J. Lahey", + "Christopher James Lahey", "Christopher R. Gabriel", + "Chris Phelps", + "Chris Toshok", + "Clara Tattoni", "Claude Paroz", "Claudio Saavedra", "Clifford R. Conover", + "Clytie Siddall", "Cody Russell", "Colin Leroy", + "Craig Jeffares", "Craig Small", + "Cyprien Le Pannérer", "Dafydd Harries", "Damian Ivereigh", "Damien Carbery", "Damon Chaplin", - "Dan Berger", - "Dan Damian", - "Dan Nguyen", - "Dan Winship", "Daniel Gryniewicz", "Daniel Nylander", "Daniel van Eeden", "Daniel Veillard", "Daniel Yacob", - "Danilo \xC5\xA0" "egan", + "Danilo Šegan", + "Danishka Navin", + "Dan Korostelev", + "Danny Baumann", + "Dan Berger", + "Dan Damian", + "Dan Nguyen", + "Dan Williams", + "Dan Winship", "Darin Adler", "Dave Benson", "Dave Camp", @@ -281,9 +323,11 @@ static const char *authors[] = { "Dave West", "David Farning", "David Kaelbling", + "David Lodge", "David Malcolm", "David Moore", "David Mosberger", + "David O'Callaghan", "David Richards", "David Trowbridge", "David Turner", @@ -295,7 +339,9 @@ static const char *authors[] = { "Diego Sevilla Ruiz", "Dietmar Maurer", "Dinesh Layek", + "Dirk-Jan C. Binnema", "Djihed Afifi", + "Dmitrijs Ledkovs", "Dmitry Mastrukov", "Dodji Seketeli", "Duarte Loreto", @@ -310,48 +356,65 @@ static const char *authors[] = { "Elizabeth Greene", "Elliot Lee", "Elliot Turner", + "Emil Hessman", "Eneko Lacunza", "Enver Altin", "Erdal Ronahi", + "Erdi Gergo", "Eric Busboom", "Eric Zhao", + "Eskild Hustvedt" "Eskil Heyn Olsen", + "Espen Stefansen", "Ettore Perazzoli", + "Evandro Fernandes Giovanini", "Evan Yan", "Fatih Demir", "Fazlu & Hannah", "Federico Mena Quintero", "Fernando Herrera", - "Francisco Javier F. Serrador", + "Ferretti", + "F. Priyadharshini", + "Francisco Javier Fernandez Serrador", "Frank Arnold", "Frank Belew", "Frederic Crozat", "Frederic Peters", + "Frederic Riss", + "Fredrik Wendt", "Funda Wang", "Gabor Kelemen", "Ganesh", + "Göran Uddeborg", "Gareth Owen", "Gary Coady", "Gary Ekker", "Gavin Scott", "Gediminas Paulauskas", - "Gerg\xC5\x91 \xC3\x89rdi", "George Lebl", "Gerardo Marin", + "Gergő Érdi", "Gert Kulyk", "Giancarlo Capella", - "Gil Osher", "Gilbert Fang", + "Gildas Guillemot", + "Gil Forcada", "Gilles Dartiguelongue", + "Gil Osher", + "Gintautas Miliauskas", + "Goran Rakić", "Grahame Bowland", "Greg Hudson", "Gregory Leblanc", "Gregory McLean", "Grzegorz Goawski", - "Gustavo Gir\xC3\x8E" "ldez", + "Guilherme de S. Pastore", + "Guntupalli Karunakar", + "Gustavo GirÎldez", "Gustavo Maciel Dias Vieira", - "H P Nadig", - "H\xC3\xA9" "ctor Garc\xC3\xAD" "a \xC3\x81" "lvarez", + "Gustavo Noronha Silva", + "Hamed Malek", + "Hannah & Fazlu", "Hans Petter Jansson", "Hao Sheng", "Hari Prasad Nadig", @@ -361,29 +424,54 @@ static const char *authors[] = { "Havoc Pennington", "Heath Harrelson", "Hein-Pieter van Braam", + "Héctor García Álvarez", + "Helgi Þormar Þorbjörnsson", + "Hendrik Brandt", + "Hendrik Richter", "Herbert V. Riedel", + "Hessam M. Armandehi", "Hiroyuki Ikezoe", "Iain Buchanan", "Iain Holmes", "Ian Campbell", + "Iassen Pramatarov", + "Iestyn Pryce", + "I.Felix", + "Ignacio Casal Quinteiro", + "Igor Nestorović", + "Ihar Hrachyshka", "Ilkka Tuohela", + "Imam Musthaqim", + "Iñaki Larrañaga", + "Inaki Larranaga Murgoitio", + "Indu", "Irene Huang", "Ismael Olea", "Israel Escalante", - "Iv\xC3\xA1n Frade", + "Ivan Stojmirov", + "Ivar Smolin", + "Ivelina Karcheva", + "Iván Frade", "J.H.M. Dassen (Ray)", + "Jaap A. Haitsma", "Jack Jia", - "Jacob Ulysses Berkman", "Jacob Berkman", + "Jacob Brown", + "Jacobo Tarrio Barreiro", + "Jacob Ulysses Berkman", "Jaka Mocnik", + "Jakub Friedl", "Jakub Steiner", - "James Doc Livingston", "James Bowes", + "James Doc Livingston", "James Henstridge", + "James Westby", "James Willcox", + "Jamil Ahmed", "Jan Arne Petersen", "Jan Tichavsky", "Jan Van Buggenhout", + "JÃ�rg Billeter", "Jared Moore", "Jarkko Ranta", "Jason Leach", @@ -398,39 +486,68 @@ static const char *authors[] = { "Jens Granseuer", "Jens Seidel", "Jeremy Katz", + "Jeremy Messenger", "Jeremy Wise", "Jerome Lacoste", "Jerry Yu", - "Jes\xC3\xBA" "s Bravo \xC3\x81" "lvarez", + "Jesse Pavel", + "Jesus Bravo Alvarez", "Jesse Pavel", "Ji Lee", "Joan Sanfeliu", + "João Vale", + "Joaquim Fellmann", "Jody Goldberg", + "Joe Man", "Joe Marcus Clarke", "Joe Shaw", + "Johan Dahlin", + "Johan Euphrosine", "John Gotts", "Johnny Jacob", "Jon Ander Hernandez", + "Jonas Borgstr�m", + "Jonathan Blandford", + "Jonathan Dieter", + "Jonathan Ernst", + "Jonh Wendell", "Jon K Hellan", "Jon Oberheide", "Jon Trowbridge", "Jonas Borgstr", "Jonathan Blandford", "Jonathan Dieter", - "J\xC3\xBCrg Billeter", + "Joop Stakenborg", + "Jordi Mallach", + "Jordi Mas", + "Jorge Gonzalez", + "Jörgen Scheibengruber", "Jos Dehaes", + "Josep Puigdemont Casamajó", "Josselin Mouette", + "Jovan Naumovski", "JP Rosevear", + "Juan Manuel García Molina", + "Juan Pizarro", "Jukka Zitting", "Jules Colding", "Julian Missig", + "Julien Puydt", "Julio M. Merino Vidal", + "Juraj Kubelka", "Jürg Billeter", + "Justina Klingaitė", + "Kai Lahmann", + "Kang Jeong-Hee", "Karl Eichwalder", "Karl Relton", - "Karsten Br\xC3\xA4" "ckelmann", + "Karsten Bräckelmann", "Kaushal Kumar", + "Keith Packard", + "Keld Simonsen", "Kenneth Christiansen", + "Kenneth Nielsen", + "Kenneth Rohde Christiansen", "Kenny Graunke", "Keshav Upadhyaya", "Kevin Breit", @@ -440,24 +557,36 @@ static const char *authors[] = { "Kidd Wang", "Kjartan Maraas", "Krishnan R", + "Kostas Papadimas", + "Krishna Babu K", "Krisztian Pifko", "Kyle Ambroff", "Larry Ewing", + "Laszlo Dvornik", "Laszlo (Laca) Peter", "Laurent Dhima", "Lauris Kaplinski", + "Leonardo Ferreira Fontenelle", + "Leonid Kanter", "Leon Zhang", "Li Yuan", "Loïc Minier", "Lorenzo Gil Sanchez", "Luca Ferretti", + "Lucas Rocha", + "Lucian Langa", "Lucky Wankhede", "Luis Villa", + "Lukas Novotny", "Lutz M", - "M Victor Aloysius J", + "Maciej Piechotka", "Maciej Stachowiak", "Makuchaku", "Malcolm Tredinnick", + "Manuel A. Fernández Montecelo", + "Manuel Borchers", + "Marcel Telka", + "Marco Ciampa", "Marco Pesenti Gritti", "Marius Andreiana", "Marius Vollmer", @@ -471,27 +600,37 @@ static const char *authors[] = { "Martin Baulig", "Martin Hicks", "Martin Meyer", - "Martin Norb\xC3\xA4" "ck", + "Martin Norbäck", + "Martin Willemoes Hansen", "Martyn Russell", "Masahiro Sakai", + "Matej Urbančič", "Mathieu Lacage", "Matias Mutchinick", + "Matic Žgur", "Matt Bissiri", "Matt Brown", - "Matt Loper", - "Matt Martin", - "Matt Wilson", "Matthew Barnes", "Matthew Daniel", "Matthew Hall", "Matthew Loper", "Matthew Wilson", + "Matthias Braun", "Matthias Clasen", + "Matthias Warkus", + "Matt Loper", + "Matt Martin", + "Matt McCutchen", + "Matt Wilson", "Max Horn", + "Maxim Dziumanenko", "Maxx Cao", "Mayank Jain", + "Meelad Zakaria", "Meilof Veeningen", + "Mendel Mobach", "Mengjie Yu", + "Metin Amiroff", "Michael Granger", "Michael M. Morrison", "Michael MacDonald", @@ -499,6 +638,7 @@ static const char *authors[] = { "Michael Monreal", "Michael Terry", "Michael Zucchi", + "Michal Bukovjan", "Michel Daenzer", "Miguel Angel Lopez Hernandez", "Miguel de Icaza", @@ -510,141 +650,197 @@ static const char *authors[] = { "Mikhail Zabaluev", "Milan Crha", "Miles Lane", + "Miloslav Trmač", + "MIMOS Open Source Development Group", "Mohammad Damt", + "Moritz Mertinkat", "Morten Welinder", "Mubeen Jukaku", + "Mugurel Tudor", "Murray Cumming", + "M Victor Aloysius J", "Naba Kumar", "Nagappan Alagappan", "Nancy Cai", + "Naresh N", "Nat Friedman", "Nathan Owens", + "Nguyễn Thái Ngọc Duy", "Nicel KM", "Nicholas J Kreucher", "Nicholas Miell", - "Nick Sukharev", "Nickolay V. Shmyrev", + "Nick Sukharev", "Nike Gerdts", + "Nikos Charonitakis", "Noel", "Nuno Ferreira", "Nyall Dawson", + "Og Maciel", + "Ole Laursen", "Ondrej Jirman", "Oswald Rodrigues", "Owen Taylor", - "Oystein Gisnas", - "P S Chakravarthi", + "Øystein Gisnås", "Pablo Gonzalo del Campo", "Pablo Saratxaga", "Pamplona Hackers", + "Pauli Virtanen", + "Paolo Borelli", "Paolo Molaro", "Parag Goel", "Parthasarathi Susarla", "Pascal Terjan", "Patrick Ohly", "Paul Bolle", + "Paul Duffy", + "Paul Iadonisi", "Paul Lindner", + "Paul Smith", + "Paulo Gomes Vanzuita", + "Pavel Cholakov", "Pavel Cisler", "Pavel Roskin", "Pavithran", "Pawan Chitrakar", "Pedro Villavicencio", + "Pema Geyleg", + "Peteris Krisjanis", + "Peter Bach", "Peter Pouliot", "Peter Teichman", "Peter Williams", - "Peteris Krisjanis", + "Petr Kovar", "Petta Pietikainen", "Phil Goembel", + "Philipp Kerling", "Philip Van Hoof", + "Philip Withnall", "Philip Zhao", "Poornima Nayak", + "Pramod", + "Prasad Kandepu", "Pratik V. Parikh", + "Praveen Arimbrathodiyil", "Praveen Kumar", "Priit Laes", "Priyanshu Raj", - "Radek Doul\xC3\xADk", + "P S Chakravarthi", + "Radek Doulik", "Raghavendran R", + "Rahul Bhalerao", + "Raivis Dejus", "Raja R Harinath", "Rajeev Ramanathan", "Rajesh Ranjan", "Rakesh k.g", "Ramiro Estrugo", "Ranjan Somani", + "Raphael Higino", "Ray Strode", + "Reinout van Schouwen", "Rhys Jones", "Ricardo Markiewicz", "Richard Boulton", "Richard Hult", "Richard Li", "Rob Bradford", + "Robert-André Mauchin", "Robert Brady", "Robert Sedak", "Robin Slomkowski", "Rodney Dawes", "Rodrigo Moya", + "Roger Zauner", "Rohini S", "Roland Illig", "Ronald Kuetemeier", "Roozbeh Pournader", + "Roshan Kumar Singh", "Ross Burton", + "Rostislav Raykov", "Rouslan Solomakhin", + "Roy-Magne Mo", "Runa Bhattacharjee", "Russell Steinthal", + "Russian team", "Rusty Conover", "Ryan P. Skadberg", - "S Antony Vincent Pandian", - "S N Tejasvi", - "S. \xC3\x87" "a\xC4\x9F" "lar Onur", "Sam Creasey", + "Sami Pesonen", + "Samúel Jón Gunnarsson", "Sam Yang", - "Sam\xC3\xBA" "el J\xC3\xB3" "n Gunnarsson", "Sankar P", "Sanlig Badral", "Sanshao Jiang", + "S.Antony Vincent Pandian", "Sarfraaz Ahmed", + "Satoru SATOH", "Sayamindu Dasgupta", + "S. Caglar Onur", "Sean Atkinson", + "Seán de Búrca", "Sean Gao", "Sebastian Rittau", "Sebastian Wilhelmi", "Sebastien Bacher", "Sergey Panov", + "Sergio Villar Senín", "Seth Alves", "Seth Nickell", "Shakti Sen", + "Shankar Prasad", "Shi Pu", "Shilpa C", "Shree Krishnan", "Shreyas Srinivasan", + "Shuai Liu", + "Sigurd Gartmann", "Simon Zheng", "Simos Xenitellis", + "Sitic Vulnerability Advisory", "Sivaiah Nallagatla", + "Slobodan D. Sredojevic", + "S N Tejasvi", + "Spiros Papadimitriou", "Srinivasa Ragavan", "Stanislav Brabec", + "Stanislav Slusny", "Stanislav Visnovsky", "Stéphane Raimbault", "Stephen Cook", "Steve Murphy", "Steven Zhang", "Stuart Parmenter", + "Subhransu Behera", "Subodh Soni", "Suman Manjunath", "Sunil Mohan Adapa", + "Supranee Thirawatthanasuk", "Suresh Chandrasekharan", "Sushma Rai", "Sven Herzberg", + "Sweta Kothari", "Szabolcs Ban", - "T\xC3\xB5" "ivo Leedj\xC3\xA4" "rv", "Takao Fujiwara", "Takayuki Kusano", "Takeshi Aihana", + "Takuo Kitame", "Tambet Ingo", "Taylor Hayward", "Ted Percival", + "Telsa Gwynne", + "Terance Sola", "Theppitak Karoonboonyanan", + "Thierry Moisan", + "Thierry Randrianiriana", "Thomas Cataldo", "Thomas Klausner", "Thomas Mirlacher", "Thouis R. Jones", + "Tiago Antao", + "Timo Jyrinki", + "Timur Bakeyev", "Tim Wo", "Tim Yamin", "Timo Hoenig", @@ -656,52 +852,69 @@ static const char *authors[] = { "Tõivo Leedjärv", "Tom Tromey", "Tomas Ogren", - "Tomasz K\xC5\x82" "oczko", + "Tomasz Kłoczko", "Tomislav Vujec", "Tommi Komulainen", "Tommi Vainikainen", "Tony Tsui", "Tor Lillqvist", "Trent Lloyd", + "Tristan Tarrant", "Tuomas J. Lukka", "Tuomas Kuosmanen", + "Udomsak Chundang", "Ulrich Neumann", - "Umesh Tiwari", "Umeshtej", + "Umesh Tiwari", "Ushveen Kaur", - "V Ravi Kumar Raju", "Vadim Strizhevsky", "Valek Filippov", "Vandana Shenoy .B", "Vardhman Jain", + "Vasiliy Faronov", "Veerapuram Varadhan", + "Vincent Carriere", "Vincent Noel", + "Vincent Renardias", + "Vincent Untz", "Vincent van Adrighem", - "Viren", + "Viren.L", "Vivek Jain", "Vladimer Sichinava", + "Vladimir Petkov", "Vladimir Vukicevic", + "Vladimir Melo", + "V Ravi Kumar Raju", "Wadim Dziedzic", "Wang Jian", + "Wang Li", "Wang Xin", + "Washington Lins", "Wayne Davis", "William Jon McCann", + "Woodman Tuen", "Wouter Bolsterlee", "Xan Lopez", + "Xavier Conde Rueda", "Xiurong Simon Zheng", + "Yair Hershkovitz", "Yanko Kaneti", + "Yannig Marchegay", + "Yavor Doganov", "Yi Jin", "Yong Sun", - "Yu Mengjie", "Yuedong Du", "Yukihiro Nakai", + "Yu Mengjie", "Yuri Pankov", "Yuri Syrota", + "Yuriy Penkin", "Zach Frey", "Zan Lynx", "Zbigniew Chyla", - "\xC3\x98ystein Gisn\xC3\xA5s", - "\xC5\xBDygimantas Beru\xC4\x8Dka", + "Zhe Su", + "Zipeco", + "Žygimantas Beručka", NULL }; -- cgit v1.2.3 From 79d878670a311644f188f671cbc4e60193100558 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 16 Sep 2008 10:52:29 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36344 --- shell/ChangeLog | 6 ++++++ shell/test/evolution-test-component.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 9492fcc002..271b8dd64e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-09-16 Sankar P + +License Changes + + * test/evolution-test-component.c: + 2008-09-15 Bharath Acharya Updated the list of Contributors. diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 6e437e55f4..0226ed74db 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* tasks-component.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: JP Rosevear + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From f9f3b671620286dac01b80d28ad2c47aa700b054 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 19 Sep 2008 06:02:55 +0000 Subject: Change license from GPL to LGPL svn path=/trunk/; revision=36381 --- shell/ChangeLog | 6 ++++++ shell/e-sidebar.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 271b8dd64e..983da3282d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Sankar P + +License Changes + + * e-sidebar.c: + 2008-09-16 Sankar P License Changes diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index bd822b25da..5771e07dd1 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-sidebar.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From 2ecb4c7dc0ac2ba4f900325ef7809dead96ba7c3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 24 Sep 2008 06:28:25 +0000 Subject: ** Fixes bug #553479 2008-09-24 Philip Withnall ** Fixes bug #553479 * shell/shell.error.xml: * plugins/webdav-account-setup/webdav-contacts-source.c (plugin_webdav_contacts): * plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml: * plugins/python/org-gnome-evolution-python.eplug.xml: * plugins/google-account-setup/org-gnome-evolution-google.eplug.xml: * plugins/audio-inline/org-gnome-audio-inline.eplug.xml: * mail/em-migrate.c (migrate_to_db): * mail/evolution-mail.schemas.in: * addressbook/gui/component/ldap-config.glade: String capitalisation improvements. svn path=/trunk/; revision=36439 --- shell/ChangeLog | 6 ++++++ shell/shell.error.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 983da3282d..1f24072ebb 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Philip Withnall + + ** Fixes bug #553479 + + * shell.error.xml: String capitalisation improvements. + 2008-09-19 Sankar P License Changes diff --git a/shell/shell.error.xml b/shell/shell.error.xml index 6f5364e026..e3b7a1a2ee 100644 --- a/shell/shell.error.xml +++ b/shell/shell.error.xml @@ -29,7 +29,7 @@ If you choose to continue, you may not have access to some of your old data. Delete old data from version {0}? <_primary>Delete old data from version {0}? - <_secondary xml:space="preserve">The previous version of evolution stored its data in a different location. + <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location. If you choose to remove this data, the entire contents of the "evolution" directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of "evolution" at your convenience. -- cgit v1.2.3 From 044925165fcc12e33d7c67df79021679aefb5dc4 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 24 Sep 2008 09:12:38 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36440 --- shell/ChangeLog | 6 ++++++ shell/e-shell-view.c | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 1f24072ebb..5b5c6a7686 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Sankar P + +License Changes + + * e-shell-view.c: + 2008-09-24 Philip Withnall ** Fixes bug #553479 diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index a71c3f3ab3..022e7ecca1 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1,25 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - * e-shell-view.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author(s): Michael Zucchi +/* + * Helper class for evolution shells to setup a view * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Helper class for evolution shells to setup a view */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From 762ac32d75dc9ad72e66969afda09766592fd42f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 24 Sep 2008 11:02:48 +0000 Subject: Change License from GPL to LGPL svn path=/trunk/; revision=36443 --- shell/ChangeLog | 7 +++++++ shell/e-shell-window-commands.c | 26 +++++++++++++------------- shell/e-user-creatable-items-handler.c | 26 +++++++++++++------------- 3 files changed, 33 insertions(+), 26 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 5b5c6a7686..ff79f4ce45 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,12 @@ 2008-09-24 Sankar P +License Changes + + * e-shell-window-commands.c: + * e-user-creatable-items-handler.c: + +2008-09-24 Sankar P + License Changes * e-shell-view.c: diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 41db2bd456..a6901d0865 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-window-commands.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 24ba4acd39..e532382f2d 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-user-creatable-items-handler.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From abab01f303e07d5ee0101c3bfa3eda2e90ab62fb Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 29 Sep 2008 10:35:21 +0000 Subject: Mark some forgotten strings for translation. Fixes bug #553106 2008-09-29 Gabor Kelemen * shell.error.xml: Mark some forgotten strings for translation. Fixes bug #553106 svn path=/trunk/; revision=36477 --- shell/ChangeLog | 4 ++++ shell/shell.error.xml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ff79f4ce45..205fdafbc9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2008-09-29 Gabor Kelemen + + * shell.error.xml: Mark some forgotten strings for translation. Fixes bug #553106 + 2008-09-24 Sankar P License Changes diff --git a/shell/shell.error.xml b/shell/shell.error.xml index e3b7a1a2ee..fceb1bef83 100644 --- a/shell/shell.error.xml +++ b/shell/shell.error.xml @@ -27,7 +27,7 @@ If you choose to continue, you may not have access to some of your old data. - Delete old data from version {0}? + <_title>Delete old data from version {0}? <_primary>Delete old data from version {0}? <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location. @@ -39,7 +39,7 @@ If you choose to remove this data, the entire contents of the "evolution&qu - Really delete old data? + <_title>Really delete old data? <_primary>Really delete old data? <_secondary xml:space="preserve">The entire contents of the "evolution" directory are about to be permanently removed. @@ -52,7 +52,7 @@ Once deleted, you cannot downgrade to the previous version of Evolution without - Cannot start Evolution + <_title>Cannot start Evolution <_primary>Evolution can not start. <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration. @@ -62,7 +62,7 @@ Click help for details - Cannot start Evolution + <_title>Cannot start Evolution <_primary>Evolution can not start. <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration: -- cgit v1.2.3 From 4f54605380d48576108c0232e1295a2dad864d25 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 29 Sep 2008 11:32:45 +0000 Subject: Unbreak build, sorry for the inconvenience. 2008-09-29 Gabor Kelemen * shell.error.xml: Unbreak build, sorry for the inconvenience. svn path=/trunk/; revision=36482 --- shell/ChangeLog | 4 ++++ shell/shell.error.xml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 205fdafbc9..350b7c169b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2008-09-29 Gabor Kelemen + + * shell.error.xml: Unbreak build, sorry for the inconvenience. + 2008-09-29 Gabor Kelemen * shell.error.xml: Mark some forgotten strings for translation. Fixes bug #553106 diff --git a/shell/shell.error.xml b/shell/shell.error.xml index fceb1bef83..7ae57dec58 100644 --- a/shell/shell.error.xml +++ b/shell/shell.error.xml @@ -27,7 +27,7 @@ If you choose to continue, you may not have access to some of your old data. - <_title>Delete old data from version {0}? + <_title>Delete old data from version {0}? <_primary>Delete old data from version {0}? <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location. @@ -39,7 +39,7 @@ If you choose to remove this data, the entire contents of the "evolution&qu - <_title>Really delete old data? + <_title>Really delete old data? <_primary>Really delete old data? <_secondary xml:space="preserve">The entire contents of the "evolution" directory are about to be permanently removed. @@ -52,7 +52,7 @@ Once deleted, you cannot downgrade to the previous version of Evolution without - <_title>Cannot start Evolution + <_title>Cannot start Evolution <_primary>Evolution can not start. <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration. @@ -62,7 +62,7 @@ Click help for details - <_title>Cannot start Evolution + <_title>Cannot start Evolution <_primary>Evolution can not start. <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration: -- cgit v1.2.3 From 1f8187e8da5ebfc67730e3f9a82487a0a44239fb Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 30 Sep 2008 15:19:23 +0000 Subject: Change License from GPL to LGPL. svn path=/trunk/; revision=36502 --- shell/ChangeLog | 7 +++++++ shell/e-shell.c | 26 +++++++++++++------------- shell/main.c | 26 +++++++++++++------------- 3 files changed, 33 insertions(+), 26 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 350b7c169b..ad724371c3 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-09-30 Sankar P + +License Changes + + * e-shell.c: + * main.c: + 2008-09-29 Gabor Kelemen * shell.error.xml: Unbreak build, sorry for the inconvenience. diff --git a/shell/e-shell.c b/shell/e-shell.c index f48978dfd5..df1aeaece7 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Author: Ettore Perazzoli */ #include diff --git a/shell/main.c b/shell/main.c index 4d71e902d7..86a02f7471 100644 --- a/shell/main.c +++ b/shell/main.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* main.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 From 2e984bf77acd74c543315efe58d1890f0c8f8ef3 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 3 Oct 2008 09:48:36 +0000 Subject: Change License from GPL to LGPL. svn path=/trunk/; revision=36541 --- shell/ChangeLog | 6 ++++++ shell/e-shell-window.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ad724371c3..a090d3d1d2 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Sankar P + +License Changes + + * e-shell-window.c: + 2008-09-30 Sankar P License Changes diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 81de5627ce..f857390070 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-window.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From 5ce1bbbbc83a42532b43788839321f2fac831dd1 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Fri, 17 Oct 2008 05:18:16 +0000 Subject: Matthew Barnes ** Fix for bug #548469 (Drop support for deprecated libnm-glib). svn path=/trunk/; revision=36631 --- shell/ChangeLog | 16 ++++++++ shell/Makefile.am | 4 -- shell/e-shell-nm-glib.c | 89 ----------------------------------------- shell/e-shell-nm.c | 56 +++++++++----------------- shell/e-shell-window-commands.c | 10 ++++- shell/e-shell-window.c | 25 +++++------- shell/e-shell.c | 50 ++++------------------- shell/e-shell.h | 6 +-- 8 files changed, 61 insertions(+), 195 deletions(-) delete mode 100644 shell/e-shell-nm-glib.c (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index a090d3d1d2..8180185fa5 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,19 @@ +2008-10-17 Matthew Barnes + + ** Fix for bug #548469 + + * Makefile.am: + * e-shell-nm-glib.c: + * e-shell-nm.c (reinit_dbus), (e_shell_network_monitor), + (e_shell_dbus_initialise): + * e-shell-window-commands.c (command_work_offline), + (command_work_online): + * e-shell-window.c (offline_toggle_clicked_cb), (impl_dispose): + * e-shell.c (impl_Shell_setLineStatus), (e_shell_construct), + (e_shell_set_line_status): + * e-shell.h: + Drop support for deprecated libnm-glib. + 2008-10-03 Sankar P License Changes diff --git a/shell/Makefile.am b/shell/Makefile.am index 9654dbf814..7ffdc303f5 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -51,13 +51,9 @@ $(IDL_GENERATED_H): $(IDLS) $(IDL_GENERATED_C): $(IDL_GENERATED_H) -if NM_SUPPORT_GLIB -NM_SUPPORT_FILES = e-shell-nm-glib.c -else if NM_SUPPORT NM_SUPPORT_FILES = e-shell-nm.c endif -endif # Data Server CORBA stuff DATASERVER_IDL_GENERATED_H = \ diff --git a/shell/e-shell-nm-glib.c b/shell/e-shell-nm-glib.c deleted file mode 100644 index 458d87af8e..0000000000 --- a/shell/e-shell-nm-glib.c +++ /dev/null @@ -1,89 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * 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 - * - * - * Authors: - * Shreyas Srinivasan - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -static libnm_glib_ctx *nm_ctx = NULL; -static guint id = 0; - -static void -e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) -{ - libnm_glib_state state; - EShellLineStatus line_status; - EShellWindow *window = E_SHELL_WINDOW (user_data); - EShell *shell = e_shell_window_peek_shell (window); - GNOME_Evolution_ShellState shell_state; - - g_return_if_fail (ctx != NULL); - - state = libnm_glib_get_network_state (ctx); - line_status = e_shell_get_line_status (shell); - - if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); - } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); - } -} - -gboolean e_shell_nm_glib_initialise (EShellWindow *window); -void e_shell_nm_glib_dispose (EShellWindow *window); - -gboolean -e_shell_nm_glib_initialise (EShellWindow *window) -{ - if (!nm_ctx) { - nm_ctx = libnm_glib_init (); - if (!nm_ctx) { - fprintf (stderr, "Could not initialize libnm.\n"); - return FALSE; - } - } - - id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL); - - return TRUE; -} - -void -e_shell_nm_glib_dispose (EShellWindow *window) -{ - if (id != 0 && nm_ctx != NULL) { - libnm_glib_unregister_callback (nm_ctx, id); - libnm_glib_shutdown (nm_ctx); - nm_ctx = NULL; - id = 0; - } -} diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index 58923831e4..ef3c10eb9d 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,14 +41,16 @@ typedef enum _ShellLineStatus { E_SHELL_LINE_UP } ShellLineStatus; -static gboolean init_dbus (EShellWindow *window); +gboolean e_shell_dbus_initialise (EShell *shell); static DBusConnection *dbus_connection = NULL; static gboolean reinit_dbus (gpointer user_data) { - if (init_dbus (user_data)) + EShell *shell = user_data; + + if (e_shell_dbus_initialise (shell)) return FALSE; /* keep trying to re-establish dbus connection */ @@ -60,21 +62,13 @@ static DBusHandlerResult e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *user_data) { - DBusError error; const char *object; ShellLineStatus status; - EShellWindow *window = NULL; - EShell *shell = NULL; + EShell *shell = user_data; GNOME_Evolution_ShellState shell_state; EShellLineStatus line_status; + DBusError error = DBUS_ERROR_INIT; - if (!user_data || !E_IS_SHELL_WINDOW (user_data)) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - window = E_SHELL_WINDOW (user_data); - shell = e_shell_window_peek_shell (window); - - dbus_error_init (&error); object = dbus_message_get_path (message); if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") && @@ -82,7 +76,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, dbus_connection_unref (dbus_connection); dbus_connection = NULL; - g_timeout_add (3000, reinit_dbus, window); + g_timeout_add (3000, reinit_dbus, shell); return DBUS_HANDLER_RESULT_HANDLED; } @@ -102,26 +96,26 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); + e_shell_set_line_status (shell, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && status == E_SHELL_LINE_UP) { shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); + e_shell_set_line_status (shell, shell_state); } return DBUS_HANDLER_RESULT_HANDLED; } -static gboolean -init_dbus (EShellWindow *window) +gboolean +e_shell_dbus_initialise (EShell *shell) { - DBusError error; + DBusError error = DBUS_ERROR_INIT; if (dbus_connection != NULL) return TRUE; - dbus_error_init (&error); - if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) { - g_warning ("could not get system bus: %s\n", error.message); + dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + if (dbus_connection == NULL) { + g_warning ("%s", error.message); dbus_error_free (&error); return FALSE; } @@ -129,7 +123,7 @@ init_dbus (EShellWindow *window) dbus_connection_setup_with_g_main (dbus_connection, NULL); dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE); - if (!dbus_connection_add_filter (dbus_connection, e_shell_network_monitor, window, NULL)) + if (!dbus_connection_add_filter (dbus_connection, e_shell_network_monitor, shell, NULL)) goto exception; dbus_bus_add_match (dbus_connection, @@ -138,6 +132,7 @@ init_dbus (EShellWindow *window) "sender='" NM_DBUS_SERVICE "'," "path='" NM_DBUS_PATH "'", &error); if (dbus_error_is_set (&error)) { + g_warning ("%s", error.message); dbus_error_free (&error); goto exception; } @@ -151,18 +146,3 @@ exception: return FALSE; } - -gboolean -e_shell_dbus_initialise (EShellWindow *window) -{ - g_type_init (); - - return init_dbus (window); -} - -void -e_shell_dbus_dispose (EShellWindow *window) -{ - //FIXME - return; -} diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index a6901d0865..0e4b9940ee 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -1024,7 +1024,10 @@ command_work_offline (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - e_shell_go_offline (e_shell_window_peek_shell (window), window, GNOME_Evolution_USER_OFFLINE); + EShell *shell; + + shell = e_shell_window_peek_shell (window); + e_shell_set_line_status (shell, GNOME_Evolution_USER_OFFLINE); } static void @@ -1032,7 +1035,10 @@ command_work_online (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - e_shell_go_online (e_shell_window_peek_shell (window), window, GNOME_Evolution_USER_ONLINE); + EShell *shell; + + shell = e_shell_window_peek_shell (window); + e_shell_set_line_status (shell, GNOME_Evolution_USER_ONLINE); } static void diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index f857390070..f2eb6bf86d 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -53,12 +53,8 @@ #include -#ifdef NM_SUPPORT_GLIB -gboolean e_shell_nm_glib_initialise (EShellWindow *window); -void e_shell_nm_glib_dispose (EShellWindow *window); -#elif NM_SUPPORT +#if NM_SUPPORT gboolean e_shell_dbus_initialise (EShellWindow *window); -void e_shell_dbus_dispose (EShellWindow *window); #endif /* A view for each component. These are all created when EShellWindow is @@ -477,19 +473,24 @@ sidebar_button_pressed_callback (ESidebar *sidebar, static void offline_toggle_clicked_cb (EShellWindow *window) { - EShellWindowPrivate *priv = window->priv; + EShell *shell; + GNOME_Evolution_ShellState shell_state; - switch (e_shell_get_line_status (priv->shell.eshell)) { + shell = window->priv->shell.eshell; + + switch (e_shell_get_line_status (shell)) { case E_SHELL_LINE_STATUS_ONLINE: - e_shell_go_offline (priv->shell.eshell, window, GNOME_Evolution_USER_OFFLINE); + shell_state = GNOME_Evolution_USER_OFFLINE; break; case E_SHELL_LINE_STATUS_OFFLINE: case E_SHELL_LINE_STATUS_FORCED_OFFLINE: - e_shell_go_online (priv->shell.eshell, window, GNOME_Evolution_USER_ONLINE); + shell_state = GNOME_Evolution_USER_ONLINE; break; default: g_return_if_reached(); } + + e_shell_set_line_status (shell, shell_state); } static void @@ -853,12 +854,6 @@ impl_dispose (GObject *object) store_window_size (GTK_WIDGET (self)); } - #ifdef NM_SUPPORT_GLIB - e_shell_nm_glib_dispose (E_SHELL_WINDOW (object)); - #elif NM_SUPPORT - e_shell_dbus_dispose (E_SHELL_WINDOW (object)); - #endif - (* G_OBJECT_CLASS (e_shell_window_parent_class)->dispose) (object); } diff --git a/shell/e-shell.c b/shell/e-shell.c index df1aeaece7..aeb6b79112 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -316,9 +316,9 @@ impl_Shell_setLineStatus (PortableServer_Servant servant, e_passwords_set_online(online); if (online) - e_shell_go_online (shell, NULL, GNOME_Evolution_USER_ONLINE); + e_shell_set_line_status (shell, GNOME_Evolution_USER_ONLINE); else - e_shell_go_offline (shell, NULL, GNOME_Evolution_USER_OFFLINE); + e_shell_set_line_status (shell, GNOME_Evolution_USER_OFFLINE); } /* static GNOME_Evolution_Component @@ -716,9 +716,9 @@ e_shell_construct (EShell *shell, e_passwords_set_online(start_online); if (start_online) - e_shell_go_online (shell, NULL, GNOME_Evolution_USER_ONLINE); + e_shell_set_line_status (shell, GNOME_Evolution_USER_ONLINE); else - e_shell_go_online (shell, NULL, GNOME_Evolution_USER_OFFLINE); + e_shell_set_line_status (shell, GNOME_Evolution_USER_OFFLINE); return E_SHELL_CONSTRUCT_RESULT_OK; } @@ -1125,8 +1125,9 @@ set_line_status_complete(EvolutionListener *el, void *data) } } -static void -set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state) +void +e_shell_set_line_status (EShell *shell, + GNOME_Evolution_ShellState shell_state) { EShellPrivate *priv; GSList *component_infos; @@ -1180,43 +1181,6 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state) set_line_status_finished(shell); } -/** - * e_shell_go_offline: - * @shell: - * @action_window: Obsolete/unused. - * - * Make the shell go into off-line mode. - **/ -void -e_shell_go_offline (EShell *shell, - EShellWindow *action_window, GNOME_Evolution_ShellState shell_state) -{ - g_return_if_fail (shell != NULL); - g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (action_window != NULL); - g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window)); - - set_line_status(shell, shell_state); -} - -/** - * e_shell_go_online: - * @shell: - * @action_window: Obsolete/unused. - * - * Make the shell go into on-line mode. - **/ -void -e_shell_go_online (EShell *shell, - EShellWindow *action_window, GNOME_Evolution_ShellState shell_state) -{ - g_return_if_fail (shell != NULL); - g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window)); - - set_line_status(shell, shell_state); -} - gboolean e_shell_get_crash_recovery (EShell *shell) { diff --git a/shell/e-shell.h b/shell/e-shell.h index 9a36594042..ab16ea819e 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -119,10 +119,8 @@ gboolean e_shell_save_settings (EShell *shell); void e_shell_close_all_windows (EShell *shell); EShellLineStatus e_shell_get_line_status (EShell *shell); -void e_shell_go_offline (EShell *shell, - EShellWindow *action_window, GNOME_Evolution_ShellState shell_state); -void e_shell_go_online (EShell *shell, - EShellWindow *action_window, GNOME_Evolution_ShellState shell_state); +void e_shell_set_line_status (EShell *shell, + GNOME_Evolution_ShellState shell_state); gboolean e_shell_get_crash_recovery (EShell *shell); void e_shell_set_crash_recovery (EShell *shell, -- cgit v1.2.3 From 2df699c7fa7f4b38c32fa6e7db34b10b568c61e0 Mon Sep 17 00:00:00 2001 From: Kandepu Prasad Date: Fri, 17 Oct 2008 07:22:20 +0000 Subject: ** Fix for bug #311479 2008-10-17 Kandepu Prasad ** Fix for bug #311479 * import.glade: * importer/import.glade: rephrasing the heading in Evolution Import Assistant svn path=/trunk/; revision=36634 --- shell/ChangeLog | 8 ++++++++ shell/import.glade | 2 +- shell/importer/import.glade | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 8180185fa5..4ea93c997e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2008-10-17 Kandepu Prasad + + ** Fix for bug #311479 + + * import.glade: + * importer/import.glade: rephrasing the heading in Evolution Import + Assistant + 2008-10-17 Matthew Barnes ** Fix for bug #548469 diff --git a/shell/import.glade b/shell/import.glade index 813f2e90f1..389d2feee3 100644 --- a/shell/import.glade +++ b/shell/import.glade @@ -92,7 +92,7 @@ importing external files into Evolution. True - Select Importers + Select Information to Import diff --git a/shell/importer/import.glade b/shell/importer/import.glade index 813f2e90f1..389d2feee3 100644 --- a/shell/importer/import.glade +++ b/shell/importer/import.glade @@ -92,7 +92,7 @@ importing external files into Evolution. True - Select Importers + Select Information to Import -- cgit v1.2.3 From 585ed6226b62b7fe152557c81d8f8332de97be69 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Oct 2008 16:52:23 +0000 Subject: Only include the toplevel GTK+ header. 2008-10-30 Matthew Barnes * addressbook/gui/contact-editor/test-editor.c: * addressbook/gui/widgets/e-minicard-label.c: * addressbook/gui/widgets/e-minicard-view-widget.c: * addressbook/gui/widgets/test-reflow.c: * calendar/gui/control-factory.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-week-view-event-item.c: * calendar/gui/weekday-picker.c: * e-util/e-icon-factory.c: * shell/importer/evolution-importer-client.h: * shell/importer/intelligent.c: * shell/test/evolution-test-component.c: * widgets/menus/gal-view-menus.c: * widgets/misc/e-activity-handler.c: * widgets/table/e-table-config-field.h: Only include the toplevel GTK+ header. svn path=/trunk/; revision=36699 --- shell/ChangeLog | 7 +++++++ shell/importer/evolution-importer-client.h | 2 +- shell/importer/intelligent.c | 20 +------------------- shell/test/evolution-test-component.c | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 4ea93c997e..4ba417f5d8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-10-30 Matthew Barnes + + * importer/evolution-importer-client.h: + * importer/intelligent.c: + * test/evolution-test-component.c: + Only include the toplevel GTK+ header. + 2008-10-17 Kandepu Prasad ** Fix for bug #311479 diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 043a639c5d..35cde858d6 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -24,7 +24,7 @@ #define EVOLUTION_IMPORTER_CLIENT_H #include -#include +#include #include #include diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index a9a8fed024..c7cb6b3b0c 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -26,25 +26,7 @@ #include "intelligent.h" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include /*#include */ diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 0226ed74db..16aed882d0 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "e-task-bar.h" #include "evolution-test-component.h" -- cgit v1.2.3 From 39f06164edde0443b23baf6aea29edf5974ea868 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 17:11:10 +0000 Subject: ** Fixes bug #557581 2008-11-07 Matthew Barnes ** Fixes bug #557581 * configure.in: Break up the version definitions such that we can calculate the latest stable version and pass a STABLE_VERSION definition to shell/main.c. * shell/main.c: Replace DEVELOPMENT with STABLE_VERSION, which actually defines the latest stable version (e.g. 2.24). STABLE_VERSION is only defined if the current version is _unstable_ (e.g. 2.25). * shell/main.c (show_development_warning): Use STABLE_VERSION instead of hard-coding the version number. svn path=/trunk/; revision=36761 --- shell/ChangeLog | 12 ++++++++++++ shell/main.c | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 4ba417f5d8..307de5bf79 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2008-11-07 Matthew Barnes + + ** Fixes part of bug #557581 + + * main.c: + Replace DEVELOPMENT with STABLE_VERSION, which actually defines + the latest stable version (e.g. 2.24). STABLE_VERSION is only + defined if the current version is _unstable_ (e.g. 2.25). + + * main.c (show_development_warning): + Use STABLE_VERSION instead of hard-coding the version number. + 2008-10-30 Matthew Barnes * importer/evolution-importer-client.h: diff --git a/shell/main.c b/shell/main.c index 86a02f7471..116f5a1fd3 100644 --- a/shell/main.c +++ b/shell/main.c @@ -88,6 +88,11 @@ #define SKIP_WARNING_DIALOG_KEY \ "/apps/evolution/shell/skip_warning_dialog" +/* STABLE_VERSION is only defined for development versions. */ +#ifdef STABLE_VERSION +#define DEVELOPMENT 1 +#endif + static EShell *shell = NULL; /* Command-line options. */ @@ -95,7 +100,7 @@ static gboolean start_online = FALSE; static gboolean start_offline = FALSE; static gboolean setup_only = FALSE; static gboolean killev = FALSE; -#if DEVELOPMENT +#ifdef DEVELOPMENT static gboolean force_migrate = FALSE; #endif static gboolean disable_eplugin = FALSE; @@ -181,7 +186,7 @@ kill_old_dataserver (void) #endif -#if DEVELOPMENT +#ifdef DEVELOPMENT /* Warning dialog to scare people off a little bit. */ @@ -229,7 +234,7 @@ show_development_warning(void) "\n" "We hope that you enjoy the results of our hard work, and we\n" "eagerly await your contributions!\n"), - "2.22.1"); + STABLE_VERSION); label = gtk_label_new (text); g_free(text); @@ -475,7 +480,7 @@ static const GOptionEntry options[] = { { "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev, N_("Forcibly shut down all Evolution components"), NULL }, #endif -#if DEVELOPMENT +#ifdef DEVELOPMENT { "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, N_("Forcibly re-migrate from Evolution 1.4"), NULL }, #endif @@ -554,7 +559,7 @@ main (int argc, char **argv) #endif GConfClient *client; -#if DEVELOPMENT +#ifdef DEVELOPMENT gboolean skip_warning_dialog; #endif GnomeProgram *program; @@ -613,7 +618,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); -#if DEVELOPMENT +#ifdef DEVELOPMENT if (force_migrate) { destroy_config (client); @@ -670,7 +675,7 @@ main (int argc, char **argv) e_plugin_load_plugins(); } -#if DEVELOPMENT +#ifdef DEVELOPMENT skip_warning_dialog = gconf_client_get_bool ( client, SKIP_WARNING_DIALOG_KEY, NULL); -- cgit v1.2.3 From cd622d600ec180de75830913f7284d8d66370493 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 8 Dec 2008 08:09:01 +0000 Subject: Jeff Cai ** Fix for bug #563077 (Don't pass NULL to gtk_icon_info_get_filename(), fixes a crash if the gnome-settings-daemon is not running). svn path=/trunk/; revision=36844 --- shell/ChangeLog | 10 ++++++++++ shell/e-shell-window.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 307de5bf79..ef89b297a9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2008-12-08 Jeff Cai + + ** Fix for bug #563077 + + * e-shell-window.c (setup_widgets): Don't pass NULL to + gtk_icon_info_get_filename(). + + Fixes a crash if the gnome-settings-daemon is not running. + Observed on SUN Solaris. + 2008-11-07 Matthew Barnes ** Fixes part of bug #557581 diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index f2eb6bf86d..c533967c77 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -796,7 +796,7 @@ setup_widgets (EShellWindow *window) info->icon_name, width, 0); g_string_append_printf(xml, "\" pixtype=\"filename\" pixname=\"%s\"/>" "\n", - gtk_icon_info_get_filename (icon_info)); + icon_info ? gtk_icon_info_get_filename (icon_info) : ""); gtk_icon_info_free (icon_info); bonobo_ui_component_set_translate (e_shell_window_peek_bonobo_ui_component (window), "/menu", -- cgit v1.2.3 From f9987008ded88dd073458bbf3d80417e032c5e3b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Dec 2008 11:55:08 +0000 Subject: ** Fixes bug #563250 2008-12-10 Matthew Barnes ** Fixes bug #563250 * e-util/e-util.c (e_get_accels_filename): New function returns the filename where custom keyboard accelerators are stored. Currently only applies to the various editor windows in Evolution. * shell/main.c (main): Load on startup and save on shutdown, custom keyboard accelerators. svn path=/trunk/; revision=36864 --- shell/ChangeLog | 7 +++++++ shell/main.c | 3 +++ 2 files changed, 10 insertions(+) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ef89b297a9..05f0b2399c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-12-10 Matthew Barnes + + ** Fixes part of bug #563250 + + * main.c (main): + Load on startup and save on shutdown, custom keyboard accelerators. + 2008-12-08 Jeff Cai ** Fix for bug #563077 diff --git a/shell/main.c b/shell/main.c index 116f5a1fd3..81155975bc 100644 --- a/shell/main.c +++ b/shell/main.c @@ -661,6 +661,7 @@ main (int argc, char **argv) exit (0); gnome_sound_init ("localhost"); + gtk_accel_map_load (e_get_accels_filename ()); if (!disable_eplugin) { e_plugin_register_type(e_plugin_lib_get_type()); @@ -693,6 +694,8 @@ main (int argc, char **argv) bonobo_main (); + gtk_accel_map_save (e_get_accels_filename ()); + e_icon_factory_shutdown (); g_object_unref (program); gnome_sound_shutdown (); -- cgit v1.2.3 From 04531b1c0f924fc78e2754f539889070818343fb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Dec 2008 04:51:33 +0000 Subject: ** Fixes bug #564416 2008-12-14 Matthew Barnes ** Fixes bug #564416 * shell/e-shell-nm.c: We've been listening for obsolete D-Bus signals. Update to NetworkManager's current D-Bus API. svn path=/trunk/; revision=36878 --- shell/ChangeLog | 8 ++++++++ shell/e-shell-nm.c | 27 ++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 05f0b2399c..ade04fca4e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2008-12-14 Matthew Barnes + + ** Fixes bug #564416 + + * e-shell-nm.c: + We've been listening for obsolete D-Bus signals. + Update to NetworkManager's current D-Bus API. + 2008-12-10 Matthew Barnes ** Fixes part of bug #563250 diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index ef3c10eb9d..e1d962fe89 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -36,11 +36,6 @@ #include #include -typedef enum _ShellLineStatus { - E_SHELL_LINE_DOWN, - E_SHELL_LINE_UP -} ShellLineStatus; - gboolean e_shell_dbus_initialise (EShell *shell); static DBusConnection *dbus_connection = NULL; @@ -63,11 +58,11 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *user_data) { const char *object; - ShellLineStatus status; EShell *shell = user_data; GNOME_Evolution_ShellState shell_state; EShellLineStatus line_status; DBusError error = DBUS_ERROR_INIT; + guint32 state; object = dbus_message_get_path (message); @@ -81,23 +76,25 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, return DBUS_HANDLER_RESULT_HANDLED; } - if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) - status = E_SHELL_LINE_DOWN; - else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) - status = E_SHELL_LINE_UP; - else + if (!dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged")) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (!dbus_message_get_args (message, &error, DBUS_TYPE_OBJECT_PATH, - &object, DBUS_TYPE_INVALID)) + dbus_message_get_args ( + message, &error, + DBUS_TYPE_UINT32, &state, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set (&error)) { + g_warning ("%s", error.message); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } line_status = e_shell_get_line_status (shell); - if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { + if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == NM_STATE_DISCONNECTED) { shell_state = GNOME_Evolution_FORCED_OFFLINE; e_shell_set_line_status (shell, shell_state); - } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && status == E_SHELL_LINE_UP) { + } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == NM_STATE_CONNECTED) { shell_state = GNOME_Evolution_USER_ONLINE; e_shell_set_line_status (shell, shell_state); } -- cgit v1.2.3 From 657b235cc2fec97f3ba361238478f1eeeaf903b6 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Thu, 25 Dec 2008 19:45:12 +0000 Subject: Fix memory leak. (Fixes bug #565628). 2008-12-25 Ignacio Casal Quinteiro * shell/main.c: Fix memory leak. (Fixes bug #565628). svn path=/trunk/; revision=36932 --- shell/main.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'shell') diff --git a/shell/main.c b/shell/main.c index 81155975bc..3e1176e92a 100644 --- a/shell/main.c +++ b/shell/main.c @@ -537,6 +537,8 @@ set_paths (void) g_warning ("Could not set PATH for Evolution and its child processes"); g_free (path); + g_free (exe_folder_utf8); + g_free (components_folder_utf8); /* Set BONOBO_ACTIVATION_PATH */ if (g_getenv ("BONOBO_ACTIVATION_PATH" ) == NULL) { -- cgit v1.2.3 From c51b91d1e34f5e731bc2f1c9e2fd203f2bdf18f5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 28 Dec 2008 14:47:11 +0000 Subject: ** Related to bug #562155 2008-12-28 Matthew Barnes ** Related to bug #562155 * shell/main.c (idle_cb): Only call e_shell_set_crash_recovery() if the EShell Bonobo object was constructed successfully, otherwise it will be NULL. This fixes a warning shown in the terminal output of bug #562155, but the bug is not reproducible so it's not clear whether this fixes the bug. svn path=/trunk/; revision=36939 --- shell/ChangeLog | 10 ++++++++++ shell/main.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ade04fca4e..ff947e9229 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2008-12-28 Matthew Barnes + + ** Related to bug #562155 + + * main.c (idle_cb): + Only call e_shell_set_crash_recovery() if the EShell Bonobo object + was constructed successfully, otherwise it will be NULL. This fixes + a warning shown in the terminal output of bug #562155, but the bug + is not reproducible so it's not clear whether this fixes the bug. + 2008-12-14 Matthew Barnes ** Fixes bug #564416 diff --git a/shell/main.c b/shell/main.c index 3e1176e92a..1638de0788 100644 --- a/shell/main.c +++ b/shell/main.c @@ -335,10 +335,10 @@ idle_cb (gchar **uris) startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE; shell = e_shell_new (startup_line_mode, &result); - e_shell_set_crash_recovery (shell, e_file_lock_exists ()); switch (result) { case E_SHELL_CONSTRUCT_RESULT_OK: + e_shell_set_crash_recovery (shell, e_file_lock_exists ()); g_signal_connect (shell, "no_windows_left", G_CALLBACK (no_windows_left_cb), NULL); g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL); corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell)); -- cgit v1.2.3 From 2cf5be809d44bc9b7ec1582225affede78257bec Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Thu, 1 Jan 2009 22:08:42 +0000 Subject: update Copyright to 2009. 2009-01-01 Andre Klapper * e-shell-window-commands.c: update Copyright to 2009. svn path=/trunk/; revision=36960 --- shell/ChangeLog | 5 +++++ shell/e-shell-window-commands.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ff947e9229..0c73582af6 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2009-01-01 Andre Klapper + + * e-shell-window-commands.c: + update Copyright to 2009. + 2008-12-28 Matthew Barnes ** Related to bug #562155 diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 0e4b9940ee..65273f8ad3 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -52,7 +52,7 @@ #include "e-shell-importer.h" #define EVOLUTION_COPYRIGHT \ - "Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others" + "Copyright \xC2\xA9 1999 - 2009 Novell, Inc. and Others" #define EVOLUTION_WEBSITE \ "http://www.gnome.org/projects/evolution/" -- cgit v1.2.3 From 607ce3802eabee692e55d89aacefd06390819e07 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 9 Jan 2009 07:36:29 +0000 Subject: Reviewed by Matthew Barnes 2009-01-09 Takao Fujiwara Reviewed by Matthew Barnes * Fix for bug #566011 * addressbook/gui/component/Makefile.am: * addressbook/gui/component/addressbook-component.c (addressbook_component_class_init): Include instead of and add bindtextdomain(). * calendar/gui/Makefile.am: * calendar/gui/calendar-component.c (calendar_component_class_init): * calendar/gui/dialogs/comp-editor.c: * calendar/gui/memos-component.c (memos_component_class_init): * calendar/gui/tasks-component.c (tasks_component_class_init): Include instead of and add bindtextdomain(). * composer/e-composer-header-table.c: * composer/e-composer-private.h: Include instead of . * mail/mail-component.c (mail_component_class_init): Include instead of and add bindtextdomain(). * shell/e-user-creatable-items-handler.c (e_user_creatable_items_handler_class_ini): Include instead of and add bindtextdomain(). * widgets/misc/e-charset-picker.c: * widgets/misc/e-signature-combo-box.c: Include instead of . svn path=/trunk/; revision=37021 --- shell/ChangeLog | 11 +++++++++++ shell/e-user-creatable-items-handler.c | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 0c73582af6..0d3425de44 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2009-01-09 Takao Fujiwara + + Reviewed by Matthew Barnes + + * Fix for bug #566011 + + * e-user-creatable-items-handler.c + (e_user_creatable_items_handler_class_ini): + Include instead of and + add bindtextdomain(). + 2009-01-01 Andre Klapper * e-shell-window-commands.c: diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index e532382f2d..4ba247342c 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include @@ -838,6 +838,9 @@ e_user_creatable_items_handler_class_init (EUserCreatableItemsHandlerClass *klas { GObjectClass *object_class; + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + object_class = G_OBJECT_CLASS (klass); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; -- cgit v1.2.3 From 577f9fdffbbb9e57b44b0290f1aea8088c6f0976 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 04:52:38 +0000 Subject: Remove unneeded #include . 2009-01-10 Matthew Barnes * addressbook/gui/contact-editor/e-contact-editor-address.c: * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/printing/e-contact-print.c: * calendar/gui/calendar-commands.c: * calendar/gui/e-cal-list-view.c: * calendar/gui/e-day-view.c: * calendar/gui/e-itip-control.c: * calendar/gui/e-meeting-list-view.c: * calendar/gui/e-meeting-store.c: * calendar/gui/e-week-view.c: * calendar/gui/gnome-cal.c: * calendar/gui/memos-control.c: * calendar/gui/tasks-control.c: * e-util/e-dialog-utils.c: * mail/em-folder-view.c: * mail/importers/mail-importer.c: * shell/e-shell.c: * shell/evolution-shell-component-utils.c: * shell/importer/intelligent.c: * shell/main.c: * widgets/menus/gal-view-collection.c: * widgets/menus/gal-view-instance.c: Remove unneeded #include . svn path=/trunk/; revision=37036 --- shell/ChangeLog | 8 ++++++++ shell/e-shell.c | 1 - shell/evolution-shell-component-utils.c | 1 - shell/importer/intelligent.c | 1 - shell/main.c | 1 - 5 files changed, 8 insertions(+), 4 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 0d3425de44..eed506e83f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2009-01-10 Matthew Barnes + + * e-shell.c: + * evolution-shell-component-utils.c: + * importer/intelligent.c: + * main.c: + Remove unneeded #include . + 2009-01-09 Takao Fujiwara Reviewed by Matthew Barnes diff --git a/shell/e-shell.c b/shell/e-shell.c index aeb6b79112..a512442133 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -43,7 +43,6 @@ #endif #include -#include #include diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 7400cb23c4..9dc1c3323b 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index c7cb6b3b0c..6503fc8ad6 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -29,7 +29,6 @@ #include #include -/*#include */ #include #include diff --git a/shell/main.c b/shell/main.c index 1638de0788..3590c315c4 100644 --- a/shell/main.c +++ b/shell/main.c @@ -51,7 +51,6 @@ #include #include -#include #include #include #include -- cgit v1.2.3 From 2b820fc4e2d6404ca281e279761cd5f877fdbf54 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 13:55:04 +0000 Subject: New convenience function calls gtk_show_uri() and displays an error dialog 2009-01-11 Matthew Barnes * e-util/e-util.c (e_show_uri): New convenience function calls gtk_show_uri() and displays an error dialog if the URI cannot be shown. * addressbook/gui/widgets/eab-contact-display.c (eab_uri_popup_link_open), (on_link_clicked): * calendar/gui/e-cal-component-preview (on_link_clicked): * calendar/gui/e-cal-component-memo-preview (on_link_clicked): * calendar/gui/e-memo-table.c (open_url_cb): * calendar/gui/dialogs/comp-editor.c (open_attachment): * composer/e-msg-composer.c (msg_composer_link_clicked): * mail/em-folder-view.c (emfv_format_link_clicked): * mail/em-popup.c (emp_uri_popup_link_open): * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): * shell/e-shell-window-commands.c (command_open_faq): * widgets/misc/e-attachment-bar.c (eab_icon_clicked_cb): * widgets/misc/e-url-entry.c (button_clicked_cb): Call e_show_uri() instead of gnome_url_show(). * e-util/e-error.c (ee_response): Call e_display_help() instead of gnome_url_show(). * mail/em-config.c: * mail/em-menu.c: Remove unneeded #include svn path=/trunk/; revision=37037 --- shell/ChangeLog | 5 +++++ shell/e-shell-window-commands.c | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index eed506e83f..ec2a0ca6aa 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2009-01-11 Matthew Barnes + + * e-shell-window-commands.c (command_open_faq): + Call e_show_uri() instead of gnome_url_show(). + 2009-01-10 Matthew Barnes * e-shell.c: diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 65273f8ad3..609e7c79b3 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -29,7 +29,6 @@ #include #include -#include #include @@ -43,6 +42,7 @@ #include "e-util/e-error.h" #include "e-util/e-icon-factory.h" #include "e-util/e-print.h" +#include "e-util/e-util.h" #include "e-util/e-util-private.h" #include "e-shell-window-commands.h" @@ -963,15 +963,11 @@ command_open_faq (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - GError *error = NULL; + const gchar *uri; - gnome_url_show ("http://www.go-evolution.org/FAQ", &error); - if (error != NULL) { - e_notice (NULL, GTK_MESSAGE_ERROR, - _("Error opening the FAQ webpage.")); - g_error_free (error); - } - } + uri = "http://www.go-evolution.org/FAQ"; + e_show_uri (GTK_WINDOW (window), uri); +} static void command_quick_reference (BonoboUIComponent *uih, -- cgit v1.2.3 From 79e0bf750c12b043aae5a99e0d95d48e28680073 Mon Sep 17 00:00:00 2001 From: Philip Van hoof Date: Mon, 12 Jan 2009 08:44:53 +0000 Subject: e-util/e-plugin.c e-util/e-plugin.h EPlugins must be loaded after Bonobo 2009-01-12 Philip Van hoof * e-util/e-plugin.c * e-util/e-plugin.h * shell/main.c: EPlugins must be loaded after Bonobo init, else variables like `session` are not available for plugin's initialization functions. (Fixes Bug #565681) svn path=/trunk/; revision=37052 --- shell/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/main.c b/shell/main.c index 3590c315c4..2abd30eec1 100644 --- a/shell/main.c +++ b/shell/main.c @@ -396,6 +396,14 @@ idle_cb (gchar **uris) bonobo_main_quit (); } + /* 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 */ + + if (!disable_eplugin) { + e_plugin_load_plugins_with_missing_symbols (); + } + return FALSE; } @@ -674,7 +682,7 @@ main (int argc, char **argv) e_plugin_hook_register_type(e_plugin_type_hook_get_type()); e_plugin_hook_register_type(e_import_hook_get_type()); e_plugin_hook_register_type(E_TYPE_PLUGIN_UI_HOOK); - e_plugin_load_plugins(); + e_plugin_load_plugins (); } #ifdef DEVELOPMENT -- cgit v1.2.3 From da9db6c8e2a386c48f269e33e7893c749a9ca2cc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 3 Feb 2009 20:33:38 +0000 Subject: Use -mwindows on Windows to build a "GUI" executable. 2009-02-03 Tor Lillqvist * Makefile.am (evolution_LDFLAGS): Use -mwindows on Windows to build a "GUI" executable. svn path=/trunk/; revision=37223 --- shell/ChangeLog | 5 +++++ shell/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index ec2a0ca6aa..f98b053b31 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2009-02-03 Tor Lillqvist + + * Makefile.am (evolution_LDFLAGS): Use -mwindows on Windows to + build a "GUI" executable. + 2009-01-11 Matthew Barnes * e-shell-window-commands.c (command_open_faq): diff --git a/shell/Makefile.am b/shell/Makefile.am index 7ffdc303f5..cf53a5c79c 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -150,6 +150,10 @@ evolution_LDADD = \ $(TZDIALOG_LIBS) \ $(SHELL_LIBS) +if OS_WIN32 +evolution_LDFLAGS = -mwindows +endif + # Misc stuff server_in_files = GNOME_Evolution_Shell.server.in.in -- cgit v1.2.3 From cfe3be08ff7f356bd5feedfdcfc63838f5fdd712 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 24 Feb 2009 23:46:11 +0000 Subject: ** Fixes bug #572962 2009-02-24 Matthew Barnes ** Fixes bug #572962 * e-shell-window.c (setup_nm_support): Pass e_shell_dbus_initialise() the right type of object, and fix the incorrect function declaration. * e-shell-nm.c (e_shell_network_monitor): Go offline when we see NM_STATE_ASLEEP from NetworkManager. svn path=/trunk/; revision=37320 --- shell/ChangeLog | 11 +++++++++++ shell/e-shell-nm.c | 2 +- shell/e-shell-window.c | 10 ++++------ 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index f98b053b31..e83129facc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2009-02-24 Matthew Barnes + + ** Fixes bug #572962 + + * e-shell-window.c (setup_nm_support): + Pass e_shell_dbus_initialise() the right type of object, + and fix the incorrect function declaration. + + * e-shell-nm.c (e_shell_network_monitor): + Go offline when we see NM_STATE_ASLEEP from NetworkManager. + 2009-02-03 Tor Lillqvist * Makefile.am (evolution_LDFLAGS): Use -mwindows on Windows to diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index e1d962fe89..5162aa5fea 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -91,7 +91,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, line_status = e_shell_get_line_status (shell); - if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == NM_STATE_DISCONNECTED) { + if (line_status == E_SHELL_LINE_STATUS_ONLINE && (state == NM_STATE_ASLEEP || state == NM_STATE_DISCONNECTED)) { shell_state = GNOME_Evolution_FORCED_OFFLINE; e_shell_set_line_status (shell, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == NM_STATE_CONNECTED) { diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index c533967c77..5319acb3d2 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -54,7 +54,7 @@ #include #if NM_SUPPORT -gboolean e_shell_dbus_initialise (EShellWindow *window); +gboolean e_shell_dbus_initialise (EShell *shell); #endif /* A view for each component. These are all created when EShellWindow is @@ -574,11 +574,9 @@ setup_statusbar_notebook (EShellWindow *window) static void setup_nm_support (EShellWindow *window) { - #ifdef NM_SUPPORT_GLIB - e_shell_nm_glib_initialise (window); - #elif NM_SUPPORT - e_shell_dbus_initialise (window); - #endif +#if NM_SUPPORT + e_shell_dbus_initialise (window->priv->shell.eshell); +#endif } static void -- cgit v1.2.3 From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: =?UTF-8?q?Bug=20577929=20=E2=80=93=20Consolidate=20marshallers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- shell/Makefile.am | 8 +------- shell/e-shell-marshal.list | 26 -------------------------- shell/e-shell-window.c | 1 - shell/e-shell.c | 1 - shell/e-sidebar.c | 4 ++-- shell/evolution-config-control.c | 2 -- 6 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 shell/e-shell-marshal.list (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index cf53a5c79c..177d9e80be 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -96,7 +96,6 @@ eshellinclude_HEADERS = \ libeshell_la_SOURCES = \ $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ e-component-view.c \ evolution-component.c \ evolution-listener.c \ @@ -221,10 +220,6 @@ uninstall-local: uninstall-evolution endif - -MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h -@EVO_MARSHAL_RULE@ - # Extra dist stuff EXTRA_DIST = \ @@ -234,7 +229,6 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ ChangeLog.pre-1-4 \ - e-shell-marshal.list \ evolution-nognome.in # Purify support @@ -251,7 +245,7 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list deleted file mode 100644 index 2b7c3eb383..0000000000 --- a/shell/e-shell-marshal.list +++ /dev/null @@ -1,26 +0,0 @@ -BOOL:POINTER,INT -NONE:BOOL,INT -NONE:INT,INT -NONE:INT,POINTER -NONE:INT,STRING -NONE:POINTER,INT -NONE:POINTER,INT,INT -NONE:POINTER,POINTER -NONE:POINTER,POINTER,POINTER -NONE:POINTER,POINTER,POINTER,BOOL -NONE:POINTER,POINTER,POINTER,POINTER -NONE:POINTER,POINTER,POINTER,POINTER,POINTER -NONE:POINTER,STRING -NONE:POINTER,STRING,BOOL -NONE:POINTER,STRING,STRING -NONE:POINTER,STRING,STRING,BOOL -NONE:POINTER,STRING,STRING,STRING,STRING -NONE:STRING,BOOL -NONE:STRING,INT -NONE:STRING,INT,INT -NONE:STRING,POINTER -NONE:STRING,POINTER,POINTER -NONE:STRING,STRING -NONE:STRING,STRING,STRING -NONE:STRING,STRING,STRING,STRING -NONE:STRING,POINTER,POINTER,UINT,UINT diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 5319acb3d2..204b9286b0 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -34,7 +34,6 @@ #include "e-component-registry.h" #include "e-shell-window-commands.h" -#include "e-shell-marshal.h" #include "e-sidebar.h" #include "es-menu.h" #include "es-event.h" diff --git a/shell/e-shell.c b/shell/e-shell.c index a512442133..061071efb8 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -61,7 +61,6 @@ #include "Evolution.h" #include "e-shell-constants.h" -#include "e-shell-marshal.h" #include "e-shell-settings-dialog.h" #include "e-shell.h" #include "e-shell-view.h" diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 5771e07dd1..37ff2fed13 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -26,7 +26,7 @@ #include "e-sidebar.h" -#include "e-shell-marshal.h" +#include "e-util/e-util.h" #include #include @@ -501,7 +501,7 @@ e_sidebar_class_init (ESidebarClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESidebarClass, button_pressed), boolean_handled_accumulator, NULL, - e_shell_marshal_NONE__POINTER_INT, + e_marshal_NONE__POINTER_INT, G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_INT); } diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 56c5b60048..35044c9dba 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -26,8 +26,6 @@ #include "evolution-config-control.h" -#include "e-shell-marshal.h" - #include #include -- cgit v1.2.3 From 8a072ffc7c0ddcde472877a51ace0bb14f86fb0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Apr 2009 11:45:21 +0200 Subject: GN-bug #572348 - Removed deprecated Gtk+ symbols Some still left, because those gone in kill-bonobo branch. --- shell/ChangeLog | 7 +++ shell/e-shell-importer.c | 111 ++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 41 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index e83129facc..2de87c8578 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2009-04-24 Milan Crha + + ** Fix for bug #572348 + + * e-shell-importer.c: + Remove deprecated Gtk+ symbols. + 2009-02-24 Matthew Barnes ** Fixes bug #572962 diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index ff347d7fe2..68ce5abec0 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -56,9 +56,6 @@ typedef struct _ImportDialogFilePage { GtkWidget *vbox; GtkWidget *filename; GtkWidget *filetype; - GtkWidget *menu; - - GSList *items; EImportTargetURI *target; EImportImporter *importer; @@ -187,7 +184,10 @@ filename_changed (GtkWidget *widget, fileok = filename && filename[0] && g_file_test(filename, G_FILE_TEST_IS_REGULAR); if (fileok) { - GSList *l, *item; + GtkTreeIter iter; + GtkTreeModel *model; + gboolean valid; + GSList *l; EImportImporter *first = NULL; int i=0, firstitem=0; @@ -195,48 +195,60 @@ filename_changed (GtkWidget *widget, page->target->uri_src = g_filename_to_uri(filename, NULL, NULL); l = e_import_get_importers(data->import, (EImportTarget *)page->target); - item = page->items; - while (item) { - EImportImporter *eii = g_object_get_data(item->data, "importer"); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype)); + valid = gtk_tree_model_get_iter_first (model, &iter); + while (valid) { + gpointer eii = NULL; + + gtk_tree_model_get (model, &iter, 2, &eii, -1); - if (g_slist_find(l, eii) != NULL) { + if (g_slist_find (l, eii) != NULL) { if (first == NULL) { firstitem = i; first = eii; } - gtk_widget_set_sensitive(item->data, TRUE); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, TRUE, -1); fileok = TRUE; } else { if (page->importer == eii) page->importer = NULL; - gtk_widget_set_sensitive(item->data, FALSE); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, FALSE, -1); } i++; - item = item->next; + valid = gtk_tree_model_iter_next (model, &iter); } g_slist_free(l); if (page->importer == NULL && first) { page->importer = first; - gtk_option_menu_set_history((GtkOptionMenu *)page->filetype, firstitem); + gtk_combo_box_set_active (GTK_COMBO_BOX (page->filetype), firstitem); } fileok = first != NULL; } else { - GSList *item; - - for (item = page->items;item;item=item->next) - gtk_widget_set_sensitive(item->data, FALSE); + GtkTreeIter iter; + GtkTreeModel *model; + gboolean valid; + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype)); + for (valid = gtk_tree_model_get_iter_first (model, &iter); + valid; + valid = gtk_tree_model_iter_next (model, &iter)) { + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, FALSE, -1); + } } gnome_druid_set_buttons_sensitive(GNOME_DRUID (data->druid), TRUE, fileok, TRUE, FALSE); } static void -item_selected (GtkWidget *item, - ImportData *data) +filetype_changed_cb (GtkWidget *combobox, ImportData *data) { - data->filepage->importer = g_object_get_data((GObject *)item, "importer"); - filename_changed(data->filepage->filename, data); + GtkTreeIter iter; + + g_return_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combobox), &iter)); + + gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)), &iter, 2, &data->filepage->importer, -1); + filename_changed (data->filepage->filename, data); } #if 0 @@ -267,6 +279,8 @@ importer_file_page_new (ImportData *data) { ImportDialogFilePage *page; GtkWidget *table, *label; + GtkCellRenderer *cell; + GtkListStore *store; int row = 0; page = g_new0 (ImportDialogFilePage, 1); @@ -298,7 +312,19 @@ importer_file_page_new (ImportData *data) GTK_FILL, 0, 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - page->filetype = gtk_option_menu_new (); + store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER); + page->filetype = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); + g_object_unref (store); + + gtk_cell_layout_clear (GTK_CELL_LAYOUT (page->filetype)); + + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (page->filetype), cell, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (page->filetype), cell, + "text", 0, + "sensitive", 1, + NULL); + gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filetype); @@ -441,7 +467,6 @@ import_druid_weak_notify (void *blah, if (data->filepage->target) e_import_target_free(data->import, data->filepage->target); - g_slist_free(data->filepage->items); g_object_unref(data->import); @@ -535,8 +560,8 @@ prepare_file_page (GnomeDruidPage *dpage, GnomeDruid *druid, ImportData *data) { - GtkWidget *item, *menu; - GSList *importers; + GSList *importers, *imp; + GtkListStore *store; ImportDialogFilePage *page = data->filepage; if (page->target != NULL) { @@ -545,27 +570,31 @@ prepare_file_page (GnomeDruidPage *dpage, } page->target = e_import_target_new_uri(data->import, NULL, NULL); - importers = e_import_get_importers(data->import, (EImportTarget *)page->target); - - menu = gtk_menu_new(); - while (importers) { - EImportImporter *eii = importers->data; + importers = e_import_get_importers (data->import, (EImportTarget *)page->target); + + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (page->filetype))); + gtk_list_store_clear (store); + + for (imp = importers; imp; imp = imp->next) { + GtkTreeIter iter; + EImportImporter *eii = imp->data; + + gtk_list_store_append (store, &iter); + gtk_list_store_set ( + store, &iter, + 0, eii->name, + 1, TRUE, + 2, eii, + -1); + } - item = gtk_menu_item_new_with_label(eii->name); - gtk_widget_show(item); - g_object_set_data((GObject *)item, "importer", eii); - g_signal_connect(item, "activate", G_CALLBACK(item_selected), data); - gtk_menu_shell_append((GtkMenuShell *)menu, item); + g_slist_free (importers); - data->filepage->items = g_slist_append(data->filepage->items, item); - importers = importers->next; - } - g_slist_free(importers); + gtk_combo_box_set_active (GTK_COMBO_BOX (page->filetype), 0); - data->filepage->menu = menu; - gtk_option_menu_set_menu((GtkOptionMenu *)data->filepage->filetype, menu); + filename_changed (data->filepage->filename, data); - filename_changed(data->filepage->filename, data); + g_signal_connect (page->filetype, "changed", G_CALLBACK (filetype_changed_cb), data); return FALSE; } -- cgit v1.2.3