Merge lp:~agateau/unity-2d/fix-indicator-dir into lp:unity-2d/3.0

[Aurélien Gâteau]

[panel] Fix broken indicators

Instead of hardcoding path to indicator dirs, get them from pkg-config, as suggested here:

https://bugs.launchpad.net/ubuntu/+source/unity-2d/+bug/724717/comments/5

[lp:~agateau/unity-2d/fix-indicator-dir]

419. By Aurélien Gâteau on 2011-03-01

Remove commented-out code

[Ugo Riboni (uriboni)]

As discussed in IRC all changed that I suggested were implemented. Good to go, and welcome back indicators :)

review: Approve

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-02-10 01:10:19 +0000
+++ panel/applets/CMakeLists.txt	2011-03-01 10:07:38 +0000
@@ -1,5 +1,14 @@
 project(uqapplets)
 
+macro(read_pkg_variable cmake_var pkg pkg_var)
+    execute_process(
+        COMMAND pkg-config --variable=${pkg_var} ${pkg}
+        OUTPUT_VARIABLE tmp
+        )
+    # Remove trailing newline from ${tmp}
+    string(STRIP "${tmp}" ${cmake_var})
+endmacro(read_pkg_variable)
+
 # Dependencies
 include(FindPkgConfig)
 
@@ -11,6 +20,11 @@
 
 find_package(X11 REQUIRED)
 
+# Get indicator dirs from pkgconfig
+read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
+read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
+configure_file(indicator-config.h.in indicator-config.h)
+
 # Sources
 set(uqapplets_SRCS
     appindicator/appindicatorapplet.cpp
 
=== added file 'panel/applets/indicator-config.h.in'
--- panel/applets/indicator-config.h.in	1970-01-01 00:00:00 +0000
+++ panel/applets/indicator-config.h.in	2011-03-01 10:07:38 +0000
@@ -0,0 +1,7 @@
+#ifndef INDICATOR_CONFIG_H
+#define INDICATOR_CONFIG_H
+
+#define INDICATOR_ICONS_DIR "${INDICATOR_ICONS_DIR}"
+#define INDICATOR_DIR "${INDICATOR_DIR}"
+
+#endif /* INDICATOR_CONFIG_H */
 
=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2010-11-22 16:30:41 +0000
+++ panel/applets/indicator/indicator.c	2011-03-01 10:07:38 +0000
@@ -22,12 +22,12 @@
 
 #include "indicator.h"
 
+#include "indicator-config.h"
+
 /* default settings */
 #define DEFAULT_SETTING1 NULL
 #define DEFAULT_SETTING2 1
 #define DEFAULT_SETTING3 FALSE
-#define ICONS_DIR "/usr/share/libindicator/icons/"
-#define INDICATOR_DIR "/usr/lib/indicators/4/"
 
 typedef enum {
     PANEL_APPLET_ORIENT_LEFT,
@@ -391,8 +391,7 @@
   g_object_set (gtk_settings_get_default(), "gtk-theme-name", "Ambiance", NULL);
   g_object_set (gtk_settings_get_default(), "gtk-icon-theme-name", "ubuntu-mono-dark", NULL);
   gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-                                  ICONS_DIR);
-  /* g_debug("Icons directory: %s", ICONS_DIR); */
+                                  INDICATOR_ICONS_DIR);
   gtk_rc_parse_string (
     "widget \"indicator-applet*\" style \"panel\"\n"
     "style \"indicator-applet-style\"\n"