* Reverted a previous change in the signal item_not_found

pmo-trunk-r559

diff --git a/src/modest-marshal.list b/src/modest-marshal.list
index 712fb2b..24502f4 100644 (file)
--- a/src/modest-marshal.list
+++ b/src/modest-marshal.list
@@ -6,5 +6,4 @@ VOID:STRING,INT,INT
 VOID:STRING,BOOL
 VOID:STRING,STRING,BOOL
 VOID:STRING,POINTER,POINTER,POINTER
-VOID:INT,POINTER
 

diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c
index f540fc9..1d8128d 100644 (file)
--- a/src/modest-widget-factory.c
+++ b/src/modest-widget-factory.c
@@ -75,7 +75,7 @@ static void on_password_requested (ModestTnyAccountStore *account_store, const g
                                   gchar **password, gboolean *cancel, gboolean *remember, ModestWidgetFactory *self);
 
 static void on_item_not_found     (ModestHeaderView* header_view, ModestItemType type,
-                                  gboolean *retry, ModestWidgetFactory *self);
+                                  ModestWidgetFactory *self);
 
 
 /* list my signals */
@@ -707,7 +707,7 @@ on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *self)
 
 static void
 on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
-                  gboolean *retry, ModestWidgetFactory *self)
+                  ModestWidgetFactory *self)
 {
        /* FIXME ==> ask from UI... */
        GtkWidget *dialog;
@@ -720,8 +720,8 @@ on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
        
        priv    = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
        device  = tny_account_store_get_device (priv->account_store);
-       *retry = FALSE;
        
+       gdk_threads_enter ();
        online = tny_device_is_online (device);
        if (online) {
                /* already online -- the item is simply not there... */
@@ -731,9 +731,7 @@ on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
                                                 GTK_BUTTONS_OK,
                                                 _("The %s you selected cannot be found"),
                                                 item);
-               gdk_threads_enter ();
                gtk_dialog_run (GTK_DIALOG(dialog));
-               gdk_threads_leave ();
        } else {
 
                dialog = gtk_dialog_new_with_buttons (_("Connection requested"),
@@ -753,14 +751,12 @@ on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
                g_free (txt);
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
-               gdk_threads_enter ();
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                        tny_device_force_online (device);
-                       *retry = TRUE;
                }
-               gdk_threads_leave ();
        }
        gtk_widget_destroy (dialog);
+       gdk_threads_leave ();
 }
 
 

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index a18f1df..0a8dcbe 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -128,8 +128,8 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestHeaderViewClass,item_not_found),
                              NULL, NULL,
-                             modest_marshal_VOID__INT_POINTER,
-                             G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
+                             g_cclosure_marshal_VOID__INT,
+                             G_TYPE_NONE, 1, G_TYPE_INT);
 
        signals[STATUS_UPDATE_SIGNAL] = 
                g_signal_new ("status_update",
@@ -891,7 +891,6 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
 {
        GetMsgAsyncHelper *helper;
        TnyHeaderFlags header_flags;
-       gboolean retry;
 
        helper = (GetMsgAsyncHelper *) user_data;
 
@@ -903,17 +902,12 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
                header_flags = tny_header_get_flags (helper->header);
                tny_header_set_flags (helper->header, header_flags | TNY_HEADER_FLAG_SEEN);
        } else {
-               g_signal_emit (G_OBJECT(helper->self), 
-                              signals[ITEM_NOT_FOUND_SIGNAL], 0,
-                              MODEST_ITEM_TYPE_MESSAGE, &retry);
-               if (retry)
-                       tny_folder_get_msg_async (TNY_FOLDER(folder), helper->header, 
-                                                 get_msg_cb, helper);
+               g_signal_emit (G_OBJECT(helper->self), signals[ITEM_NOT_FOUND_SIGNAL], 
+                              0, MODEST_ITEM_TYPE_MESSAGE);
        }
 
        /* Frees */
-       if (!retry)
-               g_slice_free (GetMsgAsyncHelper, helper);
+       g_slice_free (GetMsgAsyncHelper, helper);
 }
 
 static void