[SCM] mate-file-manager Debian package branch, master, updated. 7fdbde7946f75b289872cd0462aef2dd691de9d8
Stefano Karapetsas
stefanokarapetsas-guest at alioth.debian.org
Wed Oct 16 12:59:37 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-file-manager.git;a=commitdiff;h=7fdbde7
The following commit has been merged in the master branch:
commit 7fdbde7946f75b289872cd0462aef2dd691de9d8
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date: Wed Oct 16 14:59:27 2013 +0200
Remove old patches
---
debian/patches/00-fix-radio-buttons.patch | 120 --------------------
debian/patches/01-fix-default-sort-order.patch | 21 ----
debian/patches/02-fix-spatial-mode.patch | 21 ----
.../03-fix-for-x-caja-desktop-windows.patch | 22 ----
debian/patches/04-fix-binary-check.patch | 23 ----
debian/patches/05-fix-binary-check-2.patch | 43 -------
debian/patches/06-fix-thumbnails-frames.patch | 71 ------------
debian/patches/07-fix-thumbnails-frames-2.patch | 37 ------
debian/patches/08-fix-segfault.patch | 69 -----------
debian/patches/series | 10 --
10 files changed, 437 deletions(-)
diff --git a/debian/patches/00-fix-radio-buttons.patch b/debian/patches/00-fix-radio-buttons.patch
deleted file mode 100644
index 63643c0..0000000
--- a/debian/patches/00-fix-radio-buttons.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 0491e02f9023ec71a12c3b873b7f60e40b01c8fc Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Fri, 12 Apr 2013 15:30:09 +0000
-Subject: Fix radio buttons and GSettings in preferences window
-
-Closes: https://github.com/mate-desktop/mate-file-manager/issues/104
-Patch from: https://git.gnome.org/browse/nautilus/commit/?id=f200bfb
----
-diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
-index 3db0d05..1de7952 100644
---- a/src/caja-file-management-properties.c
-+++ b/src/caja-file-management-properties.c
-@@ -839,49 +839,37 @@ bind_builder_uint_enum (GtkBuilder *builder,
- binding, g_free);
- }
-
--typedef struct {
-- GtkWidget *button;
-- const char *value;
-- const char *key;
-- GSettings *settings;
--} RadioBinding;
--
--static void
--radio_binding_setting_changed (GSettings *settings,
-- const gchar *key,
-- gpointer user_data)
-+static GVariant *
-+radio_mapping_set (const GValue *gvalue,
-+ const GVariantType *expected_type,
-+ gpointer user_data)
- {
-- RadioBinding *binding = user_data;
-- char *value;
-+ const gchar *widget_value = user_data;
-+ GVariant *retval = NULL;
-
-- value = g_settings_get_string (settings, key);
--
-- if (strcmp (value, binding->value) == 0) {
-- /* This will unset the currently active, no need
-- to do that manually */
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (binding->button), TRUE);
-+ if (g_value_get_boolean (gvalue)) {
-+ retval = g_variant_new_string (widget_value);
- }
-- g_free (value);
-+ return retval;
- }
-
--static void
--radio_binding_button_toggled (GtkToggleButton *toggle_button,
-- RadioBinding *binding)
-+static gboolean
-+radio_mapping_get (GValue *gvalue,
-+ GVariant *variant,
-+ gpointer user_data)
- {
-- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (binding->button))) {
-- g_settings_set_string (binding->settings, binding->key, binding->value);
-+ const gchar *widget_value = user_data;
-+ const gchar *value;
-+ value = g_variant_get_string (variant, NULL);
-+
-+ if (g_strcmp0 (value, widget_value) == 0) {
-+ g_value_set_boolean (gvalue, TRUE);
-+ } else {
-+ g_value_set_boolean (gvalue, FALSE);
- }
--}
-
--static void
--free_radio_binding (gpointer data,
-- GClosure *closure)
--{
-- RadioBinding *binding = data;
--
-- g_object_unref (binding->settings);
-- g_free (binding);
--}
-+ return TRUE;
-+ }
-
- static void
- bind_builder_radio (GtkBuilder *builder,
-@@ -892,27 +880,15 @@ bind_builder_radio (GtkBuilder *builder,
- {
- GtkWidget *button;
- int i;
-- char *detailed_signal;
-- RadioBinding *binding;
--
-- detailed_signal = g_strdup_printf ("changed::%s", prefs);
-
- for (i = 0; widget_names[i] != NULL; i++) {
- button = GTK_WIDGET (gtk_builder_get_object (builder, widget_names[i]));
-
-- binding = g_new (RadioBinding, 1);
-- binding->button = button;
-- binding->value = values[i];
-- binding->key = prefs;
-- binding->settings = g_object_ref (settings);
--
-- g_signal_connect (settings, detailed_signal,
-- G_CALLBACK(radio_binding_setting_changed),
-- binding);
--
-- g_signal_connect_data (G_OBJECT (button), "toggled",
-- G_CALLBACK (radio_binding_button_toggled),
-- binding, free_radio_binding, 0);
-+ g_settings_bind_with_mapping (settings, prefs,
-+ button, "active",
-+ G_SETTINGS_BIND_DEFAULT,
-+ radio_mapping_get, radio_mapping_set,
-+ (gpointer) values[i], NULL);
- }
- }
-
---
-cgit
diff --git a/debian/patches/01-fix-default-sort-order.patch b/debian/patches/01-fix-default-sort-order.patch
deleted file mode 100644
index 3fa032e..0000000
--- a/debian/patches/01-fix-default-sort-order.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 4dc7209110b89326be44b8399ddbb5b4131d12a5 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Fri, 12 Apr 2013 21:14:14 +0000
-Subject: Fix default sort order in preferences window
-
-Closes #106 (https://github.com/mate-desktop/mate-file-manager/issues/106)
----
-diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
-index 1de7952..066befa 100644
---- a/src/caja-file-management-properties.c
-+++ b/src/caja-file-management-properties.c
-@@ -94,7 +94,6 @@ static const char * const zoom_values[] =
-
- static const char * const sort_order_values[] =
- {
-- "manually",
- "name",
- "directory",
- "size",
---
-cgit
diff --git a/debian/patches/02-fix-spatial-mode.patch b/debian/patches/02-fix-spatial-mode.patch
deleted file mode 100644
index c64359f..0000000
--- a/debian/patches/02-fix-spatial-mode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 2bc333f790580a6279b1817270d1fc634da7decf Mon Sep 17 00:00:00 2001
-From: Dan Bravender <dan.bravender at gmail.com>
-Date: Sun, 14 Apr 2013 16:37:11 +0000
-Subject: Fixes #94 - default for target_navigation needs to be FALSE for spatial mode to work
-
----
-diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
-index 02b7fac..c2c5b5f 100644
---- a/src/caja-window-manage-views.c
-+++ b/src/caja-window-manage-views.c
-@@ -527,7 +527,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
- char *old_uri, *new_uri;
- int new_slot_position;
- GList *l;
-- gboolean target_navigation, target_same;
-+ gboolean target_navigation = FALSE, target_same = FALSE;
- gboolean is_desktop;
-
- window = slot->pane->window;
---
-cgit
diff --git a/debian/patches/03-fix-for-x-caja-desktop-windows.patch b/debian/patches/03-fix-for-x-caja-desktop-windows.patch
deleted file mode 100644
index 9ca611e..0000000
--- a/debian/patches/03-fix-for-x-caja-desktop-windows.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d116bf8ba8be698869fef81b30d576bcacf3234c Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Mon, 29 Apr 2013 10:41:32 +0000
-Subject: Fix for x-caja-desktop windows at login
-
-Use --no-default-window in Exec field
----
-diff --git a/data/caja.desktop.in.in b/data/caja.desktop.in.in
-index 8e19a81..c975198 100644
---- a/data/caja.desktop.in.in
-+++ b/data/caja.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Caja
- _GenericName=File Manager
--Exec=caja
-+Exec=caja -n
- Icon=system-file-manager
- Terminal=false
- Type=Application
---
-cgit
diff --git a/debian/patches/04-fix-binary-check.patch b/debian/patches/04-fix-binary-check.patch
deleted file mode 100644
index 04782bf..0000000
--- a/debian/patches/04-fix-binary-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 2ba883533e92099322f595085d7ce4941226913f Mon Sep 17 00:00:00 2001
-From: Scott Balneaves <sbalneav at mate-desktop.org>
-Date: Wed, 17 Apr 2013 14:54:23 +0000
-Subject: Possible fix for Issue #111
-
----
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 1958faf..6c252e3 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -7158,6 +7158,10 @@ caja_file_is_binary (CajaFile *file)
- */
-
- fp = g_fopen (g_file_get_path (caja_file_get_location (file)), "r");
-+ if (fp == NULL)
-+ {
-+ return FALSE;
-+ }
- for (i = 0; i < 4096; i++) {
- c = fgetc(fp);
- if (c == EOF) {
---
-cgit
diff --git a/debian/patches/05-fix-binary-check-2.patch b/debian/patches/05-fix-binary-check-2.patch
deleted file mode 100644
index 1d17f68..0000000
--- a/debian/patches/05-fix-binary-check-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d92c2754681b24ed5afcbb0d9458297e6101254e Mon Sep 17 00:00:00 2001
-From: Scott Balneaves <sbalneav at mate-desktop.org>
-Date: Wed, 08 May 2013 01:24:00 +0000
-Subject: Fix for #111
-
----
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 6c252e3..84d799f 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -7149,7 +7149,7 @@ caja_file_is_binary (CajaFile *file)
-
- gboolean is_binary = FALSE;
- int c;
-- int i;
-+ int i = 0;
- FILE *fp;
-
- /* Check the first 4096 bytes of the files. If these contains a 0,
-@@ -7162,15 +7162,17 @@ caja_file_is_binary (CajaFile *file)
- {
- return FALSE;
- }
-- for (i = 0; i < 4096; i++) {
-- c = fgetc(fp);
-- if (c == EOF) {
-+
-+ while (!feof (fp)) {
-+ if (i > 4096) {
- break;
- }
-- else if (c == 0) {
-+ c = fgetc(fp);
-+ if (c == 0) {
- is_binary = TRUE;
- break;
- }
-+ i++;
- }
- fclose(fp);
-
---
-cgit
diff --git a/debian/patches/06-fix-thumbnails-frames.patch b/debian/patches/06-fix-thumbnails-frames.patch
deleted file mode 100644
index eb4ad20..0000000
--- a/debian/patches/06-fix-thumbnails-frames.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 74986734b3b188b702513028b53e54cafbb8c85b Mon Sep 17 00:00:00 2001
-From: romovs <romovs at gmail.com>
-Date: Sun, 25 Aug 2013 01:40:02 +0300
-Subject: [PATCH] fixed thumbnail frame not being displayed for some files.
- also fixes #135.
-
----
- libcaja-private/caja-file.c | 13 +++++++++++--
- libcaja-private/caja-ui-utilities.c | 9 ---------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 84d799f..85f8a9c 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -4276,7 +4276,9 @@ static gboolean update_info_and_name (CajaFile
-
- pixbuf = caja_icon_info_get_pixbuf (icon);
- if (pixbuf != NULL) {
-- caja_ui_frame_image (&pixbuf);
-+ if (!file->details->is_launcher && !gdk_pixbuf_get_has_alpha (pixbuf)) {
-+ caja_ui_frame_image (&pixbuf);
-+ }
- g_object_unref (icon);
-
- icon = caja_icon_info_new_for_pixbuf (pixbuf);
-@@ -4320,7 +4322,14 @@ static gboolean update_info_and_name (CajaFile
- MAX (h * scale, 1),
- GDK_INTERP_BILINEAR);
-
-- caja_ui_frame_image (&scaled_pixbuf);
-+ /* Render frames only for thumbnails of non-image files
-+ and for images with no alpha channel. */
-+ gboolean is_image = strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0;
-+ if (!is_image ||
-+ is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-+ caja_ui_frame_image (&scaled_pixbuf);
-+ }
-+
- g_object_unref (raw_pixbuf);
-
- /* Don't scale up if more than 25%, then read the original
-diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
-index 9732b6d..8077e97 100644
---- a/libcaja-private/caja-ui-utilities.c
-+++ b/libcaja-private/caja-ui-utilities.c
-@@ -287,21 +287,12 @@
- {
- GdkPixbuf *pixbuf_with_frame, *frame;
- int left_offset, top_offset, right_offset, bottom_offset;
-- int size;
-
- frame = caja_get_thumbnail_frame ();
- if (frame == NULL) {
- return;
- }
-
-- size = MAX (gdk_pixbuf_get_width (*pixbuf),
-- gdk_pixbuf_get_height (*pixbuf));
--
-- /* We don't want frames around small icons */
-- if (size < 128 && gdk_pixbuf_get_has_alpha (*pixbuf)) {
-- return;
-- }
--
- left_offset = CAJA_THUMBNAIL_FRAME_LEFT;
- top_offset = CAJA_THUMBNAIL_FRAME_TOP;
- right_offset = CAJA_THUMBNAIL_FRAME_RIGHT;
---
-1.8.4
-
diff --git a/debian/patches/07-fix-thumbnails-frames-2.patch b/debian/patches/07-fix-thumbnails-frames-2.patch
deleted file mode 100644
index c71973b..0000000
--- a/debian/patches/07-fix-thumbnails-frames-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c79f320aba836847f35e5e465754b1ddd62806b4 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Sun, 22 Sep 2013 15:01:18 +0200
-Subject: [PATCH] Add check if mimetype is null before apply thumbnail frame
-
-To avoid segfaults on file deletions
----
- libcaja-private/caja-file.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 85f8a9c..fa00ac8 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -4324,12 +4324,13 @@ caja_file_get_icon (CajaFile *file,
-
- /* Render frames only for thumbnails of non-image files
- and for images with no alpha channel. */
-- gboolean is_image = strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0;
-- if (!is_image ||
-- is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-- caja_ui_frame_image (&scaled_pixbuf);
-- }
--
-+ gboolean is_image = file->details->mime_type &&
-+ (strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0);
-+ if (!is_image ||
-+ is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-+ caja_ui_frame_image (&scaled_pixbuf);
-+ }
-+
- g_object_unref (raw_pixbuf);
-
- /* Don't scale up if more than 25%, then read the original
---
-1.8.4.rc3
-
diff --git a/debian/patches/08-fix-segfault.patch b/debian/patches/08-fix-segfault.patch
deleted file mode 100644
index 6417745..0000000
--- a/debian/patches/08-fix-segfault.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
-index ee10805..96eeb35 100644
---- a/eel/eel-glib-extensions.c
-+++ b/eel/eel-glib-extensions.c
-@@ -378,6 +378,34 @@ eel_g_str_list_index (GList *str_list,
- }
-
- /**
-+ * eel_g_list_free_deep_custom
-+ *
-+ * Frees the elements of a list and then the list, using a custom free function.
-+ *
-+ * @list: List of elements that can be freed with the provided free function.
-+ * @element_free_func: function to call with the data pointer and user_data to free it.
-+ * @user_data: User data to pass to element_free_func
-+ **/
-+void
-+eel_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
-+{
-+ g_list_foreach (list, element_free_func, user_data);
-+ g_list_free (list);
-+}
-+
-+/**
-+ * eel_g_list_free_deep
-+ *
-+ * Frees the elements of a list and then the list.
-+ * @list: List of elements that can be freed with g_free.
-+ **/
-+void
-+eel_g_list_free_deep (GList *list)
-+{
-+ eel_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
-+}
-+
-+/**
- * eel_g_strv_find
- *
- * Get index of string in array of strings.
-diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
-index 907a1ec..9c62c57 100644
---- a/eel/eel-glib-extensions.h
-+++ b/eel/eel-glib-extensions.h
-@@ -54,6 +54,12 @@ GList * eel_g_list_partition (GList *
- gpointer user_data,
- GList **removed);
-
-+/* List functions for lists of g_free'able objects. */
-+void eel_g_list_free_deep (GList *list);
-+void eel_g_list_free_deep_custom (GList *list,
-+ GFunc element_free_func,
-+ gpointer user_data);
-+
- /* List functions for lists of C strings. */
- gboolean eel_g_str_list_equal (GList *str_list_a,
- GList *str_list_b);
-diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
-index 854de86..983cfe3 100644
---- a/src/file-manager/fm-properties-window.c
-+++ b/src/file-manager/fm-properties-window.c
-@@ -3423,7 +3423,7 @@ get_initial_emblems (GList *files)
- ret = g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- NULL,
-- (GDestroyNotify) g_free);
-+ (GDestroyNotify) eel_g_list_free_deep);
-
- for (l = files; l != NULL; l = l->next) {
- CajaFile *file;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index be7a43c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,10 +0,0 @@
-00-fix-radio-buttons.patch
-01-fix-default-sort-order.patch
-02-fix-spatial-mode.patch
-03-fix-for-x-caja-desktop-windows.patch
-04-fix-binary-check.patch
-05-fix-binary-check-2.patch
-06-fix-thumbnails-frames.patch
-07-fix-thumbnails-frames-2.patch
-08-fix-segfault.patch
-
--
mate-file-manager Debian package
More information about the pkg-mate-commits
mailing list