Bug 593881 - Category icons do not appear in preview pane

2 files changed, 51 insertions, 1 deletions

diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index f1d331fab3..0a96d29664 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -24,6 +24,24 @@
 #include "widgets/menus/gal-view-factory-etable.h"
 
 static void
+memo_shell_view_preview_on_url_cb (EShellView *shell_view,
+                                   const gchar *url)
+{
+	EShellTaskbar *shell_taskbar;
+	gchar *message;
+
+	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
+
+	if (url == NULL || *url == '\0')
+		e_shell_taskbar_set_message (shell_taskbar, NULL);
+	else {
+		message = g_strdup_printf (_("Click to open %s"), url);
+		e_shell_taskbar_set_message (shell_taskbar, message);
+		g_free (message);
+	}
+}
+
+static void
 memo_shell_view_table_popup_event_cb (EShellView *shell_view,
                                       GdkEventButton *event)
 {
@@ -171,6 +189,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
 	EShellWindow *shell_window;
+	ECalComponentPreview *memo_preview;
 	EMemoTable *memo_table;
 	ECalModel *model;
 	ETable *table;
@@ -191,6 +210,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	priv->memo_shell_sidebar = g_object_ref (shell_sidebar);
 
 	memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content);
+	memo_preview = e_memo_shell_content_get_memo_preview (memo_shell_content);
 	memo_table = e_memo_shell_content_get_memo_table (memo_shell_content);
 	model = e_memo_table_get_model (memo_table);
 	table = e_memo_table_get_table (memo_table);
@@ -204,6 +224,11 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 		memo_shell_view);
 
 	g_signal_connect_swapped (
+		memo_preview, "on-url",
+		G_CALLBACK (memo_shell_view_preview_on_url_cb),
+		memo_shell_view);
+
+	g_signal_connect_swapped (
 		memo_table, "open-component",
 		G_CALLBACK (e_memo_shell_view_open_memo),
 		memo_shell_view);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 87bb6984dc..380d54ef3d 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -47,6 +47,24 @@ task_shell_view_process_completed_tasks (ETaskShellView *task_shell_view)
 }
 
 static void
+task_shell_view_preview_on_url_cb (EShellView *shell_view,
+                                   const gchar *url)
+{
+	EShellTaskbar *shell_taskbar;
+	gchar *message;
+
+	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
+
+	if (url == NULL || *url == '\0')
+		e_shell_taskbar_set_message (shell_taskbar, NULL);
+	else {
+		message = g_strdup_printf (_("Click to open %s"), url);
+		e_shell_taskbar_set_message (shell_taskbar, message);
+		g_free (message);
+	}
+}
+
+static void
 task_shell_view_table_popup_event_cb (EShellView *shell_view,
                                       GdkEventButton *event)
 {
@@ -214,12 +232,13 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	ETaskShellContent *task_shell_content;
 	ETaskShellSidebar *task_shell_sidebar;
 	EShell *shell;
+	EShellView *shell_view;
 	EShellBackend *shell_backend;
 	EShellContent *shell_content;
 	EShellSettings *shell_settings;
 	EShellSidebar *shell_sidebar;
 	EShellWindow *shell_window;
-	EShellView *shell_view;
+	ECalComponentPreview *task_preview;
 	ECalendarTable *task_table;
 	ECalModel *model;
 	ETable *table;
@@ -243,6 +262,7 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	priv->task_shell_sidebar = g_object_ref (shell_sidebar);
 
 	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
+	task_preview = e_task_shell_content_get_task_preview (task_shell_content);
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 	model = e_calendar_table_get_model (task_table);
 	table = e_calendar_table_get_table (task_table);
@@ -256,6 +276,11 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 		task_shell_view);
 
 	g_signal_connect_swapped (
+		task_preview, "on-url",
+		G_CALLBACK (task_shell_view_preview_on_url_cb),
+		task_shell_view);
+
+	g_signal_connect_swapped (
 		task_table, "open-component",
 		G_CALLBACK (e_task_shell_view_open_task),
 		task_shell_view);