Attachment 891036 Details for Bug 1092857 – Fix repeated deactivation requests

[patch] Fix repeated deactivation requests

fix-repeated-deactivation-requests.patch (text/plain), 1.54 KB, created by Siteshwar Vashisht on 2014-04-30 07:16:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siteshwar Vashisht

Created: 2014-04-30 07:16:20 UTC

Size: 1.54 KB

patch

obsolete

>diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
>index 09a3273..79f77cb 100644
>--- a/src/gs-window-x11.c
>+++ b/src/gs-window-x11.c
>@@ -84,6 +84,7 @@ struct GSWindowPrivate
>         GdkPixmap *background_pixmap;
> 
>         guint      popup_dialog_idle_id;
>+        guint      deactivated_idle_id;
> 
>         guint      dialog_map_signal_id;
>         guint      dialog_unmap_signal_id;
>@@ -726,13 +727,15 @@ emit_deactivated_idle (GSWindow *window)
> {
>         g_signal_emit (window, signals [DEACTIVATED], 0);
> 
>+        window->priv->deactivated_idle_id = 0;
>+
>         return FALSE;
> }
> 
> static void
> add_emit_deactivated_idle (GSWindow *window)
> {
>-        g_idle_add ((GSourceFunc)emit_deactivated_idle, window);
>+        window->priv->deactivated_idle_id = g_idle_add ((GSourceFunc)emit_deactivated_idle, window);
> }
> 
> static void
>@@ -1556,7 +1559,7 @@ lock_command_watch (GIOChannel   *source,
>         if (finished) {
>                 popdown_dialog (window);
> 
>-                if (window->priv->dialog_response == DIALOG_RESPONSE_OK) {
>+                if ( (window->priv->dialog_response == DIALOG_RESPONSE_OK) && (! window->priv->deactivated_idle_id) ) {
>                         add_emit_deactivated_idle (window);
>                 }
> 
>@@ -1678,7 +1681,7 @@ gs_window_request_unlock (GSWindow *window)
>                 return;
>         }
> 
>-        if (! window->priv->lock_enabled) {
>+        if ( (! window->priv->lock_enabled) && (! window->priv->deactivated_idle_id) ) {
>                 add_emit_deactivated_idle (window);
> 
>                 return;

Flags:

rstrode: review+

Actions: View | Diff

Attachments on bug 1092857: 891036