* packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc:

    Make the highlight colour for the menus be the user's OSX highlight
    colour, rather than white.

  * packaging/macosx/osx-app.sh: Include the gtk printbackends in app bundle.

diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
index 0361782447cb9cc2ba048909470df90c7f37e3d0..2d8fdedd6e3eb0b73487139c0a001d9e8c091f87 100644 (file)
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
@@ -56,6 +56,7 @@ style "clearlooks-default"
        progressbarstyle        = 0             # 0 = candy bar, 1 = flat
        }
 }
+       
 
 style "clearlooks-wide" = "clearlooks-default"
 {
@@ -96,6 +97,9 @@ style "clearlooks-menu-item" = "clearlooks-default"
        ythickness = 3
        fg[PRELIGHT] = "#ffffff"
        text[PRELIGHT] = "#ffffff"
+       # We want PRELIGHT to be white for widgets, but coloured for the menu.
+       bg[PRELIGHT]            = OSX_MENU_COLOR_PLACEHOLDER
+
 }
 
 style "clearlooks-menu-itembar" = "clearlooks-default"

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index ba6b7570d45e318d6590161e6e7e738edcaae5fa..ac7cafd3cabdf740844f290e245679c50388a8e3 100755 (executable)
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -259,9 +259,7 @@ cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version
 
 gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0`
 mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders}
-cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/engines/* $pkglib/gtk-2.0/$gtk_version/engines/
-cp $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules/*.so $pkglib/gtk-2.0/$gtk_version/immodules/
-cp $LIBPREFIX/lib/gtk-2.0/$gtk_version/loaders/*.so $pkglib/gtk-2.0/$gtk_version/loaders/
+cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/
 
 mkdir -p $pkglib/gnome-vfs-2.0/modules
 cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/