diff options
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/GNOME_Evolution_Shell.server.in.in | 10 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 12 |
3 files changed, 20 insertions, 11 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 1a06e09f33..147c86ad81 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2003-11-03 Ettore Perazzoli <ettore@ximian.com> + + * GNOME_Evolution_Shell.server.in.in: Use "evolution2:config_item" + attributes instead of "evolution:config_item" ones. + + * e-shell-settings-dialog.c (load_pages): Expect + "evolution2:config_item" properties instead of + "evolution:config_item" so they do not conflict with 1.4's. + 2003-10-29 Dan Winship <danw@ximian.com> * Evolution-Component.idl: declare an exception for createControls diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in index a54a7b4d7b..73de19f1b3 100644 --- a/shell/GNOME_Evolution_Shell.server.in.in +++ b/shell/GNOME_Evolution_Shell.server.in.in @@ -29,18 +29,18 @@ <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/> </oaf_attribute> - <oaf_attribute name="evolution:config_item:title" type="string" + <oaf_attribute name="evolution2:config_item:title" type="string" _value="Folder Settings"/> - <oaf_attribute name="evolution:config_item:description" type="string" + <oaf_attribute name="evolution2:config_item:description" type="string" _value="Configure special folders and offline folder behavior here"/> - <oaf_attribute name="evolution:config_item:icon_name" type="string" + <oaf_attribute name="evolution2:config_item:icon_name" type="string" value="folder-settings.png"/> - <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/> + <oaf_attribute name="evolution2:config_item:priority" type="string" value="-9"/> - <oaf_attribute name="evolution:config_item:type" type="stringv"> + <oaf_attribute name="evolution2:config_item:type" type="stringv"> <item value="shell"/> </oaf_attribute> diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index ed688828db..f0476bf0d5 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -165,7 +165,7 @@ load_pages (EShellSettingsDialog *dialog) CORBA_exception_init (&ev); - control_list = bonobo_activation_query ("defined(evolution:config_item:title)", NULL, &ev); + control_list = bonobo_activation_query ("defined(evolution2:config_item:title)", NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || control_list == NULL) { g_warning ("Cannot load configuration pages -- %s", BONOBO_EX_REPOID (&ev)); CORBA_exception_free (&ev); @@ -192,11 +192,11 @@ load_pages (EShellSettingsDialog *dialog) info = & control_list->_buffer[i]; - title = bonobo_server_info_prop_lookup (info, "evolution:config_item:title", language_list); - description = bonobo_server_info_prop_lookup (info, "evolution:config_item:description", language_list); - icon_path = bonobo_server_info_prop_lookup (info, "evolution:config_item:icon_name", NULL); - type = bonobo_server_info_prop_find (info, "evolution:config_item:type"); - priority_string = bonobo_server_info_prop_lookup (info, "evolution:config_item:priority", NULL); + title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list); + description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list); + icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); + type = bonobo_server_info_prop_find (info, "evolution2:config_item:type"); + priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL); if (icon_path == NULL) { icon = NULL; |