applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Avoid multiple language dialogues

Browse source 
If the changed signal was emitted again before we got a chance
to create the language dialogue in the idle handler, we'd end up
with two (or more) dialogues.
This commit is contained in:
Bastien Nocera 2011-01-21 15:11:29 +00:00
parent 03a31f0fe9
commit 05bef7fba7
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
panels/user-accounts/um-user-panel.c
View file

@ -71,6 +71,7 @@ struct _UmUserPanelPrivate {
GtkWidget *lock_button; GtkWidget *lock_button;
GPermission *permission; GPermission *permission;
GtkWidget *language_chooser; GtkWidget *language_chooser;
guint language_chooser_idle;
UmAccountDialog *account_dialog; UmAccountDialog *account_dialog;
UmPasswordDialog *password_dialog; UmPasswordDialog *password_dialog;
@ -653,6 +654,8 @@ finish_language_chooser (UmUserPanelPrivate *d)
gtk_window_present (GTK_WINDOW (d->language_chooser)); gtk_window_present (GTK_WINDOW (d->language_chooser));
gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
d->language_chooser_idle = 0;
return FALSE; return FALSE;
} }
@ -687,12 +690,16 @@ language_changed (UmEditableCombo *combo,
return; return;
} }
/* Already in flight? */
if (d->language_chooser_idle > 0)
return;
cursor = gdk_cursor_new (GDK_WATCH); cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (gtk_widget_get_window (gtk_widget_get_toplevel (d->notebook)), gdk_window_set_cursor (gtk_widget_get_window (gtk_widget_get_toplevel (d->notebook)),
cursor); cursor);
gdk_cursor_unref (cursor); gdk_cursor_unref (cursor);
g_idle_add ((GSourceFunc)finish_language_chooser, d); d->language_chooser_idle = g_idle_add ((GSourceFunc)finish_language_chooser, d);
} }
static void static void
@ -1259,6 +1266,10 @@ um_user_panel_dispose (GObject *object)
um_photo_dialog_free (priv->photo_dialog); um_photo_dialog_free (priv->photo_dialog);
priv->photo_dialog = NULL; priv->photo_dialog = NULL;
} }
if (priv->language_chooser_idle > 0) {
g_source_remove (priv->language_chooser_idle);
priv->language_chooser_idle = 0;
}
if (priv->language_chooser) { if (priv->language_chooser) {
gtk_widget_destroy (priv->language_chooser); gtk_widget_destroy (priv->language_chooser);
priv->language_chooser = NULL; priv->language_chooser = NULL;