[Xfce4-commits] [xfce/xfce4-appfinder] 06/13: Using gdk_threads_add_idle_full to remove gdk_threads_* macro deprecation
noreply at xfce.org
noreply at xfce.org
Mon Jul 17 03:22:13 CEST 2017
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-appfinder.
commit 5c4756273991b3b1f6409f8bb7038b89ab442c87
Author: Eduard Roccatello <eduard at xfce.org>
Date: Fri Oct 23 22:43:49 2015 +0200
Using gdk_threads_add_idle_full to remove gdk_threads_* macro deprecation
---
src/appfinder-model.c | 6 +-----
src/appfinder-window.c | 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/appfinder-model.c b/src/appfinder-model.c
index efcffea..5be198e 100644
--- a/src/appfinder-model.c
+++ b/src/appfinder-model.c
@@ -738,8 +738,6 @@ xfce_appfinder_model_collect_idle (gpointer user_data)
APPFINDER_DEBUG ("insert idle start");
- GDK_THREADS_ENTER ();
-
/* move the collected items "online" */
model->items = model->collect_items;
model->collect_items = NULL;
@@ -794,8 +792,6 @@ xfce_appfinder_model_collect_idle (gpointer user_data)
g_slist_free (tmp);
}
- GDK_THREADS_LEAVE ();
-
APPFINDER_DEBUG ("insert idle end");
return FALSE;
@@ -1898,7 +1894,7 @@ xfce_appfinder_model_collect_thread (gpointer user_data)
model->collect_items = g_slist_sort (model->collect_items, xfce_appfinder_model_item_compare);
model->collect_categories = g_slist_sort (model->collect_categories, xfce_appfinder_model_category_compare);
- model->collect_idle_id = g_idle_add_full (G_PRIORITY_LOW, xfce_appfinder_model_collect_idle,
+ model->collect_idle_id = gdk_threads_add_idle_full (G_PRIORITY_LOW, xfce_appfinder_model_collect_idle,
model, xfce_appfinder_model_collect_idle_destroy);
}
diff --git a/src/appfinder-window.c b/src/appfinder-window.c
index df48524..74007da 100644
--- a/src/appfinder-window.c
+++ b/src/appfinder-window.c
@@ -1158,7 +1158,6 @@ xfce_appfinder_window_entry_changed_idle (gpointer data)
gchar *normalized;
GtkTreeModel *model;
- GDK_THREADS_ENTER ();
text = gtk_entry_get_text (GTK_ENTRY (window->entry));
@@ -1194,7 +1193,6 @@ xfce_appfinder_window_entry_changed_idle (gpointer data)
g_object_unref (G_OBJECT (pixbuf));
}
- GDK_THREADS_LEAVE ();
return FALSE;
}
@@ -1216,7 +1214,7 @@ xfce_appfinder_window_entry_changed (XfceAppfinderWindow *window)
g_source_remove (window->idle_entry_changed_id);
window->idle_entry_changed_id =
- g_idle_add_full (G_PRIORITY_DEFAULT, xfce_appfinder_window_entry_changed_idle,
+ gdk_threads_add_idle_full (G_PRIORITY_DEFAULT, xfce_appfinder_window_entry_changed_idle,
window, xfce_appfinder_window_entry_changed_idle_destroyed);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list