Merge lp:~om26er/ubuntu/maverick/shotwell/shotwell-fix-669263 into lp:ubuntu/maverick/shotwell

[Omer Akram]

this branch fixes bug 669263 the patch have been made to adapt for the stable series with the review from the nice yorba people on the lp bug report.

[Ken VanDine (ken-vandine)]

Thanks for the patch! I think it looks good for an SRU, but I would like more details from the bug reporter to help people test. Specifically which gtk theme can be used to reproduce the bug.

review: Approve

Unmerged revisions

19. By Omer Akram on 2011-02-01

* debian/patches/30_left_pane_color.patch:
  - Use background color of sidebar from gtk theme. (LP: #669263)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-09-29 11:53:56 +0000
+++ .pc/applied-patches	2011-02-01 13:52:55 +0000
@@ -2,3 +2,4 @@
 01_lpi.patch
 02_desktop_gettext.patch
 03_appmenu_no_stubs.patch
+30_left_pane_color.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-29 11:53:56 +0000
+++ debian/changelog	2011-02-01 13:52:55 +0000
@@ -1,3 +1,10 @@
+shotwell (0.7.2-0ubuntu2.1) maverick-proposed; urgency=low
+
+  * debian/patches/30_left_pane_color.patch:
+    - Use background color of sidebar from gtk theme. (LP: #669263)
+
+ -- Omer Akram <[e-mail]>  Tue, 01 Feb 2011 18:44:37 +0500
+
 shotwell (0.7.2-0ubuntu2) maverick; urgency=low
 
   * debian/patches/03_appmenu_no_stubs.patch:

=== added file 'debian/patches/30_left_pane_color.patch'
--- debian/patches/30_left_pane_color.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/30_left_pane_color.patch	2011-02-01 13:52:55 +0000
@@ -0,0 +1,31 @@
+From: Omer Akram <[e-mail]>
+Author: Eric Gregory <[e-mail]>
+Subject: Use background color of sidebar from the theme.
+Origin: http://trac.yorba.org/changeset/2370
+Bug: http://trac.yorba.org/ticket/2483
+Bug-Ubuntu: https://launchpad.net/bugs/669263
+
+--- a//src/LibraryWindow.vala	2010-09-11 03:55:55.000000000 +0500
++++ b//src/LibraryWindow.vala	2011-01-31 22:49:49.155812733 +0500
+@@ -83,6 +83,8 @@
+     // special Yorba-selected sidebar background color for standard themes (humanity,
+     // clearlooks, etc.); dark themes use the theme's native background color
+     public static Gdk.Color SIDEBAR_STANDARD_BG_COLOR = parse_color("#EEE");
++    
++    // Max brightness value to trigger SIDEBAR_STANDARD_BG_COLOR
+     public const uint16 STANDARD_COMPONENT_MINIMUM = 0xf00;
+ 
+     private string import_dir = Environment.get_home_dir();
+@@ -1359,9 +1361,9 @@
+         
+         Gtk.Settings settings = Gtk.Settings.get_default();
+         HashTable<string, Gdk.Color?> color_table = settings.color_hash;
+-        Gdk.Color? base_color = color_table.lookup("bg_color");
+-        if (base_color != null && (base_color.red > STANDARD_COMPONENT_MINIMUM ||
+-            base_color.green > STANDARD_COMPONENT_MINIMUM ||
++        Gdk.Color? base_color = color_table.lookup("base_color");
++        if (base_color != null && (base_color.red > STANDARD_COMPONENT_MINIMUM &&
++            base_color.green > STANDARD_COMPONENT_MINIMUM &&
+             base_color.blue > STANDARD_COMPONENT_MINIMUM)) {
+             // if the current theme is a standard theme (as opposed to a dark theme), then
+             // use the specially-selected Yorba muted background color for the sidebar.

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-29 11:53:56 +0000
+++ debian/patches/series	2011-02-01 13:52:55 +0000
@@ -2,3 +2,4 @@
 01_lpi.patch
 02_desktop_gettext.patch
 03_appmenu_no_stubs.patch
+30_left_pane_color.patch

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2010-09-13 23:24:06 +0000
+++ src/LibraryWindow.vala	2011-02-01 13:52:55 +0000
@@ -83,6 +83,8 @@
     // special Yorba-selected sidebar background color for standard themes (humanity,
     // clearlooks, etc.); dark themes use the theme's native background color
     public static Gdk.Color SIDEBAR_STANDARD_BG_COLOR = parse_color("#EEE");
+    
+    // Max brightness value to trigger SIDEBAR_STANDARD_BG_COLOR
     public const uint16 STANDARD_COMPONENT_MINIMUM = 0xf00;
 
     private string import_dir = Environment.get_home_dir();
@@ -1359,9 +1361,9 @@
         
         Gtk.Settings settings = Gtk.Settings.get_default();
         HashTable<string, Gdk.Color?> color_table = settings.color_hash;
-        Gdk.Color? base_color = color_table.lookup("bg_color");
-        if (base_color != null && (base_color.red > STANDARD_COMPONENT_MINIMUM ||
-            base_color.green > STANDARD_COMPONENT_MINIMUM ||
+        Gdk.Color? base_color = color_table.lookup("base_color");
+        if (base_color != null && (base_color.red > STANDARD_COMPONENT_MINIMUM &&
+            base_color.green > STANDARD_COMPONENT_MINIMUM &&
             base_color.blue > STANDARD_COMPONENT_MINIMUM)) {
             // if the current theme is a standard theme (as opposed to a dark theme), then
             // use the specially-selected Yorba muted background color for the sidebar.