projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixes NB#85758, close the "pasting" banner if a move to operation fails
[modest]
/
src
/
modest-main.c
diff --git
a/src/modest-main.c
b/src/modest-main.c
index
2288c6f
..
b330ca2
100644
(file)
--- a/
src/modest-main.c
+++ b/
src/modest-main.c
@@
-45,8
+45,6
@@
typedef struct {
static gboolean
on_idle_exit_modest (gpointer data)
{
static gboolean
on_idle_exit_modest (gpointer data)
{
- ModestWindow *main_win;
- ModestWindowMgr *mgr;
MainSignalHandlers *handlers;
/* Protect the Gtk calls */
MainSignalHandlers *handlers;
/* Protect the Gtk calls */
@@
-59,12
+57,6
@@
on_idle_exit_modest (gpointer data)
g_signal_handler_disconnect (modest_runtime_get_window_mgr (),
handlers->window_list_handler);
g_signal_handler_disconnect (modest_runtime_get_window_mgr (),
handlers->window_list_handler);
- /* If the main window is still there but hidden, then unregister it */
- mgr = modest_runtime_get_window_mgr();
- main_win = modest_window_mgr_get_main_window (mgr, FALSE);
- if (main_win)
- modest_window_mgr_unregister_window (mgr, main_win);
-
/* Wait for remaining tasks */
while (gtk_events_pending ())
gtk_main_iteration ();
/* Wait for remaining tasks */
while (gtk_events_pending ())
gtk_main_iteration ();
@@
-80,16
+72,12
@@
static void
on_queue_empty (ModestMailOperationQueue *queue,
gpointer user_data)
{
on_queue_empty (ModestMailOperationQueue *queue,
gpointer user_data)
{
- guint num_windows = 0;
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
- ModestWindow *main_win = modest_window_mgr_get_main_window (mgr, FALSE);
/* Exit if the queue is empty and there are no more
windows. We can exit as well if the main window is hidden
and it's the only one */
/* Exit if the queue is empty and there are no more
windows. We can exit as well if the main window is hidden
and it's the only one */
- num_windows = modest_window_mgr_num_windows (mgr);
- if ((num_windows == 0) ||
- (num_windows == 1 && main_win && !GTK_WIDGET_VISIBLE (main_win)))
+ if (modest_window_mgr_num_windows (mgr) == 0)
g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, g_free);
}
g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, g_free);
}