diff options
author | rbuj <[email protected]> | 2019-08-17 12:20:42 +0200 |
---|---|---|
committer | Victor Kareh <[email protected]> | 2019-08-20 13:50:15 -0400 |
commit | 7214cf362179010b6c1e9f9cc2186e7ea7dd590c (patch) | |
tree | a96c5d0d5d44e753e958dbb7acc6314dd7e68760 /applets | |
parent | 19b7297855ef254c788affc1ec1214399f00e9e8 (diff) | |
download | mate-power-manager-7214cf362179010b6c1e9f9cc2186e7ea7dd590c.tar.bz2 mate-power-manager-7214cf362179010b6c1e9f9cc2186e7ea7dd590c.tar.xz |
Use gresources for gpm-prefs.ui and gpm-statistics.ui
Diffstat (limited to 'applets')
-rw-r--r-- | applets/brightness/Makefile.am | 4 | ||||
-rw-r--r-- | applets/brightness/brightness-applet.c | 2 | ||||
-rw-r--r-- | applets/inhibit/Makefile.am | 4 | ||||
-rw-r--r-- | applets/inhibit/inhibit-applet.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am index 7962787..5977106 100644 --- a/applets/brightness/Makefile.am +++ b/applets/brightness/Makefile.am @@ -6,13 +6,13 @@ AM_CPPFLAGS = \ $(PANEL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ - -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DDATADIR=\"$(datadir)\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DVERSION="\"$(VERSION)\"" \ - -DGPM_DATA=\"$(pkgdatadir)\" \ + -DGPM_ICONS_DATA=\"$(pkgdatadir)/icons\" \ -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \ -DEGG_LOG_FILE=\""~/mate-power-manager.log"\" \ -DEGG_VERBOSE="\"GPM_VERBOSE\"" \ diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c index 9074fa9..ebf9914 100644 --- a/applets/brightness/brightness-applet.c +++ b/applets/brightness/brightness-applet.c @@ -996,7 +996,7 @@ gpm_brightness_applet_init (GpmBrightnessApplet *applet) /* Add application specific icons to search path */ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - GPM_DATA G_DIR_SEPARATOR_S "icons"); + GPM_ICONS_DATA); /* monitor the daemon */ applet->bus_watch_id = diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am index 111ab2b..b32f178 100644 --- a/applets/inhibit/Makefile.am +++ b/applets/inhibit/Makefile.am @@ -6,13 +6,13 @@ AM_CPPFLAGS = \ $(PANEL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ - -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DDATADIR=\"$(datadir)\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DVERSION="\"$(VERSION)\"" \ - -DGPM_DATA=\"$(pkgdatadir)\" \ + -DGPM_ICONS_DATA=\"$(pkgdatadir)/icons\" \ -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\" \ -DEGG_LOG_FILE=\""~/mate-power-manager.log"\" \ -DEGG_VERBOSE="\"GPM_VERBOSE\"" \ diff --git a/applets/inhibit/inhibit-applet.c b/applets/inhibit/inhibit-applet.c index 02b38c4..7d903dd 100644 --- a/applets/inhibit/inhibit-applet.c +++ b/applets/inhibit/inhibit-applet.c @@ -471,7 +471,7 @@ gpm_inhibit_applet_init (GpmInhibitApplet *applet) /* Add application specific icons to search path */ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - GPM_DATA G_DIR_SEPARATOR_S "icons"); + GPM_ICONS_DATA); /* monitor the daemon */ applet->bus_watch_id = |