[caja] 01/01: debian/patches: Add 0008_fix-filename-font-color.patch. Filename font color now gets picked up from theme correctly for all themes. (Closes: #770760).

Pablo Barciela zenwalker-guest at moszumanska.debian.org
Tue Apr 25 00:16:26 UTC 2017


This is an automated email from the git hooks/post-receive script.

zenwalker-guest pushed a commit to branch debian/jessie/updates
in repository caja.

commit c4ce11ac35e12bad127ae39ba97e78ac52b163d9
Author: Pablo Barciela <scow at riseup.net>
Date:   Tue Apr 25 02:14:16 2017 +0200

    debian/patches: Add 0008_fix-filename-font-color.patch. Filename font color now gets picked up from theme correctly for all themes. (Closes: #770760).
---
 debian/patches/0008_fix-filename-font-color.patch | 54 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 55 insertions(+)

diff --git a/debian/patches/0008_fix-filename-font-color.patch b/debian/patches/0008_fix-filename-font-color.patch
new file mode 100644
index 0000000..bb3ce45
--- /dev/null
+++ b/debian/patches/0008_fix-filename-font-color.patch
@@ -0,0 +1,54 @@
+From: monsta <monsta at inbox.ru>
+Date: Wed, 16 Mar 2016 18:00:49 +0300
+Subject: fix font color issues
+
+taken from https://github.com/mate-desktop/caja/pull/526
+
+diff --git a/eel/eel-background.c b/eel/eel-background.c
+index dc1dc1f..cd66e25 100644
+--- a/eel/eel-background.c
++++ b/eel/eel-background.c
+@@ -355,8 +355,6 @@ eel_background_ensure_realized (EelBackground *self)
+ 
+     free_background_surface (self);
+ 
+-    /* Calls mate_bg_set_color, which sets "ignore-pending-change" to false,
+-       and queues emission of changed signal if it's still false */
+     set_image_properties (self);
+ 
+     window = gtk_widget_get_window (self->details->widget);
+@@ -365,12 +363,6 @@ eel_background_ensure_realized (EelBackground *self)
+         						self->details->is_desktop);
+     self->details->unset_root_surface = self->details->is_desktop;
+ 
+-    /* We got the surface and everything, so we don't care about a change
+-       that is pending (unless things actually change after this time) */
+-    g_object_set_data (G_OBJECT (self->details->bg),
+-                       "ignore-pending-change",
+-                       GINT_TO_POINTER (TRUE));
+-
+     self->details->bg_entire_width = width;
+     self->details->bg_entire_height = height;
+ 
+diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
+index c33868d..e453a7a 100644
+--- a/libcaja-private/caja-icon-container.c
++++ b/libcaja-private/caja-icon-container.c
+@@ -4561,8 +4561,6 @@ realize (GtkWidget *widget)
+     /* Set up DnD.  */
+     caja_icon_dnd_init (container);
+ 
+-    setup_label_gcs (container);
+-
+     hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
+     g_signal_connect (hadj, "value_changed",
+                       G_CALLBACK (handle_hadjustment_changed), widget);
+@@ -9414,7 +9412,7 @@ setup_label_gcs (CajaIconContainer *container)
+                           "frame_text", &frame_text,
+                           NULL);
+ 
+-    if (frame_text /* || !eel_background_is_set(background) */)
++    if (frame_text || !eel_background_is_set (background))
+     {
+         setup_gc_with_fg (container, LABEL_COLOR,
+                           eel_gdk_color_to_rgb (&style->text[GTK_STATE_NORMAL]));
diff --git a/debian/patches/series b/debian/patches/series
index cf118f5..4517bbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005_fix-tree-view-open-in-new-window.patch
 0006_dont-crash-in-show-hidden-files.patch
 0007_drag-and-drop-to-bookmarks-in-side-pane.patch
+0008_fix-filename-font-color.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git



More information about the pkg-mate-commits mailing list