applets: dropped some unused stuff

6 files changed, 6 insertions, 560 deletions

diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c
index 1589902..d411273 100644
--- a/applets/brightness/brightness-applet.c
+++ b/applets/brightness/brightness-applet.c
@@ -76,6 +76,10 @@ typedef struct{
 GType                gpm_brightness_applet_get_type  (void);
 
 
+#define	GPM_DBUS_SERVICE		        "org.mate.PowerManager"
+#define	GPM_DBUS_PATH_BACKLIGHT		    "/org/mate/PowerManager/Backlight"
+#define	GPM_DBUS_INTERFACE_BACKLIGHT	"org.mate.PowerManager.Backlight"
+
 static void      gpm_brightness_applet_class_init (GpmBrightnessAppletClass *klass);
 static void      gpm_brightness_applet_init       (GpmBrightnessApplet *applet);
 
@@ -928,7 +932,7 @@ gpm_applet_dialog_about_cb (GtkAction *action, gpointer data)
 	mate_about_dialog_set_translator_credits (about, translator_credits);
 	mate_about_dialog_set_logo (about, logo);
 	mate_about_dialog_set_license (about, license_trans);
-	mate_about_dialog_set_website (about, GPM_HOMEPAGE_URL);
+	mate_about_dialog_set_website (about, "http://www.mate-desktop.org/");
 
 	g_signal_connect (G_OBJECT(about), "response",
 			  G_CALLBACK(gtk_widget_destroy), NULL);
diff --git a/applets/brightness/gpm-common.c b/applets/brightness/gpm-common.c
index 3f8a1ff..e2ea5f6 100644
--- a/applets/brightness/gpm-common.c
+++ b/applets/brightness/gpm-common.c
@@ -31,138 +31,6 @@
 #include "gpm-common.h"
 
 /**
- * gpm_get_timestring:
- * @time_secs: The time value to convert in seconds
- * @cookie: The cookie we are looking for
- *
- * Returns a localised timestring
- *
- * Return value: The time string, e.g. "2 hours 3 minutes"
- **/
-gchar *
-gpm_get_timestring (guint time_secs)
-{
-	char* timestring = NULL;
-	gint  hours;
-	gint  minutes;
-
-	/* Add 0.5 to do rounding */
-	minutes = (int) ( ( time_secs / 60.0 ) + 0.5 );
-
-	if (minutes == 0) {
-		timestring = g_strdup (_("Unknown time"));
-		return timestring;
-	}
-
-	if (minutes < 60) {
-		timestring = g_strdup_printf (ngettext ("%i minute",
-							"%i minutes",
-							minutes), minutes);
-		return timestring;
-	}
-
-	hours = minutes / 60;
-	minutes = minutes % 60;
-
-	if (minutes == 0)
-		timestring = g_strdup_printf (ngettext (
-				"%i hour",
-				"%i hours",
-				hours), hours);
-	else
-		/* TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
-		 * Swap order with "%2$s %2$i %1$s %1$i if needed */
-		timestring = g_strdup_printf (_("%i %s %i %s"),
-				hours, ngettext ("hour", "hours", hours),
-				minutes, ngettext ("minute", "minutes", minutes));
-	return timestring;
-}
-
-/**
- * gpm_icon_policy_from_string:
- **/
-GpmIconPolicy
-gpm_icon_policy_from_string (const gchar *policy)
-{
-	if (policy == NULL)
-		return GPM_ICON_POLICY_NEVER;
-	if (g_strcmp0 (policy, "always") == 0)
-		return GPM_ICON_POLICY_ALWAYS;
-	if (g_strcmp0 (policy, "present") == 0)
-		return GPM_ICON_POLICY_PRESENT;
-	if (g_strcmp0 (policy, "charge") == 0)
-		return GPM_ICON_POLICY_CHARGE;
-	if (g_strcmp0 (policy, "low") == 0)
-		return GPM_ICON_POLICY_LOW;
-	if (g_strcmp0 (policy, "critical") == 0)
-		return GPM_ICON_POLICY_CRITICAL;
-	if (g_strcmp0 (policy, "never") == 0)
-		return GPM_ICON_POLICY_NEVER;
-	return GPM_ICON_POLICY_NEVER;
-}
-
-/**
- * gpm_icon_policy_to_string:
- **/
-const gchar *
-gpm_icon_policy_to_string (GpmIconPolicy policy)
-{
-	if (policy == GPM_ICON_POLICY_ALWAYS)
-		return "always";
-	if (policy == GPM_ICON_POLICY_PRESENT)
-		return "present";
-	if (policy == GPM_ICON_POLICY_CHARGE)
-		return "charge";
-	if (policy == GPM_ICON_POLICY_LOW)
-		return "low";
-	if (policy == GPM_ICON_POLICY_CRITICAL)
-		return "critical";
-	if (policy == GPM_ICON_POLICY_NEVER)
-		return "never";
-	return "never";
-}
-
-/**
- * gpm_action_policy_from_string:
- **/
-GpmActionPolicy
-gpm_action_policy_from_string (const gchar *policy)
-{
-	if (policy == NULL)
-		return GPM_ACTION_POLICY_NOTHING;
-	if (g_strcmp0 (policy, "blank") == 0)
-		return GPM_ACTION_POLICY_BLANK;
-	if (g_strcmp0 (policy, "shutdown") == 0)
-		return GPM_ACTION_POLICY_SHUTDOWN;
-	if (g_strcmp0 (policy, "suspend") == 0)
-		return GPM_ACTION_POLICY_SUSPEND;
-	if (g_strcmp0 (policy, "hibernate") == 0)
-		return GPM_ACTION_POLICY_HIBERNATE;
-	if (g_strcmp0 (policy, "interactive") == 0)
-		return GPM_ACTION_POLICY_INTERACTIVE;
-	return GPM_ACTION_POLICY_NOTHING;
-}
-
-/**
- * gpm_action_policy_to_string:
- **/
-const gchar *
-gpm_action_policy_to_string (GpmActionPolicy policy)
-{
-	if (policy == GPM_ACTION_POLICY_BLANK)
-		return "blank";
-	if (policy == GPM_ACTION_POLICY_SHUTDOWN)
-		return "shutdown";
-	if (policy == GPM_ACTION_POLICY_SUSPEND)
-		return "suspend";
-	if (policy == GPM_ACTION_POLICY_HIBERNATE)
-		return "hibernate";
-	if (policy == GPM_ACTION_POLICY_INTERACTIVE)
-		return "interactive";
-	return "nothing";
-}
-
-/**
  * gpm_help_display:
  * @link_id: Subsection of mate-power-manager help section
  **/
diff --git a/applets/brightness/gpm-common.h b/applets/brightness/gpm-common.h
index 5a6d516..323ccac 100644
--- a/applets/brightness/gpm-common.h
+++ b/applets/brightness/gpm-common.h
@@ -26,153 +26,6 @@
 
 G_BEGIN_DECLS
 
-#define	GPM_DBUS_SERVICE		"org.mate.PowerManager"
-#define	GPM_DBUS_INTERFACE		"org.mate.PowerManager"
-#define	GPM_DBUS_INTERFACE_BACKLIGHT	"org.mate.PowerManager.Backlight"
-#define	GPM_DBUS_PATH			"/org/mate/PowerManager"
-#define	GPM_DBUS_PATH_BACKLIGHT		"/org/mate/PowerManager/Backlight"
-
-/* common descriptions of this program */
-#define GPM_NAME 			_("Power Manager")
-#define GPM_DESCRIPTION 		_("Power Manager for the MATE desktop")
-
-/* help location */
-#define GPM_HOMEPAGE_URL	 	"http://www.mate-desktop.org/"
-#define GPM_BUGZILLA_URL		"https://github.com/mate-desktop/mate-power-manager/issues"
-#define GPM_FAQ_URL			"http://wiki.mate-desktop.org/"
-
-/* change general/installed_schema whenever adding or moving keys */
-#define GPM_CONF_SCHEMA_ID	3
-
-#define GPM_CONF_DIR 				"/apps/mate-power-manager"
-
-/* actions */
-#define GPM_CONF_ACTIONS_CRITICAL_UPS		GPM_CONF_DIR "/actions/critical_ups"
-#define GPM_CONF_ACTIONS_CRITICAL_BATT		GPM_CONF_DIR "/actions/critical_battery"
-#define GPM_CONF_ACTIONS_LOW_UPS		GPM_CONF_DIR "/actions/low_ups"
-#define GPM_CONF_ACTIONS_SLEEP_TYPE_AC		GPM_CONF_DIR "/actions/sleep_type_ac"
-#define GPM_CONF_ACTIONS_SLEEP_TYPE_BATT	GPM_CONF_DIR "/actions/sleep_type_battery"
-#define GPM_CONF_ACTIONS_SLEEP_WHEN_CLOSED	GPM_CONF_DIR "/actions/event_when_closed_battery"
-
-/* backlight stuff */
-#define GPM_CONF_BACKLIGHT_ENABLE		GPM_CONF_DIR "/backlight/enable"
-#define GPM_CONF_BACKLIGHT_BATTERY_REDUCE	GPM_CONF_DIR "/backlight/battery_reduce"
-#define GPM_CONF_BACKLIGHT_DPMS_METHOD_AC	GPM_CONF_DIR "/backlight/dpms_method_ac"
-#define GPM_CONF_BACKLIGHT_DPMS_METHOD_BATT	GPM_CONF_DIR "/backlight/dpms_method_battery"
-#define GPM_CONF_BACKLIGHT_IDLE_BRIGHTNESS	GPM_CONF_DIR "/backlight/idle_brightness"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_AC		GPM_CONF_DIR "/backlight/idle_dim_ac"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_BATT	GPM_CONF_DIR "/backlight/idle_dim_battery"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_TIME	GPM_CONF_DIR "/backlight/idle_dim_time"
-#define GPM_CONF_BACKLIGHT_BRIGHTNESS_AC	GPM_CONF_DIR "/backlight/brightness_ac"
-#define GPM_CONF_BACKLIGHT_BRIGHTNESS_DIM_BATT	GPM_CONF_DIR "/backlight/brightness_dim_battery"
-
-/* buttons */
-#define GPM_CONF_BUTTON_LID_AC			GPM_CONF_DIR "/buttons/lid_ac"
-#define GPM_CONF_BUTTON_LID_BATT		GPM_CONF_DIR "/buttons/lid_battery"
-#define GPM_CONF_BUTTON_SUSPEND			GPM_CONF_DIR "/buttons/suspend"
-#define GPM_CONF_BUTTON_HIBERNATE		GPM_CONF_DIR "/buttons/hibernate"
-#define GPM_CONF_BUTTON_POWER			GPM_CONF_DIR "/buttons/power"
-
-/* general */
-#define GPM_CONF_SCHEMA_VERSION			GPM_CONF_DIR "/general/installed_schema"
-#define GPM_CONF_USE_TIME_POLICY		GPM_CONF_DIR "/general/use_time_for_policy"
-#define GPM_CONF_USE_PROFILE_TIME		GPM_CONF_DIR "/general/use_profile_time"
-#define GPM_CONF_NETWORKMANAGER_SLEEP		GPM_CONF_DIR "/general/network_sleep"
-#define GPM_CONF_IDLE_CHECK_CPU			GPM_CONF_DIR "/general/check_type_cpu"
-#define GPM_CONF_LAPTOP_USES_EXT_MON		GPM_CONF_DIR "/general/using_external_monitor"
-
-/* lock */
-#define GPM_CONF_LOCK_USE_SCREENSAVER		GPM_CONF_DIR "/lock/use_screensaver_settings"
-#define GPM_CONF_LOCK_ON_BLANK_SCREEN		GPM_CONF_DIR "/lock/blank_screen"
-#define GPM_CONF_LOCK_ON_SUSPEND		GPM_CONF_DIR "/lock/suspend"
-#define GPM_CONF_LOCK_ON_HIBERNATE		GPM_CONF_DIR "/lock/hibernate"
-#define GPM_CONF_LOCK_MATE_KEYRING_SUSPEND	GPM_CONF_DIR "/lock/mate_keyring_suspend"
-#define GPM_CONF_LOCK_MATE_KEYRING_HIBERNATE	GPM_CONF_DIR "/lock/mate_keyring_hibernate"
-
-/* disks */
-#define GPM_CONF_DISKS_SPINDOWN_ENABLE_AC	GPM_CONF_DIR "/disks/spindown_enable_ac"
-#define GPM_CONF_DISKS_SPINDOWN_ENABLE_BATT	GPM_CONF_DIR "/disks/spindown_enable_battery"
-#define GPM_CONF_DISKS_SPINDOWN_TIMEOUT_AC	GPM_CONF_DIR "/disks/spindown_timeout_ac"
-#define GPM_CONF_DISKS_SPINDOWN_TIMEOUT_BATT	GPM_CONF_DIR "/disks/spindown_timeout_battery"
-
-/* notify */
-#define GPM_CONF_NOTIFY_PERHAPS_RECALL		GPM_CONF_DIR "/notify/perhaps_recall"
-#define GPM_CONF_NOTIFY_LOW_CAPACITY		GPM_CONF_DIR "/notify/low_capacity"
-#define GPM_CONF_NOTIFY_DISCHARGING		GPM_CONF_DIR "/notify/discharging"
-#define GPM_CONF_NOTIFY_FULLY_CHARGED		GPM_CONF_DIR "/notify/fully_charged"
-#define GPM_CONF_NOTIFY_SLEEP_FAILED		GPM_CONF_DIR "/notify/sleep_failed"
-#define GPM_CONF_NOTIFY_SLEEP_FAILED_URI	GPM_CONF_DIR "/notify/sleep_failed_uri"
-#define GPM_CONF_NOTIFY_LOW_POWER		GPM_CONF_DIR "/notify/low_power"
-
-/* statistics */
-#define GPM_CONF_STATS_SHOW_AXIS_LABELS		GPM_CONF_DIR "/statistics/show_axis_labels"
-#define GPM_CONF_STATS_SHOW_EVENTS		GPM_CONF_DIR "/statistics/show_events"
-#define GPM_CONF_STATS_SMOOTH_DATA		GPM_CONF_DIR "/statistics/smooth_data"
-#define GPM_CONF_STATS_GRAPH_TYPE		GPM_CONF_DIR "/statistics/graph_type"
-#define GPM_CONF_STATS_MAX_TIME			GPM_CONF_DIR "/statistics/data_max_time"
-
-/* thresholds */
-#define GPM_CONF_THRESH_PERCENTAGE_LOW		GPM_CONF_DIR "/thresholds/percentage_low"
-#define GPM_CONF_THRESH_PERCENTAGE_CRITICAL	GPM_CONF_DIR "/thresholds/percentage_critical"
-#define GPM_CONF_THRESH_PERCENTAGE_ACTION	GPM_CONF_DIR "/thresholds/percentage_action"
-#define GPM_CONF_THRESH_TIME_LOW		GPM_CONF_DIR "/thresholds/time_low"
-#define GPM_CONF_THRESH_TIME_CRITICAL		GPM_CONF_DIR "/thresholds/time_critical"
-#define GPM_CONF_THRESH_TIME_ACTION		GPM_CONF_DIR "/thresholds/time_action"
-
-/* timeout */
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_AC	GPM_CONF_DIR "/timeout/sleep_computer_ac"
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT	GPM_CONF_DIR "/timeout/sleep_computer_battery"
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_UPS	GPM_CONF_DIR "/timeout/sleep_computer_ups"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_AC	GPM_CONF_DIR "/timeout/sleep_display_ac"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_BATT	GPM_CONF_DIR "/timeout/sleep_display_battery"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_UPS	GPM_CONF_DIR "/timeout/sleep_display_ups"
-
-/* ui */
-#define GPM_CONF_UI_ICON_POLICY			GPM_CONF_DIR "/ui/icon_policy"
-#define GPM_CONF_UI_ENABLE_SOUND		GPM_CONF_DIR "/ui/enable_sound"
-#define GPM_CONF_UI_SHOW_ACTIONS		GPM_CONF_DIR "/ui/show_actions"
-
-/* new info binary */
-#define GPM_CONF_INFO_HISTORY_TIME		"/apps/mate-power-manager/info/history_time"
-#define GPM_CONF_INFO_HISTORY_TYPE		"/apps/mate-power-manager/info/history_type"
-#define GPM_CONF_INFO_HISTORY_GRAPH_SMOOTH	"/apps/mate-power-manager/info/history_graph_smooth"
-#define GPM_CONF_INFO_HISTORY_GRAPH_POINTS	"/apps/mate-power-manager/info/history_graph_points"
-#define GPM_CONF_INFO_STATS_TYPE		"/apps/mate-power-manager/info/stats_type"
-#define GPM_CONF_INFO_STATS_GRAPH_SMOOTH	"/apps/mate-power-manager/info/stats_graph_smooth"
-#define GPM_CONF_INFO_STATS_GRAPH_POINTS	"/apps/mate-power-manager/info/stats_graph_points"
-#define GPM_CONF_INFO_PAGE_NUMBER		"/apps/mate-power-manager/info/page_number"
-#define GPM_CONF_INFO_LAST_DEVICE		"/apps/mate-power-manager/info/last_device"
-
-/* mate-screensaver */
-#define GS_CONF_DIR				"/apps/mate-screensaver"
-#define GS_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
-
-/* mate-session */
-#define GPM_CONF_IDLE_DELAY			"/desktop/mate/session/idle_delay"
-
-typedef enum {
-	GPM_ICON_POLICY_ALWAYS,
-	GPM_ICON_POLICY_PRESENT,
-	GPM_ICON_POLICY_CHARGE,
-	GPM_ICON_POLICY_LOW,
-	GPM_ICON_POLICY_CRITICAL,
-	GPM_ICON_POLICY_NEVER
-} GpmIconPolicy;
-
-typedef enum {
-	GPM_ACTION_POLICY_BLANK,
-	GPM_ACTION_POLICY_SUSPEND,
-	GPM_ACTION_POLICY_SHUTDOWN,
-	GPM_ACTION_POLICY_HIBERNATE,
-	GPM_ACTION_POLICY_INTERACTIVE,
-	GPM_ACTION_POLICY_NOTHING
-} GpmActionPolicy;
-
-gchar		*gpm_get_timestring				(guint		 time);
-GpmIconPolicy	 gpm_icon_policy_from_string			(const gchar	*policy);
-const gchar	*gpm_icon_policy_to_string			(GpmIconPolicy	 policy);
-GpmActionPolicy	 gpm_action_policy_from_string			(const gchar	*policy);
-const gchar	*gpm_action_policy_to_string			(GpmActionPolicy  policy);
 void 		 gpm_help_display				(const gchar	*link_id);
 #ifdef EGG_TEST
 void		 gpm_common_test				(gpointer	 data);
diff --git a/applets/inhibit/gpm-common.c b/applets/inhibit/gpm-common.c
index 3f8a1ff..e2ea5f6 100644
--- a/applets/inhibit/gpm-common.c
+++ b/applets/inhibit/gpm-common.c
@@ -31,138 +31,6 @@
 #include "gpm-common.h"
 
 /**
- * gpm_get_timestring:
- * @time_secs: The time value to convert in seconds
- * @cookie: The cookie we are looking for
- *
- * Returns a localised timestring
- *
- * Return value: The time string, e.g. "2 hours 3 minutes"
- **/
-gchar *
-gpm_get_timestring (guint time_secs)
-{
-	char* timestring = NULL;
-	gint  hours;
-	gint  minutes;
-
-	/* Add 0.5 to do rounding */
-	minutes = (int) ( ( time_secs / 60.0 ) + 0.5 );
-
-	if (minutes == 0) {
-		timestring = g_strdup (_("Unknown time"));
-		return timestring;
-	}
-
-	if (minutes < 60) {
-		timestring = g_strdup_printf (ngettext ("%i minute",
-							"%i minutes",
-							minutes), minutes);
-		return timestring;
-	}
-
-	hours = minutes / 60;
-	minutes = minutes % 60;
-
-	if (minutes == 0)
-		timestring = g_strdup_printf (ngettext (
-				"%i hour",
-				"%i hours",
-				hours), hours);
-	else
-		/* TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
-		 * Swap order with "%2$s %2$i %1$s %1$i if needed */
-		timestring = g_strdup_printf (_("%i %s %i %s"),
-				hours, ngettext ("hour", "hours", hours),
-				minutes, ngettext ("minute", "minutes", minutes));
-	return timestring;
-}
-
-/**
- * gpm_icon_policy_from_string:
- **/
-GpmIconPolicy
-gpm_icon_policy_from_string (const gchar *policy)
-{
-	if (policy == NULL)
-		return GPM_ICON_POLICY_NEVER;
-	if (g_strcmp0 (policy, "always") == 0)
-		return GPM_ICON_POLICY_ALWAYS;
-	if (g_strcmp0 (policy, "present") == 0)
-		return GPM_ICON_POLICY_PRESENT;
-	if (g_strcmp0 (policy, "charge") == 0)
-		return GPM_ICON_POLICY_CHARGE;
-	if (g_strcmp0 (policy, "low") == 0)
-		return GPM_ICON_POLICY_LOW;
-	if (g_strcmp0 (policy, "critical") == 0)
-		return GPM_ICON_POLICY_CRITICAL;
-	if (g_strcmp0 (policy, "never") == 0)
-		return GPM_ICON_POLICY_NEVER;
-	return GPM_ICON_POLICY_NEVER;
-}
-
-/**
- * gpm_icon_policy_to_string:
- **/
-const gchar *
-gpm_icon_policy_to_string (GpmIconPolicy policy)
-{
-	if (policy == GPM_ICON_POLICY_ALWAYS)
-		return "always";
-	if (policy == GPM_ICON_POLICY_PRESENT)
-		return "present";
-	if (policy == GPM_ICON_POLICY_CHARGE)
-		return "charge";
-	if (policy == GPM_ICON_POLICY_LOW)
-		return "low";
-	if (policy == GPM_ICON_POLICY_CRITICAL)
-		return "critical";
-	if (policy == GPM_ICON_POLICY_NEVER)
-		return "never";
-	return "never";
-}
-
-/**
- * gpm_action_policy_from_string:
- **/
-GpmActionPolicy
-gpm_action_policy_from_string (const gchar *policy)
-{
-	if (policy == NULL)
-		return GPM_ACTION_POLICY_NOTHING;
-	if (g_strcmp0 (policy, "blank") == 0)
-		return GPM_ACTION_POLICY_BLANK;
-	if (g_strcmp0 (policy, "shutdown") == 0)
-		return GPM_ACTION_POLICY_SHUTDOWN;
-	if (g_strcmp0 (policy, "suspend") == 0)
-		return GPM_ACTION_POLICY_SUSPEND;
-	if (g_strcmp0 (policy, "hibernate") == 0)
-		return GPM_ACTION_POLICY_HIBERNATE;
-	if (g_strcmp0 (policy, "interactive") == 0)
-		return GPM_ACTION_POLICY_INTERACTIVE;
-	return GPM_ACTION_POLICY_NOTHING;
-}
-
-/**
- * gpm_action_policy_to_string:
- **/
-const gchar *
-gpm_action_policy_to_string (GpmActionPolicy policy)
-{
-	if (policy == GPM_ACTION_POLICY_BLANK)
-		return "blank";
-	if (policy == GPM_ACTION_POLICY_SHUTDOWN)
-		return "shutdown";
-	if (policy == GPM_ACTION_POLICY_SUSPEND)
-		return "suspend";
-	if (policy == GPM_ACTION_POLICY_HIBERNATE)
-		return "hibernate";
-	if (policy == GPM_ACTION_POLICY_INTERACTIVE)
-		return "interactive";
-	return "nothing";
-}
-
-/**
  * gpm_help_display:
  * @link_id: Subsection of mate-power-manager help section
  **/
diff --git a/applets/inhibit/gpm-common.h b/applets/inhibit/gpm-common.h
index 5a6d516..323ccac 100644
--- a/applets/inhibit/gpm-common.h
+++ b/applets/inhibit/gpm-common.h
@@ -26,153 +26,6 @@
 
 G_BEGIN_DECLS
 
-#define	GPM_DBUS_SERVICE		"org.mate.PowerManager"
-#define	GPM_DBUS_INTERFACE		"org.mate.PowerManager"
-#define	GPM_DBUS_INTERFACE_BACKLIGHT	"org.mate.PowerManager.Backlight"
-#define	GPM_DBUS_PATH			"/org/mate/PowerManager"
-#define	GPM_DBUS_PATH_BACKLIGHT		"/org/mate/PowerManager/Backlight"
-
-/* common descriptions of this program */
-#define GPM_NAME 			_("Power Manager")
-#define GPM_DESCRIPTION 		_("Power Manager for the MATE desktop")
-
-/* help location */
-#define GPM_HOMEPAGE_URL	 	"http://www.mate-desktop.org/"
-#define GPM_BUGZILLA_URL		"https://github.com/mate-desktop/mate-power-manager/issues"
-#define GPM_FAQ_URL			"http://wiki.mate-desktop.org/"
-
-/* change general/installed_schema whenever adding or moving keys */
-#define GPM_CONF_SCHEMA_ID	3
-
-#define GPM_CONF_DIR 				"/apps/mate-power-manager"
-
-/* actions */
-#define GPM_CONF_ACTIONS_CRITICAL_UPS		GPM_CONF_DIR "/actions/critical_ups"
-#define GPM_CONF_ACTIONS_CRITICAL_BATT		GPM_CONF_DIR "/actions/critical_battery"
-#define GPM_CONF_ACTIONS_LOW_UPS		GPM_CONF_DIR "/actions/low_ups"
-#define GPM_CONF_ACTIONS_SLEEP_TYPE_AC		GPM_CONF_DIR "/actions/sleep_type_ac"
-#define GPM_CONF_ACTIONS_SLEEP_TYPE_BATT	GPM_CONF_DIR "/actions/sleep_type_battery"
-#define GPM_CONF_ACTIONS_SLEEP_WHEN_CLOSED	GPM_CONF_DIR "/actions/event_when_closed_battery"
-
-/* backlight stuff */
-#define GPM_CONF_BACKLIGHT_ENABLE		GPM_CONF_DIR "/backlight/enable"
-#define GPM_CONF_BACKLIGHT_BATTERY_REDUCE	GPM_CONF_DIR "/backlight/battery_reduce"
-#define GPM_CONF_BACKLIGHT_DPMS_METHOD_AC	GPM_CONF_DIR "/backlight/dpms_method_ac"
-#define GPM_CONF_BACKLIGHT_DPMS_METHOD_BATT	GPM_CONF_DIR "/backlight/dpms_method_battery"
-#define GPM_CONF_BACKLIGHT_IDLE_BRIGHTNESS	GPM_CONF_DIR "/backlight/idle_brightness"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_AC		GPM_CONF_DIR "/backlight/idle_dim_ac"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_BATT	GPM_CONF_DIR "/backlight/idle_dim_battery"
-#define GPM_CONF_BACKLIGHT_IDLE_DIM_TIME	GPM_CONF_DIR "/backlight/idle_dim_time"
-#define GPM_CONF_BACKLIGHT_BRIGHTNESS_AC	GPM_CONF_DIR "/backlight/brightness_ac"
-#define GPM_CONF_BACKLIGHT_BRIGHTNESS_DIM_BATT	GPM_CONF_DIR "/backlight/brightness_dim_battery"
-
-/* buttons */
-#define GPM_CONF_BUTTON_LID_AC			GPM_CONF_DIR "/buttons/lid_ac"
-#define GPM_CONF_BUTTON_LID_BATT		GPM_CONF_DIR "/buttons/lid_battery"
-#define GPM_CONF_BUTTON_SUSPEND			GPM_CONF_DIR "/buttons/suspend"
-#define GPM_CONF_BUTTON_HIBERNATE		GPM_CONF_DIR "/buttons/hibernate"
-#define GPM_CONF_BUTTON_POWER			GPM_CONF_DIR "/buttons/power"
-
-/* general */
-#define GPM_CONF_SCHEMA_VERSION			GPM_CONF_DIR "/general/installed_schema"
-#define GPM_CONF_USE_TIME_POLICY		GPM_CONF_DIR "/general/use_time_for_policy"
-#define GPM_CONF_USE_PROFILE_TIME		GPM_CONF_DIR "/general/use_profile_time"
-#define GPM_CONF_NETWORKMANAGER_SLEEP		GPM_CONF_DIR "/general/network_sleep"
-#define GPM_CONF_IDLE_CHECK_CPU			GPM_CONF_DIR "/general/check_type_cpu"
-#define GPM_CONF_LAPTOP_USES_EXT_MON		GPM_CONF_DIR "/general/using_external_monitor"
-
-/* lock */
-#define GPM_CONF_LOCK_USE_SCREENSAVER		GPM_CONF_DIR "/lock/use_screensaver_settings"
-#define GPM_CONF_LOCK_ON_BLANK_SCREEN		GPM_CONF_DIR "/lock/blank_screen"
-#define GPM_CONF_LOCK_ON_SUSPEND		GPM_CONF_DIR "/lock/suspend"
-#define GPM_CONF_LOCK_ON_HIBERNATE		GPM_CONF_DIR "/lock/hibernate"
-#define GPM_CONF_LOCK_MATE_KEYRING_SUSPEND	GPM_CONF_DIR "/lock/mate_keyring_suspend"
-#define GPM_CONF_LOCK_MATE_KEYRING_HIBERNATE	GPM_CONF_DIR "/lock/mate_keyring_hibernate"
-
-/* disks */
-#define GPM_CONF_DISKS_SPINDOWN_ENABLE_AC	GPM_CONF_DIR "/disks/spindown_enable_ac"
-#define GPM_CONF_DISKS_SPINDOWN_ENABLE_BATT	GPM_CONF_DIR "/disks/spindown_enable_battery"
-#define GPM_CONF_DISKS_SPINDOWN_TIMEOUT_AC	GPM_CONF_DIR "/disks/spindown_timeout_ac"
-#define GPM_CONF_DISKS_SPINDOWN_TIMEOUT_BATT	GPM_CONF_DIR "/disks/spindown_timeout_battery"
-
-/* notify */
-#define GPM_CONF_NOTIFY_PERHAPS_RECALL		GPM_CONF_DIR "/notify/perhaps_recall"
-#define GPM_CONF_NOTIFY_LOW_CAPACITY		GPM_CONF_DIR "/notify/low_capacity"
-#define GPM_CONF_NOTIFY_DISCHARGING		GPM_CONF_DIR "/notify/discharging"
-#define GPM_CONF_NOTIFY_FULLY_CHARGED		GPM_CONF_DIR "/notify/fully_charged"
-#define GPM_CONF_NOTIFY_SLEEP_FAILED		GPM_CONF_DIR "/notify/sleep_failed"
-#define GPM_CONF_NOTIFY_SLEEP_FAILED_URI	GPM_CONF_DIR "/notify/sleep_failed_uri"
-#define GPM_CONF_NOTIFY_LOW_POWER		GPM_CONF_DIR "/notify/low_power"
-
-/* statistics */
-#define GPM_CONF_STATS_SHOW_AXIS_LABELS		GPM_CONF_DIR "/statistics/show_axis_labels"
-#define GPM_CONF_STATS_SHOW_EVENTS		GPM_CONF_DIR "/statistics/show_events"
-#define GPM_CONF_STATS_SMOOTH_DATA		GPM_CONF_DIR "/statistics/smooth_data"
-#define GPM_CONF_STATS_GRAPH_TYPE		GPM_CONF_DIR "/statistics/graph_type"
-#define GPM_CONF_STATS_MAX_TIME			GPM_CONF_DIR "/statistics/data_max_time"
-
-/* thresholds */
-#define GPM_CONF_THRESH_PERCENTAGE_LOW		GPM_CONF_DIR "/thresholds/percentage_low"
-#define GPM_CONF_THRESH_PERCENTAGE_CRITICAL	GPM_CONF_DIR "/thresholds/percentage_critical"
-#define GPM_CONF_THRESH_PERCENTAGE_ACTION	GPM_CONF_DIR "/thresholds/percentage_action"
-#define GPM_CONF_THRESH_TIME_LOW		GPM_CONF_DIR "/thresholds/time_low"
-#define GPM_CONF_THRESH_TIME_CRITICAL		GPM_CONF_DIR "/thresholds/time_critical"
-#define GPM_CONF_THRESH_TIME_ACTION		GPM_CONF_DIR "/thresholds/time_action"
-
-/* timeout */
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_AC	GPM_CONF_DIR "/timeout/sleep_computer_ac"
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT	GPM_CONF_DIR "/timeout/sleep_computer_battery"
-#define GPM_CONF_TIMEOUT_SLEEP_COMPUTER_UPS	GPM_CONF_DIR "/timeout/sleep_computer_ups"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_AC	GPM_CONF_DIR "/timeout/sleep_display_ac"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_BATT	GPM_CONF_DIR "/timeout/sleep_display_battery"
-#define GPM_CONF_TIMEOUT_SLEEP_DISPLAY_UPS	GPM_CONF_DIR "/timeout/sleep_display_ups"
-
-/* ui */
-#define GPM_CONF_UI_ICON_POLICY			GPM_CONF_DIR "/ui/icon_policy"
-#define GPM_CONF_UI_ENABLE_SOUND		GPM_CONF_DIR "/ui/enable_sound"
-#define GPM_CONF_UI_SHOW_ACTIONS		GPM_CONF_DIR "/ui/show_actions"
-
-/* new info binary */
-#define GPM_CONF_INFO_HISTORY_TIME		"/apps/mate-power-manager/info/history_time"
-#define GPM_CONF_INFO_HISTORY_TYPE		"/apps/mate-power-manager/info/history_type"
-#define GPM_CONF_INFO_HISTORY_GRAPH_SMOOTH	"/apps/mate-power-manager/info/history_graph_smooth"
-#define GPM_CONF_INFO_HISTORY_GRAPH_POINTS	"/apps/mate-power-manager/info/history_graph_points"
-#define GPM_CONF_INFO_STATS_TYPE		"/apps/mate-power-manager/info/stats_type"
-#define GPM_CONF_INFO_STATS_GRAPH_SMOOTH	"/apps/mate-power-manager/info/stats_graph_smooth"
-#define GPM_CONF_INFO_STATS_GRAPH_POINTS	"/apps/mate-power-manager/info/stats_graph_points"
-#define GPM_CONF_INFO_PAGE_NUMBER		"/apps/mate-power-manager/info/page_number"
-#define GPM_CONF_INFO_LAST_DEVICE		"/apps/mate-power-manager/info/last_device"
-
-/* mate-screensaver */
-#define GS_CONF_DIR				"/apps/mate-screensaver"
-#define GS_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
-
-/* mate-session */
-#define GPM_CONF_IDLE_DELAY			"/desktop/mate/session/idle_delay"
-
-typedef enum {
-	GPM_ICON_POLICY_ALWAYS,
-	GPM_ICON_POLICY_PRESENT,
-	GPM_ICON_POLICY_CHARGE,
-	GPM_ICON_POLICY_LOW,
-	GPM_ICON_POLICY_CRITICAL,
-	GPM_ICON_POLICY_NEVER
-} GpmIconPolicy;
-
-typedef enum {
-	GPM_ACTION_POLICY_BLANK,
-	GPM_ACTION_POLICY_SUSPEND,
-	GPM_ACTION_POLICY_SHUTDOWN,
-	GPM_ACTION_POLICY_HIBERNATE,
-	GPM_ACTION_POLICY_INTERACTIVE,
-	GPM_ACTION_POLICY_NOTHING
-} GpmActionPolicy;
-
-gchar		*gpm_get_timestring				(guint		 time);
-GpmIconPolicy	 gpm_icon_policy_from_string			(const gchar	*policy);
-const gchar	*gpm_icon_policy_to_string			(GpmIconPolicy	 policy);
-GpmActionPolicy	 gpm_action_policy_from_string			(const gchar	*policy);
-const gchar	*gpm_action_policy_to_string			(GpmActionPolicy  policy);
 void 		 gpm_help_display				(const gchar	*link_id);
 #ifdef EGG_TEST
 void		 gpm_common_test				(gpointer	 data);
diff --git a/applets/inhibit/inhibit-applet.c b/applets/inhibit/inhibit-applet.c
index 28b22aa..b2d1e92 100644
--- a/applets/inhibit/inhibit-applet.c
+++ b/applets/inhibit/inhibit-applet.c
@@ -505,7 +505,7 @@ gpm_applet_dialog_about_cb (GtkAction *action, gpointer data)
 	mate_about_dialog_set_translator_credits (about, translator_credits);
 	mate_about_dialog_set_logo (about, logo);
 	mate_about_dialog_set_license (about, license_trans);
-	mate_about_dialog_set_website (about, GPM_HOMEPAGE_URL);
+	mate_about_dialog_set_website (about, "http://www.mate-desktop.org/");
 
 	g_signal_connect (G_OBJECT(about), "response",
 			  G_CALLBACK(gtk_widget_destroy), NULL);