aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMichael Meeks <michael@helixcode.com>2000-10-19 11:07:02 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-10-19 11:07:02 +0800
commit94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672 (patch)
tree3c6050b9cf6e6acdeacec447bb5097818dbd3169 /mail
parentfc142d01102d257de415fcaa350d3f58cf30783c (diff)
downloadgsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar.gz
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar.bz2
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar.lz
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar.xz
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.tar.zst
gsoc2013-evolution-94f3ed8e3ad1d6ee54ca5692a7a8afc51ec11672.zip
kill. (create_ondemand_hooks): die. (control_activate): remove hook.
2000-10-18 Michael Meeks <michael@helixcode.com> * folder-browser-factory.c (register_ondemand): kill. (create_ondemand_hooks): die. (control_activate): remove hook. * test-mail.c (create_container): kill old UI handler. svn path=/trunk/; revision=6020
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser-factory.c48
-rw-r--r--mail/mail-tools.c1
-rw-r--r--mail/test-mail.c12
4 files changed, 15 insertions, 54 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 28c346564f..1dc6d47404 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-18 Michael Meeks <michael@helixcode.com>
+
+ * folder-browser-factory.c (register_ondemand): kill.
+ (create_ondemand_hooks): die.
+ (control_activate): remove hook.
+
+ * test-mail.c (create_container): kill old UI handler.
+
2000-10-18 Christopher James Lahey <clahey@helixcode.com>
* message-list.c: Fixed some column widths.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 31f61cd786..4733b835cd 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -31,52 +31,6 @@
/* The FolderBrowser BonoboControls we have. */
static GList *control_list = NULL;
-static void
-register_ondemand (RuleContext *f, FilterRule *rule, FolderBrowser *fb, BonoboUIComponent *uic)
-{
- BonoboUIHandler *uih;
- gchar *text;
- struct fb_ondemand_closure *oc;
-
- oc = g_new (struct fb_ondemand_closure, 1);
- oc->rule = rule;
- oc->fb = fb;
- oc->path = g_strdup_printf ("/*Component Placeholder*/Folder/Filter-%s", rule->name);
-
-#warning FIXME: this should not use the bonobo_ui_handler API.
-
- uih = bonobo_ui_handler_new_from_component (uic);
-
- if (fb->filter_menu_paths == NULL)
- bonobo_ui_handler_menu_new_separator (uih, "/*Component Placeholder*/Folder/separator1", -1);
-
- text = g_strdup_printf (_("Run filter \"%s\""), rule->name);
- fb->filter_menu_paths = g_slist_prepend (fb->filter_menu_paths, oc);
-
- bonobo_ui_handler_menu_new_item (uih, oc->path, text,
- NULL, -1,
- BONOBO_UI_HANDLER_PIXMAP_NONE,
- 0,
- 0, 0, run_filter_ondemand, oc);
- g_free (text);
-}
-
-static void
-create_ondemand_hooks (FolderBrowser *fb, BonoboUIComponent *uic)
-{
- gchar *system, *user;
- FilterRule *rule = NULL;
-
- user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
- fb->filter_context = filter_context_new();
- rule_context_load ((RuleContext *) fb->filter_context, system, user);
- while ( (rule = rule_context_next_rule((RuleContext *)fb->filter_context, rule, FILTER_SOURCE_DEMAND)) != NULL ) {
- register_ondemand((RuleContext *)fb->filter_context, rule, fb, uic);
- }
- g_free (user);
-}
-
/*
* Add with 'folder_browser'
*/
@@ -198,8 +152,6 @@ control_activate (BonoboControl *control,
message_list_toggle_threads,
FOLDER_BROWSER (folder_browser)->message_list);
- create_ondemand_hooks (fb, uic);
-
update_pixmaps (uic);
bonobo_ui_component_thaw (uic, NULL);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index ae76bb544d..6eb11b3bb2 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -189,7 +189,6 @@ mail_tool_do_movemail (const gchar *source_url, CamelException *ex)
gchar *dest_url;
gchar *dest_path;
const gchar *source;
- CamelFolder *ret;
struct stat sb;
#ifndef MOVEMAIL_PATH
int tmpfd;
diff --git a/mail/test-mail.c b/mail/test-mail.c
index ecf8c5eda5..c62df3ac3e 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -17,21 +17,23 @@ static guint
create_container (void)
{
GtkWidget *window, *control;
- BonoboUIHandler *uih;
+ BonoboUIContainer *container;
gdk_rgb_init ();
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
gtk_widget_set_default_visual (gdk_rgb_get_visual ());
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = bonobo_win_new ("Test", "test");
gtk_widget_set_usize (GTK_WIDGET (window), 640, 480);
gtk_widget_show (GTK_WIDGET (window));
- uih = bonobo_ui_handler_new ();
+ container = bonobo_ui_container_new ();
+ bonobo_ui_container_set_win (BONOBO_WIN (window), container);
- control = bonobo_widget_new_control ("OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
- bonobo_object_corba_objref (BONOBO_OBJECT (uih)));
+ control = bonobo_widget_new_control (
+ "OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
+ bonobo_object_corba_objref (BONOBO_OBJECT (container)));
if (control == NULL){
printf ("Could not launch mail control\n");