Changeset 558

Timestamp:

07/05/06 12:43:58

Author:

pvanhoof

Message:

Unavailable functionality

Files:

• trunk/libtinymailui-gtk/tny-msg-view.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-msg-window.c (modified) (3 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-view-iface.c (modified) (1 diff)
• trunk/libtinymailui/tny-msg-view-iface.h (modified) (2 diffs)
• trunk/tinymail/tny-main.c (modified) (1 diff)
• trunk/tinymail/tny-summary-window.c (modified) (4 diffs)

trunk/libtinymailui-gtk/tny-msg-view.c

@@ -226 +226 @@
-}
-
+static void
+tny_msg_view_set_unavailable (TnyMsgViewIface *self, TnyMsgHeaderIface *header)
+{
+        TnyMsgViewPriv *priv = TNY_MSG_VIEW_GET_PRIVATE (self);
+        GtkTextBuffer *buffer;
+
+        buffer = gtk_text_view_get_buffer (priv->textview);
+        gtk_widget_hide (priv->attachview_sw);
+        gtk_text_buffer_set_text (buffer, _("Message is unavailable"), -1);
+        tny_msg_header_view_iface_set_header (priv->headerview, header);
+        gtk_widget_show (GTK_WIDGET (priv->headerview));
+
+        return;
+}
+
-static void 
-tny_msg_view_set_msg (TnyMsgViewIface *self, TnyMsgIface *msg)
@@ -360 +375 @@
-        klass->set_msg_func = tny_msg_view_set_msg;
-        klass->set_save_strategy_func = tny_msg_view_set_save_strategy;
+        klass->set_unavailable_func = tny_msg_view_set_unavailable;
-
-        return;

trunk/libtinymailui-gtk/tny-msg-window.c

@@ -34 +34 @@
-#define TNY_MSG_WINDOW_GET_PRIVATE(o)   \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MSG_WINDOW, TnyMsgWindowPriv))
+
+
+static void
+tny_msg_window_set_save_strategy (TnyMsgViewIface *self, TnySaveStrategyIface *strategy)
+{
+        TnyMsgWindowPriv *priv = TNY_MSG_WINDOW_GET_PRIVATE (self);
+
+        tny_msg_view_iface_set_save_strategy (priv->msg_view, strategy);
+
+        return;
+}
+
+static void
+tny_msg_window_set_unavailable (TnyMsgViewIface *self, TnyMsgHeaderIface *header)
+{
+        TnyMsgWindowPriv *priv = TNY_MSG_WINDOW_GET_PRIVATE (self);
+
+        tny_msg_view_iface_set_unavailable (priv->msg_view, header);
+
+        return;
+}
-
-
@@ -101 +122 @@
-}
-
+
-static void
-tny_msg_view_iface_init (gpointer g_iface, gpointer iface_data)
@@ -107 +129 @@
-
-        klass->set_msg_func = tny_msg_window_set_msg;
+        klass->set_save_strategy_func = tny_msg_window_set_save_strategy;
+        klass->set_unavailable_func = tny_msg_window_set_unavailable;
-
-        return;

trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c

@@ -196 +196 @@
-}
-
+static void
+tny_mozembed_msg_view_set_unavailable (TnyMsgViewIface *self, TnyMsgHeaderIface *header)
+{
+        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
+        GtkTextBuffer *buffer;
+
+        gtk_widget_hide (GTK_WIDGET (priv->htmlview));
+        gtk_widget_show (GTK_WIDGET (priv->textview));
+
+        buffer = gtk_text_view_get_buffer (priv->textview);
+        gtk_widget_hide (priv->attachview_sw);
+        gtk_text_buffer_set_text (buffer, _("Message is unavailable"), -1);
+        tny_msg_header_view_iface_set_header (priv->headerview, header);
+        gtk_widget_show (GTK_WIDGET (priv->headerview));
+
+        return;
+}
+
-
-static void
@@ -409 +427 @@
-        klass->set_msg_func = tny_moz_embed_msg_view_set_msg;
-        klass->set_save_strategy_func = tny_mozembed_msg_view_set_save_strategy;
+        klass->set_unavailable_func = tny_mozembed_msg_view_set_unavailable;
-
-        return;

trunk/libtinymailui/tny-msg-view-iface.c

@@ -21 +21 @@
-
-#include <tny-msg-view-iface.h>
+
+
+
+/**
+ * tny_msg_view_iface_set_unavailable:
+ * @self: A #TnyMsgViewIface instance
+ * @header: a #TnyMsgHeaderIface instance or NULL
+ *
+ * Set the view to display that the message was unavailable
+ * 
+ **/
+void
+tny_msg_view_iface_set_unavailable (TnyMsgViewIface *self, TnyMsgHeaderIface *header)
+{
+#ifdef DEBUG
+        if (!TNY_MSG_VIEW_IFACE_GET_CLASS (self)->set_unavailable_func)
+                g_critical ("You must implement tny_msg_view_iface_set_unavailable\n");
+#endif
+
+        TNY_MSG_VIEW_IFACE_GET_CLASS (self)->set_unavailable_func (self, header);
+        return;
+}
+
-
-/**

trunk/libtinymailui/tny-msg-view-iface.h

@@ -46 +46 @@
-        void (*set_msg_func)           (TnyMsgViewIface *self, TnyMsgIface *msg);
-        void (*set_save_strategy_func) (TnyMsgViewIface *self, TnySaveStrategyIface *strategy);
+        void (*set_unavailable_func)   (TnyMsgViewIface *self, TnyMsgHeaderIface *header);
-};
-
@@ -52 +53 @@
-void  tny_msg_view_iface_set_msg           (TnyMsgViewIface *self, TnyMsgIface *msg);
-void  tny_msg_view_iface_set_save_strategy (TnyMsgViewIface *self, TnySaveStrategyIface *strategy);
+void  tny_msg_view_iface_set_unavailable   (TnyMsgViewIface *self, TnyMsgHeaderIface *header);
-
-

trunk/tinymail/tny-main.c

@@ -66 +66 @@
-        gdk_threads_init ();
-
-// demo
-        /* g_object_unref (NULL); */
-
-#ifdef GNOME
-        gnome_vfs_init ();

trunk/tinymail/tny-summary-window.c

@@ -120 +120 @@
-        }
-
+        /* This method uses the TnyAccountTreeModel as a TnyListIface */
-        tny_account_store_iface_get_accounts (account_store, accounts,
-                TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS);
-
+
+        /* Here we use the TnyAccountTreeModel as a GtkTreeModelIface */
-        sortable = gtk_tree_model_sort_new_with_model (mailbox_model);
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
@@ -216 +219 @@
-        if (G_LIKELY (device))
-        {
-
-g_signal_connect (
+ g_signal_connect (
+       
-                                G_CALLBACK (connection_changed), self); 
-        }
-
-        /* g_object_ref (G_OBJECT (account_store)); */
-
-        priv->account_store = account_store;
-
-
-(
+(
+
-                G_CALLBACK (accounts_reloaded), priv);
-
@@ -237 +238 @@
-on_header_view_key_press_event (GtkTreeView *header_view, GdkEventKey *event, gpointer user_data)
-{
+        /* If the user presses the [Del] button on his keyboard */
+
-        if (event->keyval == GDK_Delete)
-        {
@@ -326 +329 @@
-                                        tny_msg_view_iface_set_msg (priv->msg_view, TNY_MSG_IFACE (msg));
-                                else 
-
-
-
-
+
-
-                        }
+                } else {
+                        tny_msg_view_iface_set_unavailable (priv->msg_view, NULL);
-                }
-        }