* remove checkbox-related properties for 1.1, as they are no longer available/needed.

[modest] / src / widgets / modest-window.c

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 18296bc..07629b0 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -41,7 +41,6 @@ static void        modest_window_set_zoom_default       (ModestWindow *window,
 static gdouble     modest_window_get_zoom_default       (ModestWindow *window);
 static gboolean    modest_window_zoom_plus_default      (ModestWindow *window);
 static gboolean    modest_window_zoom_minus_default     (ModestWindow *window);
-static void        modest_window_create_toolbar_default (ModestWindow *window);
 static void        modest_window_show_toolbar_default   (ModestWindow *window,
                                                         gboolean show_toolbar);
 
@@ -100,7 +99,6 @@ modest_window_class_init (ModestWindowClass *klass)
        klass->get_zoom_func = modest_window_get_zoom_default;
        klass->zoom_plus_func = modest_window_zoom_plus_default;
        klass->zoom_minus_func = modest_window_zoom_minus_default;
-       klass->create_toolbar_func = modest_window_create_toolbar_default;
        klass->show_toolbar_func = modest_window_show_toolbar_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate));
@@ -158,7 +156,9 @@ modest_window_set_active_account (ModestWindow *self, const gchar *active_accoun
                return;
        else {
                g_free (priv->active_account);
-               priv->active_account = g_strdup (active_account);
+               priv->active_account = NULL;
+               if (active_account)
+                       priv->active_account = g_strdup (active_account);
        }
 }
 
@@ -188,13 +188,7 @@ modest_window_zoom_minus (ModestWindow *window)
        return MODEST_WINDOW_GET_CLASS (window)->zoom_minus_func (window);
 }
 
-static void 
-modest_window_create_toolbar (ModestWindow *window)
-{
-       MODEST_WINDOW_GET_CLASS (window)->create_toolbar_func (window);
-}
-
-static void 
+void 
 modest_window_show_toolbar (ModestWindow *window,
                            gboolean show_toolbar)
 {
@@ -202,23 +196,6 @@ modest_window_show_toolbar (ModestWindow *window,
                                                             show_toolbar);
 }
 
-void 
-modest_window_view_toolbar (ModestWindow *window,
-                           gboolean show_toolbar)
-{
-       ModestWindowPrivate *priv;      
-
-       priv = MODEST_WINDOW_GET_PRIVATE(window);
-
-       /* Lazy strategy, we create the toolbar just when there is no
-          toolbar and we want to show it */
-       if (!priv->toolbar && show_toolbar)
-               modest_window_create_toolbar (window);
-
-       if (priv->toolbar)
-               modest_window_show_toolbar (window, show_toolbar);
-}
-
 
 /* Default implementations */
 
@@ -252,14 +229,16 @@ modest_window_zoom_minus_default (ModestWindow *window)
 }
 
 static void 
-modest_window_create_toolbar_default (ModestWindow *window)
+modest_window_show_toolbar_default (ModestWindow *window,
+                                   gboolean show_toolbar)
 {
        g_warning ("modest: You should implement %s", __FUNCTION__);
 }
 
-static void 
-modest_window_show_toolbar_default (ModestWindow *window,
-                                   gboolean show_toolbar)
+void
+modest_window_save_state (ModestWindow *window)
 {
-       g_warning ("modest: You should implement %s", __FUNCTION__);
+       ModestWindowClass *klass = MODEST_WINDOW_GET_CLASS (window);
+       if (klass->save_state_func)
+               klass->save_state_func (window);
 }