aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/folder-browser.c1
-rw-r--r--mail/mail-callbacks.c8
-rw-r--r--mail/mail-vfolder.c2
4 files changed, 19 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ff70f8dfa9..6ec3d7aeeb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,4 +1,13 @@
-2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
+2001-03-15 Not Zed <NotZed@Ximian.com>
+
+ * folder-browser.c: Added edit item to search-bar menu.
+
+ * mail-callbacks.c (filter_edit): Changed for filter_editor_new()
+ api addition/change.
+
+ * mail-vfolder.c (vfolder_edit): Use vfolder_editor_new intead.
+
+2001-03-14 Jeffrey Stedfast <fejj@ximian.com>X
* session.c (mail_session_init): Tell camel to init NSS.
(mail_session_accept_dialog): Doh! NULL terminate the list of
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index f082ad18f1..8e3474cbd8 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -217,6 +217,7 @@ static ESearchBarItem folder_browser_search_menu_items[] = {
E_FILTERBAR_RESET,
E_FILTERBAR_SAVE,
{ N_("Store search as vFolder"), ESB_SAVE },
+ E_FILTERBAR_EDIT,
{ NULL, -1 }
};
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 2f5292c4b2..8dc66a58d4 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1176,6 +1176,12 @@ filter_druid_clicked (GtkWidget *w, int button, FolderBrowser *fb)
}
}
+static const char *filter_source_names[] = {
+ "incoming",
+ "outgoing",
+ NULL,
+};
+
void
filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
{
@@ -1204,7 +1210,7 @@ filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
return;
}
- w = filter_editor_construct (fc);
+ w = (GtkWidget *)filter_editor_new(fc, filter_source_names);
gtk_object_set_data_full (GTK_OBJECT (w), "context", fc, (GtkDestroyNotify)gtk_object_unref);
gtk_signal_connect (GTK_OBJECT (w), "clicked", filter_druid_clicked, fb);
gtk_widget_show (GTK_WIDGET (w));
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 488de8687e..42482c4c95 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -370,7 +370,7 @@ vfolder_edit(void)
{
GtkWidget *w;
- w = vfolder_editor_construct(context);
+ w = vfolder_editor_new(context);
gtk_signal_connect((GtkObject *)w, "clicked", vfolder_editor_clicked, NULL);
gtk_widget_show(w);
}