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

common: remove the use of the GDK thread functions

Browse source 
Remove the use of gdk_threads_enter and gdk_threads_leave functions, as
they have been deprecated, and also replace gdk_threads_add_idle with
g_idle_add.

https://bugzilla.gnome.org/show_bug.cgi?id=688231
This commit is contained in:
Thomas Wood 2012-11-13 13:49:08 +00:00
parent 288c3f8309
commit 7dab589e9e
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/common/cc-common-language.c
View file

@ -308,7 +308,7 @@ cc_common_language_add_available_languages (GtkListStore *store,
data->regions = regions; data->regions = regions;
data->position = 0; data->position = 0;
return gdk_threads_add_idle (add_one_language, data); return g_idle_add (add_one_language, data);
} }
gchar * gchar *

4
panels/common/cc-language-chooser.c
View file

@ -47,12 +47,10 @@ cc_language_chooser_get_language (GtkWidget *chooser)
tv = (GtkTreeView *) g_object_get_data (G_OBJECT (chooser), "list"); tv = (GtkTreeView *) g_object_get_data (G_OBJECT (chooser), "list");
selection = gtk_tree_view_get_selection (tv); selection = gtk_tree_view_get_selection (tv);
gdk_threads_enter ();
if (gtk_tree_selection_get_selected (selection, &model, &iter)) if (gtk_tree_selection_get_selected (selection, &model, &iter))
gtk_tree_model_get (model, &iter, LOCALE_COL, &lang, -1); gtk_tree_model_get (model, &iter, LOCALE_COL, &lang, -1);
else else
lang = NULL; lang = NULL;
gdk_threads_leave ();
return lang; return lang;
} }
@ -248,9 +246,7 @@ filter_languages (GtkTreeModel *model,
return TRUE; return TRUE;
} }
gdk_threads_enter ();
gtk_tree_model_get (model, iter, DISPLAY_LOCALE_COL, &locale, -1); gtk_tree_model_get (model, iter, DISPLAY_LOCALE_COL, &locale, -1);
gdk_threads_leave ();
l = g_utf8_casefold (locale, -1); l = g_utf8_casefold (locale, -1);