From 59257c20af50f8cf71398581f011c29268c22904 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Mar 2015 13:18:39 +0200 Subject: cleaned some xfce ebuilds already in portage tree && add xfce 4.12 fresh ebuilds --- ...fce4-appfinder-4.10.0-icon-theme-segfault.patch | 63 ---------------------- .../xfce4-appfinder-4.10.0-null-pointers.patch | 39 -------------- 2 files changed, 102 deletions(-) delete mode 100644 xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch delete mode 100644 xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch (limited to 'xfce-base/xfce4-appfinder/files') diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch deleted file mode 100644 index 02e3e7b1..00000000 --- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-icon-theme-segfault.patch +++ /dev/null @@ -1,63 +0,0 @@ -From eb46f5acd4b0b985a94bee6942d6527f9f620b84 Mon Sep 17 00:00:00 2001 -From: Nick Schermer -Date: Sat, 16 Mar 2013 18:03:01 +0000 -Subject: Detatch from icon theme to avoid segfault (bug #9730). - ---- -diff --git a/src/appfinder-window.c b/src/appfinder-window.c -index d3cd567..b5ca272 100644 ---- a/src/appfinder-window.c -+++ b/src/appfinder-window.c -@@ -129,6 +129,8 @@ struct _XfceAppfinderWindow - - XfceAppfinderActions *actions; - -+ GtkIconTheme *icon_theme; -+ - GtkEntryCompletion *completion; - - XfconfChannel *channel; -@@ -204,7 +206,6 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window) - GtkWidget *bbox; - GtkWidget *button; - GtkEntryCompletion *completion; -- GtkIconTheme *icon_theme; - gint integer; - - window->channel = xfconf_channel_get ("xfce4-appfinder"); -@@ -400,9 +401,10 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window) - image = gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - -- icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window))); -- g_signal_connect_swapped (G_OBJECT (icon_theme), "changed", -+ window->icon_theme = gtk_icon_theme_get_for_screen (gtk_window_get_screen (GTK_WINDOW (window))); -+ g_signal_connect_swapped (G_OBJECT (window->icon_theme), "changed", - G_CALLBACK (xfce_appfinder_window_icon_theme_changed), window); -+ g_object_ref (G_OBJECT (window->icon_theme)); - - /* load categories in the model */ - xfce_appfinder_window_category_set_categories (NULL, window); -@@ -432,6 +434,11 @@ xfce_appfinder_window_finalize (GObject *object) - g_signal_handler_disconnect (window->channel, window->property_watch_id); - g_signal_handler_disconnect (window->model, window->categories_changed_id); - -+ /* release our reference on the icon theme */ -+ g_signal_handlers_disconnect_by_func (G_OBJECT (window->icon_theme), -+ xfce_appfinder_window_icon_theme_changed, window); -+ g_object_unref (G_OBJECT (window->icon_theme)); -+ - g_object_unref (G_OBJECT (window->model)); - g_object_unref (G_OBJECT (window->category_model)); - g_object_unref (G_OBJECT (window->completion)); -@@ -1520,6 +1527,8 @@ xfce_appfinder_window_row_activated (XfceAppfinderWindow *window) - static void - xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window) - { -+ appfinder_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window)); -+ - if (window->icon_find != NULL) - g_object_unref (G_OBJECT (window->icon_find)); - window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48); --- -cgit v0.9.1 diff --git a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch b/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch deleted file mode 100644 index fa333fd0..00000000 --- a/xfce-base/xfce4-appfinder/files/xfce4-appfinder-4.10.0-null-pointers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2a14564c8e1677c002ffac8643f706b334050988 Mon Sep 17 00:00:00 2001 -From: Nick Schermer -Date: Sat, 08 Sep 2012 09:55:19 +0000 -Subject: Protect against possible null pointers (bug #9109). - -(cherry picked from commit 424418316733e3f8b9b17cd7345fe6d967b06ef8) ---- -diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c -index 483c4cc..3f3a060 100644 ---- a/src/appfinder-category-model.c -+++ b/src/appfinder-category-model.c -@@ -589,6 +589,7 @@ xfce_appfinder_category_model_icon_theme_changed (XfceAppfinderCategoryModel *mo - for (li = model->categories, idx = 0; li != NULL; li = li->next, idx++) - { - item = li->data; -+ appfinder_assert (item != NULL); - - if (item->pixbuf != NULL) - { -diff --git a/src/appfinder-window.c b/src/appfinder-window.c -index 155e011..4f99c6a 100644 ---- a/src/appfinder-window.c -+++ b/src/appfinder-window.c -@@ -1453,8 +1453,11 @@ xfce_appfinder_window_icon_theme_changed (XfceAppfinderWindow *window) - window->icon_find = xfce_appfinder_model_load_pixbuf (GTK_STOCK_FIND, XFCE_APPFINDER_ICON_SIZE_48); - - /* drop cached pixbufs */ -- xfce_appfinder_model_icon_theme_changed (window->model); -- xfce_appfinder_category_model_icon_theme_changed (window->category_model); -+ if (G_LIKELY (window->model != NULL)) -+ xfce_appfinder_model_icon_theme_changed (window->model); -+ -+ if (G_LIKELY (window->category_model != NULL)) -+ xfce_appfinder_category_model_icon_theme_changed (window->category_model); - - /* update state */ - xfce_appfinder_window_entry_changed (window); --- -cgit v0.9.0.3 -- cgit v1.2.3