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

user-accounts: Fix timeout hack to not crash

Browse source 
Could end up crashing the way we implemented it.
This commit is contained in:
Bastien Nocera 2011-01-25 18:33:47 +00:00
parent e48c04a092
commit 226aa064aa
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
panels/user-accounts/um-language-dialog.c
View file

@ -181,6 +181,14 @@ um_add_user_languages (GtkTreeModel *model)
g_hash_table_destroy (user_langs); g_hash_table_destroy (user_langs);
} }
static void
remove_timeout (gpointer data,
GObject *where_the_object_was)
{
guint timeout = GPOINTER_TO_UINT (data);
g_source_remove (timeout);
}
static gboolean static gboolean
finish_um_language_chooser (gpointer user_data) finish_um_language_chooser (gpointer user_data)
{ {
@ -189,6 +197,7 @@ finish_um_language_chooser (gpointer user_data)
GtkTreeModel *model; GtkTreeModel *model;
GtkWindow *parent; GtkWindow *parent;
GHashTable *user_langs; GHashTable *user_langs;
guint timeout;
/* Did we get called after the widget was destroyed? */ /* Did we get called after the widget was destroyed? */
if (chooser == NULL) if (chooser == NULL)
@ -204,6 +213,8 @@ finish_um_language_chooser (gpointer user_data)
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (parent)), NULL); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (parent)), NULL);
g_object_set_data (G_OBJECT (chooser), "user-langs", NULL); g_object_set_data (G_OBJECT (chooser), "user-langs", NULL);
timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (chooser), "timeout"));
g_object_weak_unref (G_OBJECT (chooser), (GWeakNotify) remove_timeout, GUINT_TO_POINTER (timeout));
return FALSE; return FALSE;
} }
@ -220,6 +231,7 @@ um_language_chooser_new (GtkWidget *parent)
GtkTreeModel *model; GtkTreeModel *model;
GHashTable *user_langs; GHashTable *user_langs;
GdkCursor *cursor; GdkCursor *cursor;
guint timeout;
builder = gtk_builder_new (); builder = gtk_builder_new ();
filename = UIDIR "/language-chooser.ui"; filename = UIDIR "/language-chooser.ui";
@ -254,8 +266,9 @@ um_language_chooser_new (GtkWidget *parent)
g_object_set_data_full (G_OBJECT (chooser), "user-langs", g_object_set_data_full (G_OBJECT (chooser), "user-langs",
user_langs, (GDestroyNotify) g_hash_table_destroy); user_langs, (GDestroyNotify) g_hash_table_destroy);
g_object_add_weak_pointer (G_OBJECT (chooser), (gpointer *) &chooser); timeout = g_idle_add ((GSourceFunc) finish_um_language_chooser, chooser);
g_idle_add ((GSourceFunc) finish_um_language_chooser, chooser); g_object_set_data (G_OBJECT (chooser), "timeout", GUINT_TO_POINTER (timeout));
g_object_weak_ref (G_OBJECT (chooser), (GWeakNotify) remove_timeout, GUINT_TO_POINTER (timeout));
g_object_unref (builder); g_object_unref (builder);