* small updates (send button in edit window)

pmo-trunk-r464

diff --git a/src/gtk2/modest-edit-msg-window.c b/src/gtk2/modest-edit-msg-window.c
index b3b62b8..468bf94 100644 (file)
--- a/src/gtk2/modest-edit-msg-window.c
+++ b/src/gtk2/modest-edit-msg-window.c
@@ -122,6 +122,8 @@ modest_edit_msg_window_init (ModestEditMsgWindow *obj)
 
 
 
+
+
 /* Our menu, an array of GtkItemFactoryEntry structures that defines each menu item */
 static GtkItemFactoryEntry menu_items[] = {
        { "/_File",             NULL,                   NULL,           0, "<Branch>" },
@@ -198,6 +200,31 @@ menubar_new (ModestEditMsgWindow *self)
 
 
 
+static void
+on_toolbar_button_clicked (ModestToolbar *toolbar, ModestToolbarButton button_id,
+                          ModestEditMsgWindow *self)
+{
+       switch (button_id) {
+       case MODEST_TOOLBAR_BUTTON_MAIL_SEND:
+               g_warning ("send the mail!");
+               gtk_widget_destroy (GTK_WIDGET(self));
+               break;
+               
+       case MODEST_TOOLBAR_BUTTON_REPLY:
+       case MODEST_TOOLBAR_BUTTON_REPLY_ALL:
+       case MODEST_TOOLBAR_BUTTON_FORWARD:
+       case MODEST_TOOLBAR_BUTTON_SEND_RECEIVE:
+       case MODEST_TOOLBAR_BUTTON_NEXT:
+       case MODEST_TOOLBAR_BUTTON_PREV:
+       case MODEST_TOOLBAR_BUTTON_DELETE:
+
+       default:
+               g_printerr ("modest: key %d pressed\n", button_id);
+       }
+}
+
+
+
 
 static ModestToolbar*
 toolbar_new (ModestEditMsgWindow *self)
@@ -218,6 +245,9 @@ toolbar_new (ModestEditMsgWindow *self)
        
        toolbar = modest_widget_factory_get_edit_toolbar (priv->factory, buttons);
        g_slist_free (buttons);
+
+       g_signal_connect (G_OBJECT(toolbar), "button_clicked",
+                         G_CALLBACK(on_toolbar_button_clicked), self);
        
        return toolbar;
 }
@@ -330,7 +360,7 @@ modest_edit_msg_window_new (ModestConf *conf, ModestWidgetFactory *factory,
        g_object_ref (factory);
        priv->factory = factory;
 
-       init_window (obj);
+       init_window (MODEST_EDIT_MSG_WINDOW(obj));
        
        modest_widget_memory_restore_settings (priv->conf, GTK_WIDGET(obj),
                                               "modest-edit-msg-body");

diff --git a/src/gtk2/modest-main-window.c b/src/gtk2/modest-main-window.c
index c0e8376..b863849 100644 (file)
--- a/src/gtk2/modest-main-window.c
+++ b/src/gtk2/modest-main-window.c
@@ -326,6 +326,28 @@ header_view_new (ModestMainWindow *self)
        return header_view;
 }
 
+static void
+on_toolbar_button_clicked (ModestToolbar *toolbar, ModestToolbarButton button_id,
+                          ModestMainWindow *self)
+{
+       switch (button_id) {
+       case MODEST_TOOLBAR_BUTTON_NEW_MAIL:
+               on_menu_new_message (self, 0, NULL);
+               break;
+               
+       case MODEST_TOOLBAR_BUTTON_REPLY:
+       case MODEST_TOOLBAR_BUTTON_REPLY_ALL:
+       case MODEST_TOOLBAR_BUTTON_FORWARD:
+       case MODEST_TOOLBAR_BUTTON_SEND_RECEIVE:
+       case MODEST_TOOLBAR_BUTTON_NEXT:
+       case MODEST_TOOLBAR_BUTTON_PREV:
+       case MODEST_TOOLBAR_BUTTON_DELETE:
+
+       default:
+               g_printerr ("modest: key %d pressed\n", button_id);
+       }
+}
+
 static ModestToolbar*
 toolbar_new (ModestMainWindow *self)
 {
@@ -356,6 +378,9 @@ toolbar_new (ModestMainWindow *self)
        toolbar = modest_widget_factory_get_main_toolbar (priv->factory, buttons);
        g_slist_free (buttons);
        
+       g_signal_connect (G_OBJECT(toolbar), "button_clicked",
+                         G_CALLBACK(on_toolbar_button_clicked), self);
+       
        return toolbar;
 }
 

diff --git a/src/gtk2/modest-ui.c b/src/gtk2/modest-ui.c
index 180e3dd..834b0dc 100644 (file)
--- a/src/gtk2/modest-ui.c
+++ b/src/gtk2/modest-ui.c
@@ -199,6 +199,7 @@ modest_ui_new (ModestConf *modest_conf)
 static gboolean
 on_main_window_delete_event (GtkWidget *widget, GdkEvent *event, ModestUI *self)
 {
+       g_warning (__FUNCTION__);
        gtk_main_quit ();
        return FALSE;
 }
@@ -207,7 +208,6 @@ on_main_window_delete_event (GtkWidget *widget, GdkEvent *event, ModestUI *self)
 GtkWidget*
 modest_ui_main_window (ModestUI *modest_ui)
 {
-       GtkWidget* win;
        ModestUIPrivate *priv;
 
        g_return_val_if_fail (modest_ui, NULL);