r15771 - in /desktop/experimental/gnome-panel/debian: changelog control patches/10_appointment_colors.patch patches/series

Fri Apr 25 13:24:51 UTC 2008

Author: sjoerd
Date: Fri Apr 25 13:24:51 2008
New Revision: 15771

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15771
Log:
* debian/patches/10_appointment_colors.patch
  - Added. Fixes appointment colors to be different in evolution and the
  clock applet (gbz #503581)

Added:
    desktop/experimental/gnome-panel/debian/patches/10_appointment_colors.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/control
    desktop/experimental/gnome-panel/debian/patches/series

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=15771&op=diff
==============================================================================

--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Fri Apr 25 13:24:51 2008
@@ -1,3 +1,11 @@
+gnome-panel (2.22.1.3-2) UNRELEASED; urgency=low
+
+  * debian/patches/10_appointment_colors.patch
+    - Added. Fixes appointment colors to be different in evolution and the
+    clock applet (gbz #503581)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 25 Apr 2008 14:52:44 +0200
+
 gnome-panel (2.22.1.3-1) experimental; urgency=low
 
   [ Loic Minier ]

Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=15771&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control (original)
+++ desktop/experimental/gnome-panel/debian/control Fri Apr 25 13:24:51 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian DrÃ¶ge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian DrÃ¶ge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.7.3
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),

Added: desktop/experimental/gnome-panel/debian/patches/10_appointment_colors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/10_appointment_colors.patch?rev=15771&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/10_appointment_colors.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/10_appointment_colors.patch Fri Apr 25 13:24:51 2008
@@ -1,0 +1,44 @@
+Index: applets/clock/calendar-window.c
+===================================================================
+--- a/applets/clock/calendar-window.c	(revision 11083)
++++ b/applets/clock/calendar-window.c	(working copy)
+@@ -519,14 +519,18 @@
+ {
+         char      *color_string;
+         GdkPixbuf *pixbuf = NULL;
+-        guint32    color;
++        GdkColor   color;
+ 
+         gtk_tree_model_get (model, iter, column_number, &color_string, -1);
+ 
+-        if (color_string) {
+-                sscanf (color_string, "%06x", &color);
++        if (color_string && gdk_color_parse(color_string, &color)) {
+                 pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 16, 16);
+-                gdk_pixbuf_fill (pixbuf, color << 8);
++                /* GdkColor has 16 bits per color, gdk_pixbuf only uses 8 bits
++                 * per color. So just drop the least significant parts */
++                gdk_pixbuf_fill (pixbuf,
++                         (color.red & 0xff00) << 16
++                       | (color.green & 0xff00) << 8
++                       | (color.blue & 0xff00));
+ 
+                 g_object_set (renderer, "visible", pixbuf != NULL, "pixbuf", pixbuf, NULL);
+ 
+Index: applets/clock/calendar-client.c
+===================================================================
+--- a/applets/clock/calendar-client.c	(revision 11083)
++++ b/applets/clock/calendar-client.c	(working copy)
+@@ -665,11 +665,7 @@
+   g_return_val_if_fail (E_IS_CAL (esource), NULL);
+ 
+   source = e_cal_get_source (esource);
+-  if (e_source_get_color (source, &color)) {
+-    return g_strdup_printf ("%06x", color);
+-  }
+-  
+-  return NULL;
++  return g_strdup(e_source_peek_color_spec(source));
+ }
+ 
+ static gchar *

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=15771&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series (original)
+++ desktop/experimental/gnome-panel/debian/patches/series Fri Apr 25 13:24:51 2008
@@ -3,6 +3,7 @@
 03_gnome-panel-logout.patch
 08_clock_applet_event.patch
 09_default_icons.patch
+10_appointment_colors.patch
 70_relibtoolize.patch
 90_dont-cleanup-calendard-backend-when-not-loaded.patch
 99_ltmain_as-needed.patch


