* let frontend deal with toolbar clicks

* fix type in account-keys

pmo-trunk-r466

diff --git a/src/modest-account-keys.h b/src/modest-account-keys.h
index 9a5a825..345fea1 100644 (file)
--- a/src/modest-account-keys.h
+++ b/src/modest-account-keys.h
@@ -50,7 +50,7 @@
 
 /* server account keys */
 #define MODEST_ACCOUNT_PASSWORD          "password"          /* string */
-#define MODEST_ACCOUNT_REMEMBER_PWD     "remember_pwd"      /* boolean */
+#define MDOEST_ACCOUNT_REMEMBER_PWD     "remember_pwd"      /* boolean */
 #define MODEST_ACCOUNT_HOSTNAME          "hostname"          /* string */
 #define MODEST_ACCOUNT_USERNAME          "username"          /* string */
 #define MODEST_ACCOUNT_PROTO             "proto"             /* string */

diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c
index d4186ce..5348fce 100644 (file)
--- a/src/modest-widget-factory.c
+++ b/src/modest-widget-factory.c
@@ -56,8 +56,6 @@ static void on_connection_changed (TnyDeviceIface *device, gboolean online,
                                   ModestWidgetFactory *self);
 static void on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *factory);
 
-static void on_main_toolbar_button_clicked (ModestToolbar *toolbar, ModestToolbarButton button_id, 
-                                           ModestWidgetFactory *self);
 static void on_password_requested (ModestTnyAccountStore *account_store, const gchar* account_name,
                                   gchar **password, gboolean *cancel, ModestWidgetFactory *self);
 
@@ -414,9 +412,6 @@ modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self)
        return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->folder_info_label;
 }
 
-
-
-
 ModestToolbar*
 modest_widget_factory_get_main_toolbar (ModestWidgetFactory *self, 
                                        GSList *items)
@@ -433,9 +428,6 @@ modest_widget_factory_get_main_toolbar (ModestWidgetFactory *self,
                return NULL;
        }
        
-       g_signal_connect (G_OBJECT(priv->main_toolbar), "button_clicked",
-                         G_CALLBACK(on_main_toolbar_button_clicked), self);
-       
        return priv->main_toolbar;
 }
 
@@ -674,13 +666,6 @@ static void on_item_not_found     (ModestHeaderView* header_view, ModestItemType
 }
 
 
-static void
-on_main_toolbar_button_clicked (ModestToolbar *toolbar, ModestToolbarButton button_id, 
-                               ModestWidgetFactory *self)
-{
-       g_printerr ("modest: button %d clicked\n", button_id);
-}
-
 
 static void
 on_password_requested (ModestTnyAccountStore *account_store, const gchar* account_name,