From 40085e043615d8f1cdb583d014d774724e15d9b3 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 16 Jul 2008 11:41:04 +0000 Subject: Pushing changes from the madagascar branch related to the on-disk summary work. svn path=/trunk/; revision=35747 --- mail/em-folder-browser.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index ce17ea2f54..6c4e959e02 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -873,11 +873,15 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = " "; break; + /* README: All the sexp below are not rocket science but it is not straightforward as well. + I believe it is better to document the assumptions and the conventions followed for the sexp, + before I forget so that no one else again needs to read through the code -- Sankar */ + case VIEW_UNREAD_MESSAGES: - view_sexp = "(match-all (not (system-flag \"Seen\")))"; + view_sexp = "(match-all (system-flag \"Seen\"))"; break; case VIEW_READ_MESSAGES: - view_sexp = "(match-all (system-flag \"Seen\"))"; + view_sexp = "(match-all (system-flag \"Seen\" \"set\"))"; break; case VIEW_RECENT_MESSAGES: if (!em_utils_folder_is_sent (folder, folder_uri)) @@ -892,10 +896,10 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = " (match-all (> (get-sent-date) (- (get-current-date) 432000)))"; break; case VIEW_WITH_ATTACHMENTS: - view_sexp = "(match-all (system-flag \"Attachments\"))"; + view_sexp = "(match-all (system-flag \"Attachments\" \"set\"))"; break; case VIEW_NOT_JUNK: - view_sexp = "(match-all (not (system-flag \"junk\")))"; + view_sexp = "(match-all (system-flag \"junk\"))"; break; case VIEW_NO_LABEL: { GSList *l; @@ -911,6 +915,8 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) tag += 6; g_string_append_printf (s, " (match-all (not (or (= (user-tag \"label\") \"%s\") (user-flag \"$Label%s\") (user-flag \"%s\"))))", tag, tag, tag); + /* FIXME: I dont see a way of mapping this kind of sexp into sql atm. I guess this option could be kicked out */ + /* May be we should copy what I did for system flags -- Sankar */ } } @@ -921,11 +927,11 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) } break; case VIEW_LABEL: tag = (char *)g_object_get_data (G_OBJECT (menu_item), "LabelTag"); - view_sexp = g_strdup_printf ("(match-all (or (= (user-tag \"label\") \"%s\") (user-flag \"$Label%s\") (user-flag \"%s\")))", tag, tag, tag); + view_sexp = g_strdup_printf ("(match-all (and (and (user-tag \"label\" \"%s\")) (or (user-flag \"$Label%s\")) (or (user-flag \"%s\"))))", tag, tag, tag); duplicate = FALSE; break; case VIEW_MESSAGES_MARKED_AS_IMPORTANT: - view_sexp = "(match-all (system-flag \"Flagged\"))"; + view_sexp = "(match-all (system-flag \"Flagged\" \"set\"))"; break; case VIEW_ANY_FIELD_CONTAINS: break; -- cgit v1.2.3 From a91345154c8f0d5b1f19ac03b41049cd6812fe13 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 24 Jul 2008 05:51:34 +0000 Subject: Revert Sankar's search hacks. 2008-07-24 Srinivasa Ragavan * mail/em-folder-browser.c: Revert Sankar's search hacks. svn path=/trunk/; revision=35829 --- mail/em-folder-browser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 6c4e959e02..3c561a00fa 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -881,7 +881,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = "(match-all (system-flag \"Seen\"))"; break; case VIEW_READ_MESSAGES: - view_sexp = "(match-all (system-flag \"Seen\" \"set\"))"; + view_sexp = "(match-all (system-flag \"Seen\" ))"; break; case VIEW_RECENT_MESSAGES: if (!em_utils_folder_is_sent (folder, folder_uri)) @@ -896,7 +896,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = " (match-all (> (get-sent-date) (- (get-current-date) 432000)))"; break; case VIEW_WITH_ATTACHMENTS: - view_sexp = "(match-all (system-flag \"Attachments\" \"set\"))"; + view_sexp = "(match-all (system-flag \"Attachments\" ))"; break; case VIEW_NOT_JUNK: view_sexp = "(match-all (system-flag \"junk\"))"; @@ -931,7 +931,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) duplicate = FALSE; break; case VIEW_MESSAGES_MARKED_AS_IMPORTANT: - view_sexp = "(match-all (system-flag \"Flagged\" \"set\"))"; + view_sexp = "(match-all (system-flag \"Flagged\" ))"; break; case VIEW_ANY_FIELD_CONTAINS: break; -- cgit v1.2.3 From 798212b5586ea0ceecce9a3504d6ce965f09d76c Mon Sep 17 00:00:00 2001 From: Sankar P Date: Thu, 24 Jul 2008 08:29:30 +0000 Subject: Search by Labels. 2008-07-24 Sankar P * em-folder-browser.c (get_view_query): Search by Labels. svn path=/trunk/; revision=35830 --- mail/em-folder-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 3c561a00fa..f46b30c453 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -927,7 +927,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) } break; case VIEW_LABEL: tag = (char *)g_object_get_data (G_OBJECT (menu_item), "LabelTag"); - view_sexp = g_strdup_printf ("(match-all (and (and (user-tag \"label\" \"%s\")) (or (user-flag \"$Label%s\")) (or (user-flag \"%s\"))))", tag, tag, tag); + view_sexp = g_strdup_printf ("(match-all (or (= (user-tag \"label\") \"%s\") (user-flag \"$Label%s\") (user-flag \"%s\")))", tag, tag, tag); duplicate = FALSE; break; case VIEW_MESSAGES_MARKED_AS_IMPORTANT: -- cgit v1.2.3 From 0847af004dc28c76aec8b4b22d60496bcf63e0ea Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 24 Jul 2008 19:39:50 +0000 Subject: Make show unread/etc work well. 2008-07-25 Srinivasa Ragavan * mail/em-folder-browser.c: Make show unread/etc work well. svn path=/trunk/; revision=35831 --- mail/em-folder-browser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index f46b30c453..d1d03dc47e 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -878,7 +878,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) before I forget so that no one else again needs to read through the code -- Sankar */ case VIEW_UNREAD_MESSAGES: - view_sexp = "(match-all (system-flag \"Seen\"))"; + view_sexp = "(match-all (not (system-flag \"Seen\")))"; break; case VIEW_READ_MESSAGES: view_sexp = "(match-all (system-flag \"Seen\" ))"; @@ -899,7 +899,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = "(match-all (system-flag \"Attachments\" ))"; break; case VIEW_NOT_JUNK: - view_sexp = "(match-all (system-flag \"junk\"))"; + view_sexp = "(match-all (not (system-flag \"junk\")))"; break; case VIEW_NO_LABEL: { GSList *l; -- 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 --- mail/em-folder-browser.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index d1d03dc47e..fff9fa7c98 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -293,10 +293,19 @@ generate_viewoption_menu (GtkWidget *emfv) for (i = 0; emfb_view_items[i].search.id != -1; ++i) { if (emfb_view_items[i].search.text) { char *str; + str = e_str_without_underscores (_(emfb_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (emfb_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (emfb_view_items[i].image, E_ICON_SIZE_MENU)); + if (emfb_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + emfb_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); @@ -351,8 +360,16 @@ generate_viewoption_menu (GtkWidget *emfv) char *str; str = e_str_without_underscores (_(temp_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (temp_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (temp_view_items[i].image, E_ICON_SIZE_MENU)); + if (temp_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + temp_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); -- 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 --- mail/em-folder-browser.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index fff9fa7c98..9bbf061cc8 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -122,6 +122,7 @@ struct _EMFolderBrowserPrivate { guint folder_changed_id; guint show_wide:1; + guint suppress_message_selection:1; gboolean scope_restricted; EMMenu *menu; /* toplevel menu manager */ @@ -2007,6 +2008,7 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; struct _EMFolderBrowserPrivate *p = emfb->priv; + gboolean different_folder; message_list_freeze(emfv->list); @@ -2025,6 +2027,10 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) emfb->priv->folder_changed_id = 0; } + different_folder = + emfb->view.folder != NULL && + folder != emfb->view.folder; + emfb_parent->set_folder(emfv, folder, uri); /* This is required since we get activated the first time @@ -2108,15 +2114,20 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) e_search_bar_paint ((ESearchBar *)emfb->search); } - /* set the query manually, so we dont pop up advanced or saved search stuff */ + /* This function gets triggered several times at startup, + * so we don't want to reset the message suppression state + * unless we're actually switching to a different folder. */ + if (different_folder) + p->suppress_message_selection = FALSE; - if ((sstate = camel_object_meta_get (folder, "evolution:selected_uid"))) { - g_free (emfb->priv->select_uid); - emfb->priv->select_uid = sstate; - } else { - g_free(p->select_uid); - p->select_uid = NULL; - } + if (!p->suppress_message_selection) + sstate = camel_object_meta_get ( + folder, "evolution:selected_uid"); + else + sstate = NULL; + + g_free (p->select_uid); + p->select_uid = sstate; if (emfv->list->cursor_uid == NULL && emfb->priv->list_built_id == 0) p->list_built_id = g_signal_connect(emfv->list, "message_list_built", G_CALLBACK (emfb_list_built), emfv); @@ -2228,3 +2239,9 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) emfb_parent->activate(emfv, uic, act); } } + +void +em_folder_browser_suppress_message_selection (EMFolderBrowser *emfb) +{ + emfb->priv->suppress_message_selection = TRUE; +} -- 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 --- mail/em-folder-browser.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 9bbf061cc8..9b6eb492a9 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi - * Jeffrey Stedfast + * 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 + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ -- cgit v1.2.3 From 9b1cc7f981daf8e9c841d82ac1a21c3854930018 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 25 Sep 2008 15:59:03 +0000 Subject: ** Fix for bug #552551 2008-09-25 Philip Withnall ** Fix for bug #552551 * em-folder-browser.c (emfb_search_search_activated): Add a NULL check for search_word before calling strcmp. svn path=/trunk/; revision=36451 --- mail/em-folder-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 9b6eb492a9..3ac2f7cead 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1147,7 +1147,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) g_free (word); word = NULL; g_object_get (esb, "query", &search_word, NULL); - if (efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) { + if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) { break; } gtk_widget_set_sensitive (esb->scopeoption, FALSE); -- cgit v1.2.3 From 40b56885e46dd3a1ff267193d228fa8fedaaffb1 Mon Sep 17 00:00:00 2001 From: Sankar P Date: Sun, 5 Oct 2008 12:42:44 +0000 Subject: ** Fix for bug #554349 2008-10-05 Sankar P ** Fix for bug #554349 * mail/em-folder-browser.c: Expand threads and select messages, if user has given select-all. svn path=/trunk/; revision=36562 --- mail/em-folder-browser.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 3ac2f7cead..b7c53268cc 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -149,6 +149,8 @@ static void emfb_search_search_cleared(ESearchBar *esb); static int emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb); static void emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *emfb); +static void emfb_expand_all_threads(BonoboUIComponent *uid, void *data, const char *path); + static const EMFolderViewEnable emfb_enable_map[] = { { "EditInvertSelection", EM_POPUP_SELECT_FOLDER }, { "EditSelectAll", EM_POPUP_SELECT_FOLDER }, @@ -1432,13 +1434,35 @@ emfb_edit_invert_selection(BonoboUIComponent *uid, void *data, const char *path) message_list_invert_selection(emfv->list); } +static gboolean +emfb_select_all_daemon (MessageList *ml) +{ + message_list_select_all(ml); + gtk_widget_grab_focus ((GtkWidget *)ml); + return FALSE; +} + static void emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) { - EMFolderView *emfv = data; + EMFolderView *emfv = data; - message_list_select_all(emfv->list); - gtk_widget_grab_focus ((GtkWidget *)emfv->list); + if (emfv->list->threaded) { + + emfb_expand_all_threads (uid, data, path); + + /* The time out below is added so that the execution thread to + expand all conversations threads would've completed. + + The timeout 505 is just to ensure that the value is a small delta + more than the timeout value in expand_all_threads thread. */ + + g_timeout_add (505, (GSourceFunc) emfb_select_all_daemon, emfv->list); + + } else { + /* If there is no threading, just select-all immediately */ + emfb_select_all_daemon (emfv->list); + } } static void -- cgit v1.2.3 From 533cd49bc6475ef48ad5eb6a93d0f58450b3c9e8 Mon Sep 17 00:00:00 2001 From: Johnny Jacob Date: Sun, 1 Feb 2009 18:24:45 +0000 Subject: EPLugin : Added new hook point. svn path=/trunk/; revision=37205 --- mail/em-folder-browser.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index b7c53268cc..b0b507b1a3 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -88,6 +88,7 @@ #include "em-folder-utils.h" #include "em-subscribe-editor.h" #include "em-menu.h" +#include "em-event.h" #include "message-list.h" #include "mail-component.h" @@ -486,6 +487,9 @@ emfb_init(GObject *o) RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ()); struct _EMFolderBrowserPrivate *p; + EMEvent *eme; + EMEventTargetFolderBrowser *target; + p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate)); emfb->view.preview_active = TRUE; @@ -566,6 +570,17 @@ emfb_init(GObject *o) gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE); gtk_widget_show(p->preview); + /** @HookPoint-EMFolderBrower: Folder Browser + * @Id: emfb.created + * @Class: org.gnome.evolution.mail.events:1.0 + * @Target: EMFolderBrowser + */ + + eme = em_event_peek(); + target = em_event_target_new_folder_browser (eme, emfb); + + e_event_emit((EEvent *)eme, "emfb.created", (EEventTarget *)target); + g_signal_connect (((EMFolderView *) emfb)->list->tree, "key_press", G_CALLBACK(emfb_list_key_press), emfb); g_signal_connect (((EMFolderView *) emfb)->list, "message_selected", G_CALLBACK (emfb_list_message_selected), emfb); -- cgit v1.2.3 From 9cc64a2009458355ed1e404ca4e15ede10acd920 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 11 Feb 2009 16:06:24 +0000 Subject: Substitute some deprecated gtk+ functions. 2009-02-11 Andre Klapper * addressbook/gui/component/addressbook-migrate.c: * calendar/gui/migration.c: * calendar/gui/dialogs/alarm-dialog.c: * mail/em-folder-browser.c: * mail/em-migrate.c: * plugins/audio-inline/audio-inline.c: Substitute some deprecated gtk+ functions. svn path=/trunk/; revision=37249 --- mail/em-folder-browser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index b0b507b1a3..39eae48266 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -551,7 +551,7 @@ emfb_init(GObject *o) gtk_widget_show(emfb->vpane); - gtk_box_pack_start_defaults((GtkBox *)emfb, emfb->vpane); + gtk_box_pack_start((GtkBox *)emfb, emfb->vpane, TRUE, TRUE, 0); gtk_paned_pack1 (GTK_PANED (emfb->vpane), GTK_WIDGET (emfb->view.list), FALSE, FALSE); gtk_widget_show((GtkWidget *)emfb->view.list); @@ -784,7 +784,7 @@ void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state) g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb); emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb); - gtk_box_pack_start_defaults((GtkBox *)emfb, w); + gtk_box_pack_start((GtkBox *)emfb, w, TRUE, TRUE, 0); gtk_widget_reparent((GtkWidget *)emfb->view.list, w); gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w); gtk_widget_destroy(emfb->vpane); -- cgit v1.2.3 From dc3b372304b8b83bd335f8871755ad15154c7f25 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 19 Mar 2009 10:02:36 +0000 Subject: ** Fix for bug #504767 2009-03-19 Milan Crha ** Fix for bug #504767 * em-folder-utils.h: (em_folder_utils_create_folder): * em-folder-utils.c: (em_folder_utils_create_folder): * em-folder-selector.c: (emfs_response): Inherit modality from a parent's window, if any. * em-folder-browser.c: (emfb_folder_create): * em-folder-tree.c: (emft_popup_new_folder): * mail-component.c: (create_item): Propagate changes in function prototype. svn path=/trunk/; revision=37461 --- mail/em-folder-browser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 39eae48266..58e42a5834 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1612,11 +1612,11 @@ emfb_folder_create(BonoboUIComponent *uid, void *data, const char *path) FIXME: This interface should NOT use a folderinfo */ if (emfb->view.folder) { if ((fi = em_folder_tree_get_selected_folder_info (tree)) != NULL) { - em_folder_utils_create_folder(fi, tree); + em_folder_utils_create_folder (fi, tree, NULL); camel_folder_info_free(fi); } } else { - em_folder_utils_create_folder(NULL, tree); + em_folder_utils_create_folder (NULL, tree, NULL); } return; -- cgit v1.2.3