From 4b4f2da21196231f85867b25d72dc920cab3affc Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 21 Apr 2011 10:20:27 +0000
Subject: [PATCH] Fix default path to themes and backgrounds.

---
 x11/gnome/controlcenter2/Makefile               |  8 +++++---
 ...tch-capplets_appearance_appearance-desktop_c | 17 +++++++++++++++++
 ...libwindow-settings_metacity-window-manager_c | 12 ++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 x11/gnome/controlcenter2/patches/patch-capplets_appearance_appearance-desktop_c
 create mode 100644 x11/gnome/controlcenter2/patches/patch-libwindow-settings_metacity-window-manager_c

diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile
index 3b5b2a1b087..fe95a6217f6 100644
--- a/x11/gnome/controlcenter2/Makefile
+++ b/x11/gnome/controlcenter2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2011/04/13 06:47:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.88 2011/04/21 10:20:27 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		GNOME control center
 GNOME_PROJECT=		gnome-control-center
 GNOME_VERSION=		2.32.1
 
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS +=	gnome-window-settings 3.0      # .1.0
 
@@ -75,6 +75,8 @@ FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/controlcenter2 \
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/capplets/common/gnome-theme-info.c \
-		${WRKSRC}/capplets/default-applications/gnome-at-commandline.in.in
+		${WRKSRC}/capplets/default-applications/gnome-at-commandline.in.in \
+		${WRKSRC}/capplets/appearance/appearance-desktop.c \
+		${WRKSRC}/libwindow-settings/metacity-window-manager.c
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/controlcenter2/patches/patch-capplets_appearance_appearance-desktop_c b/x11/gnome/controlcenter2/patches/patch-capplets_appearance_appearance-desktop_c
new file mode 100644
index 00000000000..ac9c68610fb
--- /dev/null
+++ b/x11/gnome/controlcenter2/patches/patch-capplets_appearance_appearance-desktop_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-capplets_appearance_appearance-desktop_c,v 1.1 2011/04/21 10:20:27 ajacoutot Exp $
+--- capplets/appearance/appearance-desktop.c.orig	Thu Apr 21 11:48:31 2011
++++ capplets/appearance/appearance-desktop.c	Thu Apr 21 11:48:23 2011
+@@ -639,10 +639,10 @@ wp_create_filechooser (AppearanceData *data)
+ 
+   start_dir = g_get_home_dir ();
+ 
+-  if (g_file_test ("/usr/share/backgrounds", G_FILE_TEST_IS_DIR)) {
++  if (g_file_test ("${LOCALBASE}/share/backgrounds", G_FILE_TEST_IS_DIR)) {
+     gtk_file_chooser_add_shortcut_folder (data->wp_filesel,
+-                                          "/usr/share/backgrounds", NULL);
+-    start_dir = "/usr/share/backgrounds";
++                                          "${LOCALBASE}/share/backgrounds", NULL);
++    start_dir = "${LOCALBASE}/share/backgrounds";
+   }
+ 
+   pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
diff --git a/x11/gnome/controlcenter2/patches/patch-libwindow-settings_metacity-window-manager_c b/x11/gnome/controlcenter2/patches/patch-libwindow-settings_metacity-window-manager_c
new file mode 100644
index 00000000000..eef3167745f
--- /dev/null
+++ b/x11/gnome/controlcenter2/patches/patch-libwindow-settings_metacity-window-manager_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libwindow-settings_metacity-window-manager_c,v 1.1 2011/04/21 10:20:27 ajacoutot Exp $
+--- libwindow-settings/metacity-window-manager.c.orig	Thu Apr 21 11:50:48 2011
++++ libwindow-settings/metacity-window-manager.c	Thu Apr 21 11:50:32 2011
+@@ -141,7 +141,7 @@ metacity_get_theme_list (GnomeWindowManager *wm)
+         home_dir_themes = g_build_filename (g_get_home_dir (), ".themes", NULL);
+ 
+         themes = add_themes_from_dir (themes, METACITY_THEME_DIR);
+-        themes = add_themes_from_dir (themes, "/usr/share/themes");
++        themes = add_themes_from_dir (themes, "${LOCALBASE}/share/themes");
+         themes = add_themes_from_dir (themes, home_dir_themes);
+ 
+         g_free (home_dir_themes);