aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/em-account-editor.c8
-rw-r--r--mail/em-composer-prefs.c2
-rw-r--r--mail/em-config.c8
-rw-r--r--mail/em-event.c4
-rw-r--r--mail/em-folder-browser.c2
-rw-r--r--mail/em-folder-properties.c2
-rw-r--r--mail/em-folder-tree.c4
-rw-r--r--mail/em-folder-view.c4
-rw-r--r--mail/em-format-hook.c4
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/em-mailer-prefs.c2
-rw-r--r--mail/em-menu.c8
-rw-r--r--mail/em-message-browser.c2
-rw-r--r--mail/em-popup.c8
-rw-r--r--mail/message-list.c2
16 files changed, 33 insertions, 32 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3ee572542e..4161d2da6e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -4,7 +4,8 @@
em-event.c, em-folder-browser.c, em-folder-properties.c,
em-folder-tree.c, em-folder-view.c, em-format-hook.c,
em-format-html-display.c, em-mailer-prefs.c, em-menu.c,
- em-message-browser.c, em-popup.c, message-list.c: convert to org.gnome hook names
+ em-message-browser.c, em-popup.c, message-list.c: convert to
+ org.gnome hook names
2004-10-19 JP Rosevear <jpr@novell.com>
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 5cfde83efb..f2d56c3463 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2052,7 +2052,7 @@ emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
return glade_xml_get_widget(emae->priv->xml, item->label);
}
-/* plugin meta-data for "com.novell.evolution.mail.config.accountEditor" */
+/* plugin meta-data for "org.gnome.evolution.mail.config.accountEditor" */
static EMConfigItem emae_editor_items[] = {
{ E_CONFIG_BOOK, "", "account_editor_notebook", emae_widget_glade },
{ E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page },
@@ -2128,7 +2128,7 @@ emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *paren
return w;
}
-/* plugin meta-data for "com.novell.evolution.mail.config.accountDruid" */
+/* plugin meta-data for "org.gnome.evolution.mail.config.accountDruid" */
static EMConfigItem emae_druid_items[] = {
{ E_CONFIG_DRUID, "", "druid", emae_widget_druid_glade },
{ E_CONFIG_PAGE_START, "0.start", "start_page", emae_widget_druid_glade },
@@ -2414,10 +2414,10 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
gui->providers = g_list_sort(camel_provider_list(TRUE), (GCompareFunc)provider_compare);
if (type == EMAE_NOTEBOOK) {
- ec = em_config_new(E_CONFIG_BOOK, "com.novell.evolution.mail.config.accountEditor");
+ ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.config.accountEditor");
items = emae_editor_items;
} else {
- ec = em_config_new(E_CONFIG_DRUID, "com.novell.evolution.mail.config.accountDruid");
+ ec = em_config_new(E_CONFIG_DRUID, "org.gnome.evolution.mail.config.accountDruid");
items = emae_druid_items;
}
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index f361d20e74..0fbd59e920 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -892,7 +892,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
prefs->gui = gui;
prefs->sig_script_gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "vbox_add_script_signature", NULL);
- ec = em_config_new(E_CONFIG_BOOK, "com.novell.evolution.mail.composerPrefs");
+ ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
l = NULL;
for (i=0;i<sizeof(emcp_items)/sizeof(emcp_items[0]);i++)
l = g_slist_prepend(l, &emcp_items[i]);
diff --git a/mail/em-config.c b/mail/em-config.c
index be8d4c95d4..79a6ca0199 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -244,13 +244,13 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account)
/*
<e-plugin
- class="com.ximian.mail.plugin.popup:1.0"
- id="com.ximian.mail.plugin.popup.item:1.0"
+ class="org.gnome.mail.plugin.popup:1.0"
+ id="org.gnome.mail.plugin.popup.item:1.0"
type="shlib"
location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
name="imap"
description="IMAP4 and IMAP4v1 mail store">
- <hook class="com.ximian.mail.popupMenu:1.0"
+ <hook class="org.gnome.mail.popupMenu:1.0"
handler="HandlePopup">
<menu id="any" target="select">
<item
@@ -294,7 +294,7 @@ emph_class_init(EPluginHookClass *klass)
int i;
((GObjectClass *)klass)->finalize = emph_finalise;
- ((EPluginHookClass *)klass)->id = "com.novell.evolution.mail.config:1.0";
+ ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.config:1.0";
for (i=0;emph_targets[i].type;i++)
e_config_hook_class_add_target_map((EConfigHookClass *)klass, &emph_targets[i]);
diff --git a/mail/em-event.c b/mail/em-event.c
index 450d198d4c..a41494dd43 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -113,7 +113,7 @@ EMEvent *em_event_peek(void)
{
if (em_event == NULL) {
em_event = g_object_new(em_event_get_type(), 0);
- e_event_construct(&em_event->popup, "com.ximian.evolution.mail.events");
+ e_event_construct(&em_event->popup, "org.gnome.evolution.mail.events");
}
return em_event;
@@ -158,7 +158,7 @@ emeh_class_init(EPluginHookClass *klass)
int i;
((GObjectClass *)klass)->finalize = emeh_finalise;
- ((EPluginHookClass *)klass)->id = "com.ximian.evolution.mail.events:1.0";
+ ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.events:1.0";
for (i=0;emeh_targets[i].type;i++)
e_event_hook_class_add_target_map((EEventHookClass *)klass, &emeh_targets[i]);
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 40633d5d36..07444c7f98 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -287,7 +287,7 @@ GtkWidget *em_folder_browser_new(void)
{
EMFolderBrowser *emfb = g_object_new(em_folder_browser_get_type(), 0);
- ((EMFolderView *)emfb)->menu = em_menu_new("com.novell.evolution.mail.browser");
+ ((EMFolderView *)emfb)->menu = em_menu_new("org.gnome.evolution.mail.browser");
return (GtkWidget *)emfb;
}
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 9c32e30a87..3134664bde 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -274,7 +274,7 @@ emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data)
gtk_widget_ensure_style (dialog);
gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
- ec = em_config_new(E_CONFIG_BOOK, "com.novell.evolution.mail.folderConfig");
+ ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.folderConfig");
prop_data->config = ec;
l = NULL;
for (i=0;i<sizeof(emfp_items)/sizeof(emfp_items[0]);i++)
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index c326e8daa4..3d187abcaa 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1092,7 +1092,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y
GSList *menus = NULL;
GtkMenu *menu;
- emp = em_popup_new("com.ximian.mail.storageset.popup.drop");
+ emp = em_popup_new("org.gnome.mail.storageset.popup.drop");
if (info != DND_DROP_TYPE_FOLDER)
mask = ~1;
else
@@ -2809,7 +2809,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
}
/* handle right-click by opening a context menu */
- emp = em_popup_new ("com.ximian.mail.storageset.popup.select");
+ emp = em_popup_new ("org.gnome.mail.storageset.popup.select");
/* FIXME: pass valid fi->flags here */
target = em_popup_target_new_folder (emp, uri, info_flags, flags);
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index a87dc02dba..e1293428e3 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1013,7 +1013,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event)
EMPopupTargetSelect *target;
int i;
- emp = em_popup_new("com.ximian.mail.folderview.popup.select");
+ emp = em_popup_new("org.gnome.mail.folderview.popup.select");
target = em_folder_view_get_popup_target(emfv, emp);
for (i=0;i<sizeof(emfv_popup_items)/sizeof(emfv_popup_items[0]);i++)
@@ -2195,7 +2195,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const
/* FIXME: this maybe should just fit on em-html-display, it has access to the
snooped part type */
- emp = em_popup_new("com.ximian.mail.folderview.popup.uri");
+ emp = em_popup_new("org.gnome.mail.folderview.popup.uri");
if (part)
target = (EPopupTarget *)em_popup_target_new_part(emp, part, NULL);
else {
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index c62e75bb67..d88323e348 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -44,7 +44,7 @@ static GHashTable *emfh_types;
/* Mail formatter handler plugin */
/*
- <hook class="com.novell.evolution.mail.format:1.0">
+ <hook class="org.gnome.evolution.mail.format:1.0">
<group id="EMFormatHTML">
<item flags="inline,inline_disposition"
mime_type="text/vcard"
@@ -235,7 +235,7 @@ emfh_class_init(EPluginHookClass *klass)
((GObjectClass *)klass)->finalize = emfh_finalise;
klass->construct = emfh_construct;
klass->enable = emfh_enable;
- klass->id = "com.novell.evolution.mail.format:1.0";
+ klass->id = "org.gnome.evolution.mail.format:1.0";
}
GType
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 1e5c895cb8..bf452a8fd0 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1090,7 +1090,7 @@ efhd_attachment_popup(GtkWidget *w, GdkEventButton *event, struct _attach_puri *
return FALSE;
}
- emp = em_popup_new("com.ximian.mail.formathtmldisplay.popup.part");
+ emp = em_popup_new("org.gnome.mail.formathtmldisplay.popup.part");
target = em_popup_target_new_part(emp, info->puri.part, info->handle?info->handle->mime_type:NULL);
target->target.widget = w;
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index c619aeba97..b7f37bb7b2 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -717,7 +717,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_toplevel", NULL);
prefs->gui = gui;
- ec = em_config_new(E_CONFIG_BOOK, "com.novell.evolution.mail.prefs");
+ ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
l = NULL;
for (i=0;i<sizeof(emmp_items)/sizeof(emmp_items[0]);i++)
l = g_slist_prepend(l, &emmp_items[i]);
diff --git a/mail/em-menu.c b/mail/em-menu.c
index 79a5564f51..62a4a3ee8e 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -245,13 +245,13 @@ emp_standard_menu_factory(EMenu *emp, void *data)
/*
<e-plugin
- class="com.ximian.mail.plugin.popup:1.0"
- id="com.ximian.mail.plugin.popup.item:1.0"
+ class="org.gnome.mail.plugin.popup:1.0"
+ id="org.gnome.mail.plugin.popup.item:1.0"
type="shlib"
location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
name="imap"
description="IMAP4 and IMAP4v1 mail store">
- <hook class="com.ximian.mail.popupMenu:1.0"
+ <hook class="org.gnome.mail.popupMenu:1.0"
handler="HandlePopup">
<menu id="any" target="select">
<item
@@ -310,7 +310,7 @@ emph_class_init(EPluginHookClass *klass)
int i;
((GObjectClass *)klass)->finalize = emph_finalise;
- ((EPluginHookClass *)klass)->id = "com.ximian.evolution.mail.bonobomenu:1.0";
+ ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.bonobomenu:1.0";
for (i=0;emph_targets[i].type;i++)
e_menu_hook_class_add_target_map((EMenuHookClass *)klass, &emph_targets[i]);
diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c
index 98fc1bd319..1c78ba1093 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -176,7 +176,7 @@ GtkWidget *em_message_browser_new(void)
{
EMMessageBrowser *emmb = g_object_new(em_message_browser_get_type(), 0);
- ((EMFolderView *)emmb)->menu = em_menu_new("com.novell.evolution.mail.messagebrowser");
+ ((EMFolderView *)emmb)->menu = em_menu_new("org.gnome.evolution.mail.messagebrowser");
return (GtkWidget *)emmb;
}
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 8b580e3147..5d7017aa75 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -718,13 +718,13 @@ emp_standard_menu_factory(EPopup *emp, void *data)
/*
<e-plugin
- class="com.ximian.mail.plugin.popup:1.0"
- id="com.ximian.mail.plugin.popup.item:1.0"
+ class="org.gnome.mail.plugin.popup:1.0"
+ id="org.gnome.mail.plugin.popup.item:1.0"
type="shlib"
location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
name="imap"
description="IMAP4 and IMAP4v1 mail store">
- <hook class="com.ximian.mail.popupMenu:1.0"
+ <hook class="org.gnome.mail.popupMenu:1.0"
handler="HandlePopup">
<menu id="any" target="select">
<item
@@ -815,7 +815,7 @@ emph_class_init(EPluginHookClass *klass)
int i;
((GObjectClass *)klass)->finalize = emph_finalise;
- ((EPluginHookClass *)klass)->id = "com.ximian.evolution.mail.popup:1.0";
+ ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.popup:1.0";
for (i=0;emph_targets[i].type;i++)
e_popup_hook_class_add_target_map((EPopupHookClass *)klass, &emph_targets[i]);
diff --git a/mail/message-list.c b/mail/message-list.c
index 39223eacce..86bdd4c47a 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1750,7 +1750,7 @@ ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col,
GtkMenu *menu;
int i;
- emp = em_popup_new("com.ximian.mail.messagelist.popup.drop");
+ emp = em_popup_new("org.gnome.mail.messagelist.popup.drop");
for (i=0;i<sizeof(ml_drop_popup_menu)/sizeof(ml_drop_popup_menu[0]);i++)
menus = g_slist_append(menus, &ml_drop_popup_menu[i]);