[gnome-bluetooth] Use the defined theme directory



commit 7cd4d291e649fbce54de15c52eb46b967da2491a
Author: Ross Burton <ross linux intel com>
Date:   Fri Jan 29 12:10:12 2010 +0000

    Use the defined theme directory

 moblin/main.c            |    4 +---
 moblin/theme/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/moblin/main.c b/moblin/main.c
index 19b2d6e..46e969c 100644
--- a/moblin/main.c
+++ b/moblin/main.c
@@ -36,8 +36,6 @@
 
 #include "moblin-panel.h"
 
-#define PKGTHEMEDIR PKGDATADIR"/theme"
-
 static void
 bluetooth_status_changed (MoblinPanel *panel, gboolean connecting, gpointer user_data)
 {
@@ -122,7 +120,7 @@ main (int argc, char *argv[])
 		gtk_widget_show (window);
 	}  else {
 		panel = mpl_panel_gtk_new (MPL_PANEL_BLUETOOTH, _("bluetooth"),
-					PKGTHEMEDIR "/bluetooth-panel.css",
+					THEME_DIR "/bluetooth-panel.css",
 					"state-idle", TRUE);
 		window  = mpl_panel_gtk_get_window (MPL_PANEL_GTK (panel));
 
diff --git a/moblin/theme/Makefile.am b/moblin/theme/Makefile.am
index 730330e..7c92d04 100644
--- a/moblin/theme/Makefile.am
+++ b/moblin/theme/Makefile.am
@@ -1,5 +1,4 @@
-themedir = $(pkgdatadir)/theme
-
+themedir = $(THEME_DIR)
 theme_DATA = bluetooth-panel.css
 
 %.css: %.css.in $(top_builddir)/config.log



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]