[Xfce4-commits] <xfce4-indicator-plugin:master> use icon dir provided by pkgconfig

[Mark Trompell]

Updating branch refs/heads/master
         to f1835a8aa73fcf02e5d9f938a4ed97ae178a0691 (commit)
       from e358b2a745df240e3ac56f9a1e964469ab00a680 (commit)

commit f1835a8aa73fcf02e5d9f938a4ed97ae178a0691
Author: Mark Trompell <mark at foresightlinux.org>
Date:   Fri Oct 23 13:47:13 2009 +0200

    use icon dir provided by pkgconfig

 INSTALL                  |   17 ++++++++++++++---
 configure.in.in          |    9 +++++++++
 panel-plugin/Makefile.am |    3 ++-
 panel-plugin/indicator.c |    6 ++----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index 8b82ade..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
diff --git a/configure.in.in b/configure.in.in
index 0d48661..2b92dc7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -74,6 +74,15 @@ dnl *** Check for debugging support ***
 dnl ***********************************
 XDT_FEATURE_DEBUG()
 
+dnl ***********************
+dnl *** Indicator info ***
+dnl ***********************
+INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+
+AC_SUBST(INDICATORDIR)
+AC_SUBST(INDICATORICONSDIR)
+
 dnl *********************************
 dnl *** Substitute platform flags ***
 dnl *********************************
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index c8e4644..ee2bf92 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -24,7 +24,8 @@ xfce4_indicator_plugin_CFLAGS =					\
 	$(INDICATOR_CFLAGS)						\
 	$(PLATFORM_CFLAGS)					\
 	-DDATADIR=\""$(datadir)"\" 				\
-	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
+	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
+	-DINDICATOR_DIR=\""$(INDICATORDIR)"\"
 
 
 xfce4_indicator_plugin_LDADD =					\
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 6201041..3edc404 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -34,8 +34,6 @@
 #define DEFAULT_SETTING1 NULL
 #define DEFAULT_SETTING2 1
 #define DEFAULT_SETTING3 FALSE
-#define ICONS_DIR  (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
-
 
 /* prototypes */
 static void
@@ -153,8 +151,8 @@ indicator_new (XfcePanelPlugin *plugin)
 
   /* Init some theme/icon stuff */
   gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-                                  ICONS_DIR);
-  /* g_debug("Icons directory: %s", ICONS_DIR); */
+                                  INDICATOR_ICONS_DIR);
+  /* g_debug("Icons directory: %s", INDICATOR_ICONS_DIR); */
   gtk_rc_parse_string (
     "style \"indicator-applet-style\"\n"
     "{\n"