GNOME.org
 

[gnome-power-manager] Remove the gnome-power-manager executable, 99% of functionality has been moved to gnome-settings-dae

commit a9a34073b4e7c4d3be7b3a32a5501b464758279f
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 25 17:13:57 2011 +0100

    Remove the gnome-power-manager executable, 99% of functionality has been moved to gnome-settings-daemon

 configure.ac                                |    1 -
 contrib/gnome-power-manager.spec.in         |    1 -
 data/Makefile.am                            |   16 --
 data/gnome-power-manager.desktop.in.in      |   16 --
 data/gnome-power-manager.service.in         |    3 -
 data/org.gnome.power-manager.gschema.xml.in |  145 ------------
 po/POTFILES.in                              |    7 -
 src/Makefile.am                             |   26 ---
 src/gpm-main.c                              |  317 ---------------------------
 src/gpm-statistics.c                        |    3 +-
 src/gpm-stock-icons.h                       |   38 ----
 11 files changed, 1 insertions(+), 572 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 126c00f..08aa8a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,7 +230,6 @@ po/Makefile.in
 tools/Makefile
 policy/Makefile
 data/Makefile
-data/gnome-power-manager.desktop.in
 data/gnome-power-statistics.desktop.in
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/contrib/gnome-power-manager.spec.in b/contrib/gnome-power-manager.spec.in
index af83063..37236cf 100644
--- a/contrib/gnome-power-manager.spec.in
+++ b/contrib/gnome-power-manager.spec.in
@@ -74,7 +74,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %doc AUTHORS COPYING README
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/dbus-1/services/gnome-power-manager.service
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/GConf/gsettings/*.gschema.migrate
 %{_datadir}/gnome-power-manager/*.ui
diff --git a/data/Makefile.am b/data/Makefile.am
index 29f1f96..b271abc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,18 +8,6 @@ desktopdir = $(datadir)/applications
 desktop_in_files = gnome-power-statistics.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
- INTLTOOL_DESKTOP_RULE@
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = gnome-power-manager.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = gnome-power-manager.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\ servicedir\@|$(bindir)|" $< > $@
-
 @GSETTINGS_RULES@
 @INTLTOOL_XML_NOMERGE_RULE@
 gsettings_schemas_in_files = org.gnome.power-manager.gschema.xml.in
@@ -32,8 +20,6 @@ pkgdata_DATA =						\
 
 EXTRA_DIST =						\
 	$(gsettings_SCHEMAS)				\
-	$(service_in_files)				\
-	$(autostart_in_files)				\
 	$(desktop_in_files)				\
 	$(gsettings_schemas_in_files)			\
 	$(pkgdata_DATA)
@@ -42,7 +28,5 @@ clean-local :
 	rm -f *~
 
 DISTCLEANFILES =					\
-	gnome-power-manager.desktop			\
 	gnome-power-statistics.desktop			\
-	gnome-power-manager.service			\
 	org.gnome.power-manager.gschema.xml
diff --git a/data/org.gnome.power-manager.gschema.xml.in b/data/org.gnome.power-manager.gschema.xml.in
index 687de7a..f34e4b9 100644
--- a/data/org.gnome.power-manager.gschema.xml.in
+++ b/data/org.gnome.power-manager.gschema.xml.in
@@ -1,107 +1,5 @@
 <schemalist>
-  <enum id="org.gnome.power-manager.IconPolicy">
-    <value nick="present" value="0"/>
-    <value nick="charge" value="1"/>
-    <value nick="low" value="2"/>
-    <value nick="critical" value="3"/>
-    <value nick="never" value="4"/>
-  </enum>
   <schema id="org.gnome.power-manager" path="/org/gnome/power-manager/">
-    <key name="backlight-enable" type="b">
-      <default>true</default>
-      <_summary>Allow backlight brightness adjustment</_summary>
-      <_description>If the screen brightness should be changed when switching between AC and battery power.</_description>
-    </key>
-    <key name="backlight-battery-reduce" type="b">
-      <default>false</default>
-      <_summary>Reduce the backlight brightness when on battery power</_summary>
-      <_description>If the screen should be reduced in brightness when the computer is on battery power.</_description>
-    </key>
-    <key name="brightness-dim-battery" type="i">
-      <default>50</default>
-      <_summary>LCD dimming amount when on battery</_summary>
-      <_description>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100.</_description>
-    </key>
-    <key name="brightness-ac" type="d">
-      <default>1.0</default>
-      <_summary>LCD brightness when on AC</_summary>
-      <_description>The brightness of the display when on AC power. Possible values are between 0.0 and 1.0.</_description>
-    </key>
-    <key name="use-time-for-policy" type="b">
-      <default>true</default>
-      <_summary>Whether to use time-based notifications</_summary>
-      <_description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</_description>
-    </key>
-    <key name="lock-use-screensaver" type="b">
-      <default>true</default>
-      <_summary>Use gnome-screensaver lock setting</_summary>
-      <_description>Whether to use the screen lock setting of gnome-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen.</_description>
-    </key>
-    <key name="lock-blank-screen" type="b">
-      <default>true</default>
-      <_summary>Lock screen when blanked</_summary>
-      <_description>Whether the screen is locked when the screen is turned off. Only used if lock-use-screensaver is false.</_description>
-    </key>
-    <key name="lock-suspend" type="b">
-      <default>true</default>
-      <_summary>Lock screen on suspend</_summary>
-      <_description>Whether the screen is locked when the computer wakes up from a suspend. Only used if lock-use-screensaver is false.</_description>
-    </key>
-    <key name="lock-hibernate" type="b">
-      <default>true</default>
-      <_summary>Lock screen on hibernate</_summary>
-      <_description>Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock-use-screensaver is false.</_description>
-    </key>
-    <key name="lock-keyring-suspend" type="b">
-      <default>true</default>
-      <_summary>Lock GNOME keyring on sleep</_summary>
-      <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
-    </key>
-    <key name="lock-keyring-hibernate" type="b">
-      <default>true</default>
-      <_summary>Lock GNOME keyring on sleep</_summary>
-      <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
-    </key>
-    <key name="notify-perhaps-recall" type="b">
-      <default>true</default>
-      <_summary>If we should show the recalled battery warning for a broken battery</_summary>
-      <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
-    </key>
-    <key name="notify-low-capacity" type="b">
-      <default>true</default>
-      <_summary>If we should show the low capacity warning for a broken battery</_summary>
-      <_description>If we should show the low capacity warning for a broken battery.</_description>
-    </key>
-    <key name="notify-discharging" type="b">
-      <default>true</default>
-      <_summary>Notify when AC adapter is disconnected</_summary>
-      <_description>If the user should be notified when the AC adapter is disconnected.</_description>
-    </key>
-    <key name="notify-fully-charged" type="b">
-      <default>false</default>
-      <_summary>Notify when fully charged</_summary>
-      <_description>If a notification message should be displayed when the battery is fully charged.</_description>
-    </key>
-    <key name="notify-sleep-failed" type="b">
-      <default>true</default>
-      <_summary>Notify on a sleep failure</_summary>
-      <_description>If a notification message should be displayed after suspend or hibernate failed.</_description>
-    </key>
-    <key name="notify-sleep-failed-uri" type="s">
-      <default>''</default>
-      <_summary>The URI to show to the user on sleep failure</_summary>
-      <_description>When sleep fails we can show the user a button to help fix the situation. Leave this blank if the button should not be shown.</_description>
-    </key>
-    <key name="notify-low-power-system" type="b">
-      <default>true</default>
-      <_summary>Notify on a low power</_summary>
-      <_description>If a notification message should be displayed when the system battery or UPS is getting low.</_description>
-    </key>
-    <key name="notify-low-power-device" type="b">
-      <default>true</default>
-      <_summary>Notify on a low power</_summary>
-      <_description>If a notification message should be displayed when battery in a device attached to the computer is getting low.</_description>
-    </key>
     <key name="info-history-graph-points" type="b">
       <default>true</default>
       <_summary>Whether we should show the history data points</_summary>
@@ -147,48 +45,5 @@
       <_summary>The ID of the last device selected</_summary>
       <_description>The identifier of the last device which is used to return focus to the correct device.</_description>
     </key>
-    <key name="percentage-low" type="i">
-      <default>10</default>
-      <_summary>Percentage considered low</_summary>
-      <_description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</_description>
-    </key>
-    <key name="percentage-critical" type="i">
-      <default>3</default>
-      <_summary>Percentage considered critical</_summary>
-      <_description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</_description>
-    </key>
-    <key name="percentage-action" type="i">
-      <default>2</default>
-      <_summary>Percentage action is taken</_summary>
-      <_description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</_description>
-    </key>
-    <key name="time-low" type="i">
-      <default>1200</default>
-      <_summary>The time remaining when low</_summary>
-      <_description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</_description>
-    </key>
-    <key name="time-critical" type="i">
-      <default>300</default>
-      <_summary>The time remaining when critical</_summary>
-      <_description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</_description>
-    </key>
-    <key name="time-action" type="i">
-      <default>120</default>
-      <_summary>The time remaining when action is taken</_summary>
-      <_description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</_description>
-    </key>
-    <key name="enable-sound" type="b">
-      <default>true</default>
-      <_summary>If sounds should be used</_summary>
-      <_description>If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action.</_description>
-    </key>
-    <key name="icon-policy" enum="org.gnome.power-manager.IconPolicy">
-      <aliases>
-        <alias value='always' target='present'/>
-      </aliases>
-      <default>'present'</default>
-      <_summary>When to show the notification icon</_summary>
-      <_description>Display options for the notification icon.</_description>
-    </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e0259f8..a780f8f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/gnome-power-manager.desktop.in.in
 data/org.gnome.power-manager.gschema.xml.in
 data/gnome-power-statistics.desktop.in.in
 [type: gettext/glade]data/gpm-feedback-widget.ui
@@ -9,16 +8,10 @@ data/gnome-power-statistics.desktop.in.in
 policy/org.gnome.power.policy.in2
 src/gpm-backlight.c
 src/gpm-backlight-helper.c
-src/gpm-button.c
-src/gpm-control.c
 src/gpm-common.c
 src/gpm-debug.c
-src/gpm-dpms.c
-src/gpm-engine.c
 src/gpm-graph-widget.c
 src/gpm-idle.c
-src/gpm-main.c
 src/gpm-manager.c
-src/gpm-screensaver.c
 src/gpm-statistics.c
 src/gpm-upower.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f6e3d9b..25e50e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@ INCLUDES =						\
 	-I$(top_srcdir)
 
 bin_PROGRAMS =						\
-	gnome-power-manager				\
 	gnome-power-statistics
 
 sbin_PROGRAMS =						\
@@ -77,31 +76,6 @@ gnome_power_statistics_LDADD =				\
 gnome_power_statistics_CFLAGS =				\
 	$(WARNINGFLAGS)
 
-gnome_power_manager_SOURCES =				\
-	gpm-backlight.h					\
-	gpm-backlight.c					\
-	gpm-idle.h					\
-	gpm-idle.c					\
-	gpm-main.c					\
-	gpm-manager.h					\
-	gpm-manager.c					\
-	gpm-stock-icons.h
-
-gnome_power_manager_LDADD =				\
-	libgpmshared.a					\
-	$(GLIB_LIBS)					\
-	$(X11_LIBS)					\
-	$(GSTREAMER_LIBS)				\
-	$(GNOME_LIBS)					\
-	$(X11_LIBS)					\
-	$(NOTIFY_LIBS)					\
-	$(GPM_EXTRA_LIBS)				\
-	$(UPOWER_LIBS)					\
-	-lm
-
-gnome_power_manager_CFLAGS =				\
-	$(WARNINGFLAGS)
-
 gnome_power_self_test_SOURCES =				\
 	gpm-idle.h					\
 	gpm-idle.c					\
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index a444c2e..0d17695 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -31,7 +31,6 @@
 
 #include "gpm-array-float.h"
 #include "gpm-common.h"
-#include "gpm-stock-icons.h"
 #include "gpm-upower.h"
 #include "gpm-graph-widget.h"
 #include "gpm-debug.h"
@@ -1613,7 +1612,7 @@ gpm_stats_startup_cb (GApplication *application,
 	gtk_window_set_application (window, GTK_APPLICATION (application));
 	gtk_window_set_default_size (window, 800, 500);
 	gtk_window_set_application (window, GTK_APPLICATION (application));
-	gtk_window_set_default_icon_name (GPM_STOCK_APP_ICON);
+	gtk_window_set_default_icon_name ("gnome-power-manager");
 
 	/* Get the main window quit */
 	g_signal_connect (window, "delete-event",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]