summaryrefslogtreecommitdiff
path: root/modemlights
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2005-01-10 20:20:53 +0000
committerDavyd Madeley <davyd@src.gnome.org>2005-01-10 20:20:53 +0000
commitd118c6d94f7a7fe949ec733f5798d605516c2601 (patch)
tree5859bd22211559847f7487815763d2f61fa26a44 /modemlights
parentb462cbd313480b10852ea86422ed8463a5d59eee (diff)
Move geyes themes to ${pkgdatadir}
2005-01-11 Davyd Madeley <davyd@madeley.id.au> * geyes/Makefile.am: * geyes/themes/Makefile.am: Move geyes themes to ${pkgdatadir} 2005-01-11 Tomasz Kłoczko <kloczek@pld.org.pl> * configure.in: Define GNOME_GLADEDIR and $(gladedir) as ${pkgdatadir}/glade. Use this directory for access all gnoem-applets applications to glade files. Small fixed GNOME_PIXMAPSDIR. * battstat/Makefile.am: * pufreq/Makefile.am: * gswitchit/Makefile.am: * mini-commander/src/Makefile.am: * modemlights/Makefile.am: * stickynotes/Makefile.am: Remove all gladedir definitions (now will be used value defined in cnfigure.in). Remove all -D<FOO> with glade directories. * battstat/properties.c: * cpufreq/src/cpufreq-prefs.c: * gswitchit/gswitchit-plugins-add.c: * gswitchit/gswitchit-plugins.c: * mini-commander/src/preferences.c: * modemlights/modem-applet.c: * stickynotes/stickynotes_applet.h: Use GNOME_GLADEDIR as base directory for acces to glade files. * battstat/Makefile.am: Use $(pixmapsdir) "framework". * battstat/Makefile.am: Remove -DDATA_DIR from INCLUDES (DATA_DIR is not used in battstat subtree). * modemlights/Makefile.am: use $(pixmapsdir) "framework". Cleanups. Remove using -DGNOMELOCALEDIR from INCLUDES (this symbol is now defined in project <config.h>). * cpufreq/src/Makefile.am: * cpufreq/src/cpufreq-selector/Makefile.am: * gswitchit/Makefile.am: Remove -Wall -Werror (non-portable options) and not used any more -I$(top_srcdir)/intl from INCLUDES.
Diffstat (limited to 'modemlights')
-rw-r--r--modemlights/Makefile.am1
-rw-r--r--modemlights/modem-applet.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index cd58ad742..922c24059 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -32,7 +32,6 @@ CLEANFILES = $(server_in_files) $(server_DATA)
@INTLTOOL_SERVER_RULE@
-gladedir = $(datadir)/modemlights-applet/
glade_DATA = modemlights.glade
EXTRA_DIST = \
diff --git a/modemlights/modem-applet.c b/modemlights/modem-applet.c
index ab78a9b5f..833f4417c 100644
--- a/modemlights/modem-applet.c
+++ b/modemlights/modem-applet.c
@@ -189,7 +189,7 @@ modem_applet_init (ModemApplet *applet)
priv = MODEM_APPLET_GET_PRIVATE (applet);
- priv->xml = glade_xml_new (DATADIR "/modemlights-applet/modemlights.glade", NULL, NULL);
+ priv->xml = glade_xml_new (GNOME_GLADEDIR "/modemlights.glade", NULL, NULL);
priv->icon = NULL;
priv->icon_theme = gtk_icon_theme_get_default ();
priv->image = gtk_image_new ();