diff options
author | John N. Laliberte <allanonjl@gentoo.org> | 2006-03-18 22:42:56 +0000 |
---|---|---|
committer | John N. Laliberte <allanonjl@gentoo.org> | 2006-03-18 22:42:56 +0000 |
commit | 82c7b2793132ff53accaf3ad428779d3e33fa5ad (patch) | |
tree | 3c32af44855e3b02d4b84164129107c7e372bbef /mail-client/evolution/files | |
parent | Stable on amd64 per bug #126321 (diff) | |
download | historical-82c7b2793132ff53accaf3ad428779d3e33fa5ad.tar.gz historical-82c7b2793132ff53accaf3ad428779d3e33fa5ad.tar.bz2 historical-82c7b2793132ff53accaf3ad428779d3e33fa5ad.zip |
new version. change evolution-data-server dep to 1.5 because in the e-utils directory the includes reference locations that are only present in eds > 1.5. add bogofilter/widescreen patch/useflag.
Package-Manager: portage-2.1_pre6-r3
Diffstat (limited to 'mail-client/evolution/files')
-rw-r--r-- | mail-client/evolution/files/digest-evolution-2.6.0 | 6 | ||||
-rw-r--r-- | mail-client/evolution/files/evolution-2.5.5.1-sideview.patch | 261 |
2 files changed, 267 insertions, 0 deletions
diff --git a/mail-client/evolution/files/digest-evolution-2.6.0 b/mail-client/evolution/files/digest-evolution-2.6.0 new file mode 100644 index 000000000000..902ed13539ac --- /dev/null +++ b/mail-client/evolution/files/digest-evolution-2.6.0 @@ -0,0 +1,6 @@ +MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771 +RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771 +SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771 +MD5 5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 12072895 +RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d evolution-2.6.0.tar.bz2 12072895 +SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d evolution-2.6.0.tar.bz2 12072895 diff --git a/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch b/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch new file mode 100644 index 000000000000..8eb0e288f606 --- /dev/null +++ b/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch @@ -0,0 +1,261 @@ +diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.c evolution-2.5.5.1/mail/em-folder-browser.c +--- evolution-2.5.5.1.orig/mail/em-folder-browser.c 2006-01-16 06:12:24.000000000 -0500 ++++ evolution-2.5.5.1/mail/em-folder-browser.c 2006-01-21 00:12:22.000000000 -0500 +@@ -114,6 +114,8 @@ + guint folder_changed_id; + + EMMenu *menu; /* toplevel menu manager */ ++ ++ int show_wide:1; + }; + + static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); +@@ -220,7 +222,9 @@ + gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0); + } + +- emfb->vpane = gtk_vpaned_new(); ++ emfb->priv->show_wide = gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/display/show_wide", NULL); ++ emfb->vpane = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new(); ++ + g_signal_connect(emfb->vpane, "realize", G_CALLBACK(emfb_pane_realised), emfb); + emfb->priv->vpane_resize_id = g_signal_connect(emfb->vpane, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb); + +@@ -375,6 +379,33 @@ + /* FIXME: need to update menu's to reflect ui changes */ + } + ++void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state) ++{ ++ GtkWidget *w; ++ ++ if ((emfb->priv->show_wide ^ state) == 0 ++ || emfb->view.list == NULL ++ || emfb->view.preview_active == 0) { ++ emfb->priv->show_wide = state; ++ return; ++ } ++ ++ emfb->priv->show_wide = state; ++ ++ w = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new(); ++ ++ g_signal_handler_disconnect(emfb->vpane, emfb->priv->vpane_resize_id); ++ 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_widget_show(w); ++ gtk_box_pack_start_defaults((GtkBox *)emfb, w); ++ gtk_widget_reparent((GtkWidget *)emfb->view.list, w); ++ gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w); ++ gtk_widget_destroy(emfb->vpane); ++ emfb->vpane = w; ++} ++ + /* ********************************************************************** */ + + /* FIXME: Need to separate system rules from user ones */ +@@ -942,6 +973,21 @@ + } + + static void ++emfb_show_wide(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) ++{ ++ GConfClient *gconf; ++ EMFolderBrowser *emfb = data; ++ ++ if (type != Bonobo_UIComponent_STATE_CHANGED) ++ return; ++ ++ gconf = mail_config_get_gconf_client (); ++ gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_wide", state[0] != '0', NULL); ++ ++ em_folder_browser_show_wide(emfb, state[0] != '0'); ++} ++ ++static void + emfb_list_scrolled (MessageList *ml, EMFolderBrowser *emfb) + { + EMFolderView *emfv = (EMFolderView *) emfb; +@@ -1220,6 +1266,12 @@ + bonobo_ui_component_add_listener(uic, "ViewThreaded", emfb_view_threaded, emfv); + message_list_set_threaded(emfv->list, state); + ++ /* Show wide display */ ++ state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_wide", NULL); ++ bonobo_ui_component_set_prop(uic, "/commands/ViewWide", "state", state ? "1" : "0", NULL); ++ bonobo_ui_component_add_listener(uic, "ViewWide", emfb_show_wide, emfv); ++ em_folder_browser_show_wide((EMFolderBrowser *)emfv, state); ++ + /* FIXME: Selection state */ + + /* FIXME: property menu customisation */ +diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.h evolution-2.5.5.1/mail/em-folder-browser.h +--- evolution-2.5.5.1.orig/mail/em-folder-browser.h 2005-05-16 03:53:53.000000000 -0400 ++++ evolution-2.5.5.1/mail/em-folder-browser.h 2006-01-21 00:12:22.000000000 -0500 +@@ -51,6 +51,7 @@ + GtkWidget *em_folder_browser_new(void); + + void em_folder_browser_show_preview(EMFolderBrowser *emfv, gboolean state); ++void em_folder_browser_show_wide(EMFolderBrowser *emfv, gboolean state); + + #ifdef __cplusplus + } +diff -u -ruN evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in evolution-2.5.5.1/mail/evolution-mail.schemas.in.in +--- evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in 2006-01-02 06:38:59.000000000 -0500 ++++ evolution-2.5.5.1/mail/evolution-mail.schemas.in.in 2006-01-21 00:12:22.000000000 -0500 +@@ -360,6 +360,20 @@ + </schema> + + <schema> ++ <key>/schemas/apps/evolution/mail/display/show_wide</key> ++ <applyto>/apps/evolution/mail/display/show_wide</applyto> ++ <owner>evolution-mail</owner> ++ <type>bool</type> ++ <default>false</default> ++ <locale name="C"> ++ <short>Use side-by-side or vertical layout</short> ++ <long> ++ If the "Preview" pane is on, then show it side-by-side rather than vertically. ++ </long> ++ </locale> ++ </schema> ++ ++ <schema> + <key>/schemas/apps/evolution/mail/display/fonts/variable</key> + <applyto>/apps/evolution/mail/display/fonts/variable</applyto> + <owner>evolution-mail</owner> +diff -u -ruN evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in +--- evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in 2005-03-21 16:40:25.000000000 -0500 ++++ evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in 2006-01-21 00:12:22.000000000 -0500 +@@ -131,6 +131,18 @@ + </schema> + + <schema> ++ <key>/schemas/apps/evolution/shell/view_defaults/sidebar_visible</key> ++ <applyto>/apps/evolution/shell/view_defaults/sidebar_visible</applyto> ++ <owner>evolution</owner> ++ <type>bool</type> ++ <default>TRUE</default> ++ <locale name="C"> ++ <short>Sidebar is visible</short> ++ <long>Whether the sidebar should be visible.</long> ++ </locale> ++ </schema> ++ ++ <schema> + <key>/schemas/apps/evolution/shell/view_defaults/component_id</key> + <applyto>/apps/evolution/shell/view_defaults/component_id</applyto> + <owner>evolution</owner> +diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.c evolution-2.5.5.1/shell/e-shell-window.c +--- evolution-2.5.5.1.orig/shell/e-shell-window.c 2006-01-09 02:51:27.000000000 -0500 ++++ evolution-2.5.5.1/shell/e-shell-window.c 2006-01-21 00:12:22.000000000 -0500 +@@ -745,6 +745,15 @@ + visible ? "0" : "1", + NULL); + ++ visible = gconf_client_get_bool (gconf_client, ++ "/apps/evolution/shell/view_defaults/sidebar_visible", ++ NULL); ++ bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window), ++ "/commands/ViewSidebar", ++ "state", ++ visible ? "1" : "0", ++ NULL); ++ + button_id = 0; + xml = g_string_new(""); + for (p = e_component_registry_peek_list (registry); p != NULL; p = p->next) { +@@ -803,6 +812,9 @@ + gtk_box_pack_start (GTK_BOX (contents_vbox), priv->status_bar, FALSE, TRUE, 0); + gtk_widget_show (contents_vbox); + ++ if (!visible) ++ gtk_widget_hide (priv->sidebar); ++ + /* We only display this when a menu item is actually selected. */ + gtk_widget_hide (priv->menu_hint_label); + +@@ -810,7 +822,6 @@ + g_object_unref (gconf_client); + } + +- + /* GObject methods. */ + + static void +@@ -1094,6 +1105,19 @@ + g_free (prop); + } + ++ prop = bonobo_ui_component_get_prop (e_shell_window_peek_bonobo_ui_component (window), ++ "/commands/ViewSidebar", ++ "state", ++ NULL); ++ if (prop) { ++ visible = prop[0] == '1'; ++ gconf_client_set_bool (client, ++ "/apps/evolution/shell/view_defaults/sidebar_visible", ++ visible, ++ NULL); ++ g_free (prop); ++ } ++ + g_object_unref (client); + } + +diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.h evolution-2.5.5.1/shell/e-shell-window.h +--- evolution-2.5.5.1.orig/shell/e-shell-window.h 2006-01-02 06:39:13.000000000 -0500 ++++ evolution-2.5.5.1/shell/e-shell-window.h 2006-01-21 00:12:22.000000000 -0500 +@@ -52,7 +52,7 @@ + + + #include "e-shell.h" +- ++#include "e-sidebar.h" + + GType e_shell_window_get_type (void); + +diff -u -ruN evolution-2.5.5.1.orig/ui/evolution-mail-global.xml evolution-2.5.5.1/ui/evolution-mail-global.xml +--- evolution-2.5.5.1.orig/ui/evolution-mail-global.xml 2006-01-16 06:12:29.000000000 -0500 ++++ evolution-2.5.5.1/ui/evolution-mail-global.xml 2006-01-21 00:12:22.000000000 -0500 +@@ -35,6 +35,10 @@ + accel="*Control*m" + type="toggle"/> + ++ <cmd name="ViewWide" ++ _tip="Show message side-by-side with list" ++ type="toggle"/> ++ + </commands> + + <keybindings> +@@ -52,6 +56,7 @@ + <submenu name="View" _label="_View"> + <placeholder name="ViewPreview"> + <menuitem name="ViewPreview" verb="" _label="Message _Preview"/> ++ <menuitem name="ViewWide" verb="" _label="_View Side By Side"/> + </placeholder> + + <separator f="" name="emailglobal"/> +diff -u -ruN evolution-2.5.5.1.orig/ui/evolution.xml evolution-2.5.5.1/ui/evolution.xml +--- evolution-2.5.5.1.orig/ui/evolution.xml 2006-01-16 06:12:29.000000000 -0500 ++++ evolution-2.5.5.1/ui/evolution.xml 2006-01-21 00:13:47.000000000 -0500 +@@ -31,6 +31,9 @@ + <cmd name="ViewStatusBar" _label="_View Status Bar" type="toggle" + _tip="View/Hide the Status Bar" state="1"/> + ++ <cmd name="ViewSidebar" _label="_Sidebar" type="toggle" ++ _tip="Change the visibility of the sidebar" state="1"/> ++ + <cmd name="HelpSubmitBug" _label="Submit Bug Report" + _tip="Submit a bug report using Bug Buddy"/> + +@@ -112,6 +115,7 @@ + <placeholder name="ViewBegin"/> + <submenu name="Window" _label="_Window"/> + <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/> ++ <menuitem name="ViewSidebar" id="ViewSidebar" verb=""/> + <menuitem name="ViewStatusBar" id="ViewStatusBar"/> + <placeholder name="ViewPreview"/> + <submenu name="Buttons" _label="_Switcher Appearance"> |