[SCM] calf/master: Apply two long-lost patches to fix problems with GTK+ theming.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d109ef3555152fb0ab825dcd7337b42d5a982f96
Author: Torben Hohn <torbenh at gmx.de>
Date:   Wed Jul 13 21:12:32 2011 +0100

    Apply two long-lost patches to fix problems with GTK+ theming.

diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index e60e233..6ba3e17 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -6,9 +6,9 @@
 #
 # Feel free to modify and share!
 
-gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEBE7\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#FFA443\nselected_fg_color:#1A1A1A\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
+#gtk_color_scheme = "calf_fg_color:#101010\ncalf_bg_color:#EFEBE7\ncalf_base_color:#FFF\ncalf_text_color:#1A1A1A\ncalf_selected_bg_color:#FFA443\ncalf_selected_fg_color:#1A1A1A\ncalf_tooltip_bg_color:#F5F5B5\ncalf_tooltip_fg_color:#000"
 
-pixmap_path "@pkgdatadir@"
+pixmap_path "/usr/local/share/calf"
 
 style "calf-default"
 {
@@ -62,7 +62,7 @@ style "calf-default"
 	fg[SELECTED]      = "#0af"
 	fg[INSENSITIVE]   = "#aaa"
 
-	bg[NORMAL]        = "#465160"
+	bg[NORMAL]        = "#eee"
 	bg[PRELIGHT]      = "#000"
 	bg[ACTIVE]        = shade (0.9, "#465160")
 	bg[SELECTED]	  = "#000" # Gnome Appearances Preferences workaround
@@ -277,7 +277,7 @@ style "calf-wide"
 	xthickness   = 3
 	ythickness   = 2
 
-	bg[SELECTED] = @selected_bg_color
+	bg[SELECTED] = "#FFA443"
 }
 
 style "calf-wider"
@@ -1689,8 +1689,8 @@ style "calf-statusbar"
 
 style "calf-tooltips" = "calf-wider"
 {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
+	bg[NORMAL] = "#F5F5B5"
+	fg[NORMAL] = "#000"
 }
 
 
@@ -1766,7 +1766,7 @@ widget "*Calf*Range"       					style : highest "calf-scale-small"
 widget "*Calf*Scale1"       					style : highest "calf-scale-small"
 widget "*Calf*Scale2"       					style : highest "calf-scale-big"
 widget "*Calf*Scrollbar*"   					style : highest "calf-scrollbar"
-
+#
 
 # Increase the x/ythickness in some widgets
 #class "GtkToolbar"   					style "calf-default" 
@@ -1814,12 +1814,12 @@ widget "*Calf*.gtk-combobox-popup-menu.*"   			style "calf-menuitem-text-is-fg-c
 # base color set.
 style "calf-fg-is-text-color-workaround"
 {
-	bg[SELECTED]    = @selected_bg_color
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
+	bg[SELECTED]    = "#FFA443"
+	fg[NORMAL]      = "#1A1A1A"
+	fg[PRELIGHT]    = "#1A1A1A"
+	fg[ACTIVE]      = "#1A1A1A"
+	fg[SELECTED]    = "#1A1A1A"
+	fg[INSENSITIVE] = darker ("#EFEBE7")
 }
 
 widget_class "*Calf*<GtkListItem>*" 				style "calf-fg-is-text-color-workaround"
diff --git a/src/gui.cpp b/src/gui.cpp
index ca2d66b..b26e291 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -236,6 +236,7 @@ GtkWidget *plugin_gui::create_from_xml(plugin_ctl_iface *_plugin, const char *xm
     
     XML_ParserFree(parser);
     last_status_serial_no = plugin->send_status_updates(this, 0);
+    GtkWidget *eventbox  = gtk_event_box_new();
     GtkWidget *decoTable = gtk_table_new(3, 1, FALSE);
     
     // decorations
@@ -274,6 +275,8 @@ GtkWidget *plugin_gui::create_from_xml(plugin_ctl_iface *_plugin, const char *xm
     gtk_table_attach(GTK_TABLE(decoTable), GTK_WIDGET(rightBox),  2, 3, 0, 1, (GtkAttachOptions)(0), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
         
     gtk_table_attach(GTK_TABLE(decoTable), GTK_WIDGET(top_container->container), 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 15, 5);
+    gtk_container_add( GTK_CONTAINER(eventbox), decoTable );
+    gtk_widget_set_name( GTK_WIDGET(eventbox), "Calf-whatever" );
     
     // create window with viewport
 //    GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
@@ -281,7 +284,7 @@ GtkWidget *plugin_gui::create_from_xml(plugin_ctl_iface *_plugin, const char *xm
 //    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
 //    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), GTK_WIDGET(decoTable));
     
-    return GTK_WIDGET(decoTable);
+    return GTK_WIDGET(eventbox);
 }
 
 void plugin_gui::send_configure(const char *key, const char *value)

-- 
calf audio plugins packaging