* Added src/widgets/modest-recpt-view.[ch].
[modest] / src / modest-ui-actions.c
index 490b9bd..24d0376 100644 (file)
@@ -78,13 +78,12 @@ static void     reply_forward_func     (gpointer data, gpointer user_data);
 static void     read_msg_func          (gpointer data, gpointer user_data);
 static void     get_msg_cb             (TnyFolder *folder, TnyMsg *msg,        GError **err, 
                                        gpointer user_data);
-static void     reply_forward          (GtkWidget *widget, ReplyForwardAction action,
-                                       ModestWindow *win);
+static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
 
 
 void   
-modest_ui_actions_on_about (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
        GtkWidget *about;
        const gchar *authors[] = {
@@ -140,11 +139,10 @@ get_selected_headers (ModestWindow *win)
 }
 
 void
-modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 {
        TnyList *header_list;
        TnyIterator *iter;
-//     GtkTreeModel *model;
 
        g_return_if_fail (MODEST_IS_WINDOW(win));
                
@@ -152,9 +150,6 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
        
        if (header_list) {
                iter = tny_list_create_iterator (header_list);
-/*             model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */
-/*             if (GTK_IS_TREE_MODEL_SORT (model)) */
-/*                     model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model)); */
                do {
                        TnyHeader *header;
                        ModestMailOperation *mail_op;
@@ -166,15 +161,11 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
 
                        /* TODO: add confirmation dialog */
 
-                       /* Move to trash */
-                       modest_mail_operation_remove_msg (mail_op, header, TRUE);
+                       /* Move to trash. TODO: Still not supported */
+                       modest_mail_operation_remove_msg (mail_op, header, FALSE);
 
-                       /* Remove from tree model */
-                       if (modest_mail_operation_get_status (mail_op) ==
+                       if (modest_mail_operation_get_status (mail_op) !=
                            MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
-/*                             tny_list_remove (TNY_LIST (model), G_OBJECT (header)); */
-                       } else {
-                               /* TODO: error handling management */
                                const GError *error;
                                error = modest_mail_operation_get_error (mail_op);
                                if (error)
@@ -191,7 +182,7 @@ modest_ui_actions_on_delete (GtkWidget *widget, ModestWindow *win)
 
 
 void
-modest_ui_actions_on_quit (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
        /* FIXME: save size of main window */
 /*     save_sizes (main_window); */
@@ -199,19 +190,41 @@ modest_ui_actions_on_quit (GtkWidget *widget, ModestWindow *win)
 }
 
 void
-modest_ui_actions_on_accounts (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
-       GtkWidget *account_win;
-       account_win = modest_account_view_window_new ();
-
-       if (win)
-               gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+       /* GtkDialog *account_win; */
+/*     account_win = GTK_DIALOG(modest_account_view_window_new ()); */
+       
 
-       gtk_widget_show (account_win);
+/*     gtk_dialog_run (account_win); */
+       //gtk_widget_destroy (GTK_WIDGET(account_win));
+ GtkWidget *dialog, *label;
+   
+   /* Create the widgets */
+   
+   dialog = gtk_dialog_new_with_buttons ("Message",
+                                         GTK_WINDOW(win),
+                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         GTK_STOCK_OK,
+                                         GTK_RESPONSE_NONE,
+                                         NULL);
+   label = gtk_label_new ("Hello World!");
+   
+   /* Ensure that the dialog box is destroyed when the user responds. */
+   
+   g_signal_connect_swapped (dialog, "response", 
+                             G_CALLBACK (gtk_widget_destroy),
+                             dialog);
+
+   /* Add the label, and show everything we've added to the dialog. */
+
+   gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+                      label);
+   gtk_widget_show_all (dialog);
 }
 
 void
-modest_ui_actions_on_new_msg (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
        ModestWindow *msg_win;
        TnyMsg *msg = NULL;
@@ -274,7 +287,7 @@ cleanup:
 
 
 void
-modest_ui_actions_on_open (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_open (GtkAction *action, ModestWindow *win)
 {
        modest_runtime_not_implemented (GTK_WINDOW(win)); /* FIXME */
 }
@@ -370,7 +383,7 @@ cleanup:
  * Common code for the reply and forward actions
  */
 static void
-reply_forward (GtkWidget *widget, ReplyForwardAction action, ModestWindow *win)
+reply_forward (ReplyForwardAction action, ModestWindow *win)
 {
        TnyList *header_list;
        guint reply_forward_type;
@@ -434,31 +447,31 @@ reply_forward (GtkWidget *widget, ReplyForwardAction action, ModestWindow *win)
 
 
 void
-modest_ui_actions_on_reply (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_reply (GtkAction *action, ModestWindow *win)
 {
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
-       reply_forward (widget, ACTION_REPLY, win);
+       reply_forward (ACTION_REPLY, win);
 }
 
 void
-modest_ui_actions_on_forward (GtkWidget *widget, ModestWindow *win)
+modest_ui_actions_on_forward (GtkAction *action, ModestWindow *win)
 {
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
-       reply_forward (widget, ACTION_FORWARD, win);
+       reply_forward (ACTION_FORWARD, win);
 }
 
 void
-modest_ui_actions_on_reply_all (GtkWidget *widget,ModestWindow *win)
+modest_ui_actions_on_reply_all (GtkAction *action, ModestWindow *win)
 {
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
-       reply_forward (widget, ACTION_REPLY_TO_ALL, win);
+       reply_forward (ACTION_REPLY_TO_ALL, win);
 }
 
 void 
-modest_ui_actions_on_next (GtkWidget *widget, 
+modest_ui_actions_on_next (GtkAction *action, 
                           ModestMainWindow *main_window)
 {
        GtkWidget *header_view;
@@ -473,7 +486,7 @@ modest_ui_actions_on_next (GtkWidget *widget,
 }
 
 void 
-modest_ui_actions_on_prev (GtkWidget *widget, 
+modest_ui_actions_on_prev (GtkAction *action, 
                           ModestMainWindow *main_window)
 {
        GtkWidget *header_view;
@@ -489,11 +502,12 @@ modest_ui_actions_on_prev (GtkWidget *widget,
 
 
 void
-modest_ui_actions_on_send_receive (GtkWidget *widget,  ModestWindow *win)
+modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
 {
        gchar *account_name;
        TnyAccount *tny_account;
-       ModestTnySendQueue *send_queue;
+       //ModestTnySendQueue *send_queue;
+       ModestMailOperation *mail_op;
        
        account_name =
                g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
@@ -503,27 +517,48 @@ modest_ui_actions_on_send_receive (GtkWidget *widget,  ModestWindow *win)
                g_printerr ("modest: cannot get account\n");
                return;
        }
-       
+       /* FIXME */
+#if 0
        tny_account = 
                modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
                                                                     account_name,
                                                                     TNY_ACCOUNT_TYPE_TRANSPORT);
        if (!tny_account) {
-               g_printerr ("modest: cannot get tny transport account\n");
+               g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
                return;
        }
 
        send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
+       if (!send_queue) {
+               g_object_unref (G_OBJECT(tny_account));
+               g_printerr ("modest: cannot get send queue for %s\n", account_name);
+               return;
+       } 
        modest_tny_send_queue_flush (send_queue);
 
        g_object_unref (G_OBJECT(send_queue));
        g_object_unref (G_OBJECT(tny_account));
+#endif /*  0 */
+       tny_account = 
+               modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+                                                                    account_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
+       if (!tny_account) {
+               g_printerr ("modest: cannot get tny store account for %s\n", account_name);
+               return;
+       }
+
+       mail_op = modest_mail_operation_new ();
+       modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
+
+       g_object_unref (G_OBJECT(tny_account));
+       /* g_object_unref (G_OBJECT(mail_op)); FIXME: this is still in use... */
 }
 
 
 
 void
-modest_ui_actions_toggle_view (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_toggle_view (GtkAction *action, ModestMainWindow *main_window)
 {
        ModestConf *conf;
        GtkWidget *header_view;
@@ -575,7 +610,6 @@ read_msg_func (gpointer data, gpointer user_data)
        if (!msg_preview)
                return;
        
-       /* mark message as seen; _set_flags crashes, bug in tinymail? */
        header = TNY_HEADER (tny_iterator_get_current (helper->iter));
        header_flags = tny_header_get_flags (header);
        tny_header_set_flags (header, header_flags | TNY_HEADER_FLAG_SEEN);
@@ -932,6 +966,27 @@ modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, int index,
 }
 
 void
+modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview,
+                                         ModestRecptView *recpt_view,
+                                         ModestWindow *win)
+{
+       gint start, end;
+       gchar *utf_start, *utf_end;
+       gchar *full_string = NULL;
+       gchar *substring;
+
+       gtk_label_get_selection_bounds (GTK_LABEL (recpt_view), &start, &end);
+       full_string = (gchar *) gtk_label_get_text (GTK_LABEL (recpt_view));
+       utf_start = g_utf8_offset_to_pointer (full_string, start);
+       utf_end = g_utf8_offset_to_pointer (full_string, end);
+       substring = g_strndup (utf_start, utf_end - utf_start);
+       g_message ("%s %s", __FUNCTION__, substring);
+
+       g_free (substring);
+       
+}
+
+void
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account;
@@ -1033,7 +1088,7 @@ ask_for_folder_name (GtkWindow *parent_window,
 }
 
 void 
-modest_ui_actions_on_new_folder (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
 {
        TnyFolder *parent_folder;
        GtkWidget *folder_view;
@@ -1076,7 +1131,7 @@ modest_ui_actions_on_new_folder (GtkWidget *widget, ModestMainWindow *main_windo
 }
 
 void 
-modest_ui_actions_on_rename_folder (GtkWidget *widget,
+modest_ui_actions_on_rename_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
        TnyFolder *folder;
@@ -1144,7 +1199,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 }
 
 void 
-modest_ui_actions_on_delete_folder (GtkWidget *widget,
+modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
@@ -1153,7 +1208,7 @@ modest_ui_actions_on_delete_folder (GtkWidget *widget,
 }
 
 void 
-modest_ui_actions_on_move_folder_to_trash_folder (GtkWidget *widget, ModestMainWindow *main_window)
+modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainWindow *main_window)
 {
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));