2007-05-07 Murray Cumming <murrayc@murrayc.com>

[modest] / src / gnome / modest-msg-edit-window.c

diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c
index cbbe436..5fe035c 100644 (file)
--- a/src/gnome/modest-msg-edit-window.c
+++ b/src/gnome/modest-msg-edit-window.c
@@ -100,6 +100,22 @@ modest_msg_edit_window_get_type (void)
        return my_type;
 }
 
+
+static void
+save_state (ModestWindow *self)
+{
+       modest_widget_memory_save (modest_runtime_get_conf (),
+                                   G_OBJECT(self), "modest-edit-msg-window");
+}
+
+
+static void
+restore_settings (ModestMsgEditWindow *self)
+{
+       modest_widget_memory_restore (modest_runtime_get_conf (),
+                                     G_OBJECT(self), "modest-edit-msg-window");
+}
+
 static void
 modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
 {
@@ -110,6 +126,8 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
        gobject_class->finalize = modest_msg_edit_window_finalize;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
+
+       modest_window_class->save_state_func = save_state;
 }
 
 static void
@@ -128,22 +146,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->subject_field = NULL;
 }
 
-static void
-save_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_save (modest_runtime_get_conf (),
-                                   G_OBJECT(self), "modest-edit-msg-window");
-}
-
-
-static void
-restore_settings (ModestMsgEditWindow *self)
-{
-       modest_widget_memory_restore (modest_runtime_get_conf (),
-                                     G_OBJECT(self), "modest-edit-msg-window");
-}
-
-
 
 static ModestPairList*
 get_transports (void)
@@ -153,7 +155,7 @@ get_transports (void)
        GSList *cursor, *accounts;
        
        account_mgr = modest_runtime_get_account_mgr();
-       cursor = accounts = modest_account_mgr_account_names (account_mgr);
+       cursor = accounts = modest_account_mgr_account_names (account_mgr, TRUE);
        while (cursor) {
                gchar *account_name = (gchar*)cursor->data;
                gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
@@ -258,7 +260,7 @@ modest_msg_edit_window_finalize (GObject *obj)
 static gboolean
 on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self)
 {
-       save_settings (self);
+       modest_window_save_state (MODEST_WINDOW(self));
        return FALSE;
 }
 
@@ -546,80 +548,29 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
        g_message ("not implemented yet %s", __FUNCTION__);
 }
 
-#if 0 /* Not used. */
-static void
-modest_msg_edit_window_set_zoom (ModestWindow *window,
-                                gdouble zoom)
-{
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-
-}
 
-static gdouble
-modest_msg_edit_window_get_zoom (ModestWindow *window)
+void
+modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
 {
-       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), 1.0);
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
-       return 1.0;
+       g_message ("not implemented yet %s", __FUNCTION__);
 }
 
-static void
-modest_msg_edit_window_zoom_plus (GtkAction *action, ModestWindow *window)
+gboolean
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
 {
-       ModestWindowPrivate *parent_priv;
-       GtkRadioAction *zoom_radio_action;
-       GSList *group, *node;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
-                                                                        "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
-
-       group = gtk_radio_action_get_group (zoom_radio_action);
-
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-               /* FIXME: maemo */
-/*             hildon_banner_show_information (NULL, NULL, _("mcen_ib_max_zoom_level")); */
-               return;
-       }
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
 
-       for (node = group; node != NULL; node = g_slist_next (node)) {
-               if ((node->next != NULL) && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->next->data))) {
-                       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->data), TRUE);
-                       return;
-               }
-       }
-}
-
-static void
-modest_msg_edit_window_zoom_minus (GtkAction *action, ModestWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       GtkRadioAction *zoom_radio_action;
-       GSList *group, *node;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
-                                                                        "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
-
-       group = gtk_radio_action_get_group (zoom_radio_action);
-
-       for (node = group; node != NULL; node = g_slist_next (node)) {
-               if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->data))) {
-                       if (node->next != NULL)
-                               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
-                       /* FIXME: maemo */
-/*                     else */
-/*                             hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level")); */
-                       break;
-               }
-       }
+       g_message ("not implemented yet %s", __FUNCTION__);
+       return TRUE;
 }
-#endif
 
 void
-modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
-                                          TnyHeaderFlags priority_flags)
+modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
+                                       gint file_format)
 {
-       /* TODO */
-}
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
+       g_message ("not implemented yet %s", __FUNCTION__);
+}