aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-05 15:15:22 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-05 15:15:22 -0500
commita535ab4cae4cb2471f1733fe5bc0bcc2249b5dda (patch)
tree9320c6fbfd2643819c6949ecf31c3dd08aa82b55
parent3cab394226cc9f2633fea2bc50b3caa9cacdd7f4 (diff)
downloadayatana-indicator-session-a535ab4cae4cb2471f1733fe5bc0bcc2249b5dda.tar.gz
ayatana-indicator-session-a535ab4cae4cb2471f1733fe5bc0bcc2249b5dda.tar.bz2
ayatana-indicator-session-a535ab4cae4cb2471f1733fe5bc0bcc2249b5dda.zip
remove unnecessary prototypes
-rw-r--r--src/device-menu-mgr.c47
1 files changed, 17 insertions, 30 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index 302e98c..80e3b0a 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -65,20 +65,7 @@ struct _DeviceMenuMgr
static void setup_up (DeviceMenuMgr* self);
static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self);
-static void machine_sleep_with_context (DeviceMenuMgr* self,
- const gchar* type);
-static void show_system_settings (DbusmenuMenuitem * mi,
- guint timestamp,
- gpointer userdata);
static void screensaver_keybinding_changed (GSettings*, const gchar*, gpointer);
-static void
-machine_sleep_from_hibernate (DbusmenuMenuitem * mi,
- guint timestamp,
- gpointer userdata);
-static void
-machine_sleep_from_suspend (DbusmenuMenuitem * mi,
- guint timestamp,
- gpointer userdata);
G_DEFINE_TYPE (DeviceMenuMgr, device_menu_mgr, G_TYPE_OBJECT);
@@ -153,6 +140,23 @@ screensaver_keybinding_changed (GSettings * settings,
update_screensaver_shortcut (DEVICE_MENU_MGR(userdata)->lock_mi, settings);
}
+
+/* Let's put this machine to sleep with some hints on how it should sleep. */
+static void
+machine_sleep_with_context (DeviceMenuMgr* self, const gchar* type)
+{
+ if (self->up_main_proxy == NULL)
+ {
+ g_warning("Cannot %s because no upower proxy", type);
+ }
+ else
+ {
+ dbus_g_proxy_begin_call (self->up_main_proxy, type,
+ NULL, NULL, NULL,
+ G_TYPE_INVALID);
+ }
+}
+
static void
machine_sleep_from_suspend (DbusmenuMenuitem * mi G_GNUC_UNUSED,
guint timestamp G_GNUC_UNUSED,
@@ -169,23 +173,6 @@ machine_sleep_from_hibernate (DbusmenuMenuitem * mi G_GNUC_UNUSED,
machine_sleep_with_context (DEVICE_MENU_MGR(userdata), "Hibernate");
}
-/* Let's put this machine to sleep, with some info on how
- it should sleep. */
-static void
-machine_sleep_with_context (DeviceMenuMgr* self, const gchar* type)
-{
- if (self->up_main_proxy == NULL)
- {
- g_warning("Can not %s as no upower proxy", type);
- }
- else
- {
- dbus_g_proxy_begin_call (self->up_main_proxy, type,
- NULL, NULL, NULL,
- G_TYPE_INVALID);
- }
-}
-
/***
****
***/