Removed debian/patches/01_port_to_upower.patch as it is now merged

upstream.

2 files changed, 2 insertions, 151 deletions

diff --git a/debian/changelog b/debian/changelog
index 739b729..794c28d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ indicator-session (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
     * Change switch menu item to "Switch from..."
     * Move from Devkit-Power to upower
     * Adding in user logged in icon and menu item
+  * Removed debian/patches/01_port_to_upower.patch as it is now merged
+    upstream.
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 09:42:50 -0600
 
diff --git a/debian/patches/01_port_to_upower.patch b/debian/patches/01_port_to_upower.patch
deleted file mode 100644
index f04c1c7..0000000
--- a/debian/patches/01_port_to_upower.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Description: Port to upower
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Upstream: https://code.launchpad.net/~pitti/indicator-session/upower/+merge/19472
---- indicator-session/src/session-service.c	2010-02-16 10:25:28.000000000 +0100
-+++ indicator-session.new/src/session-service.c	2010-02-17 11:11:18.149652860 +0100
-@@ -44,9 +44,9 @@
- #include "users-service-dbus.h"
- #include "lock-helper.h"
- 
--#define DKP_ADDRESS    "org.freedesktop.DeviceKit.Power"
--#define DKP_OBJECT     "/org/freedesktop/DeviceKit/Power"
--#define DKP_INTERFACE  "org.freedesktop.DeviceKit.Power"
-+#define UP_ADDRESS    "org.freedesktop.UPower"
-+#define UP_OBJECT     "/org/freedesktop/UPower"
-+#define UP_INTERFACE  "org.freedesktop.UPower"
- 
- #define GUEST_SESSION_LAUNCHER  "/usr/share/gdm/guest-session/guest-session-launch"
- 
-@@ -72,8 +72,8 @@
- 
- static DbusmenuMenuitem * root_menuitem = NULL;
- static GMainLoop * mainloop = NULL;
--static DBusGProxy * dkp_main_proxy = NULL;
--static DBusGProxy * dkp_prop_proxy = NULL;
-+static DBusGProxy * up_main_proxy = NULL;
-+static DBusGProxy * up_prop_proxy = NULL;
- 
- static DBusGProxyCall * suspend_call = NULL;
- static DBusGProxyCall * hibernate_call = NULL;
-@@ -147,14 +147,14 @@
- {
- 	gchar * type = (gchar *)userdata;
- 
--	if (dkp_main_proxy == NULL) {
--		g_warning("Can not %s as no DeviceKit Power Proxy", type);
-+	if (up_main_proxy == NULL) {
-+		g_warning("Can not %s as no upower proxy", type);
- 	}
- 
- 	screensaver_throttle(type);
- 	lock_screen(NULL, 0, NULL);
- 
--	dbus_g_proxy_begin_call(dkp_main_proxy,
-+	dbus_g_proxy_begin_call(up_main_proxy,
- 	                        type,
- 	                        sleep_response,
- 	                        NULL,
-@@ -213,17 +213,17 @@
- /* A signal that we need to recheck to ensure we can still
-    hibernate and/or suspend */
- static void
--dpk_changed_cb (DBusGProxy * proxy, gpointer user_data)
-+up_changed_cb (DBusGProxy * proxy, gpointer user_data)
- {
- 	/* Start Async call to see if we can hibernate */
- 	if (suspend_call == NULL) {
--		suspend_call = dbus_g_proxy_begin_call(dkp_prop_proxy,
-+		suspend_call = dbus_g_proxy_begin_call(up_prop_proxy,
- 		                                       "Get",
- 		                                       suspend_prop_cb,
- 		                                       NULL,
- 		                                       NULL,
- 		                                       G_TYPE_STRING,
--		                                       DKP_INTERFACE,
-+		                                       UP_INTERFACE,
- 		                                       G_TYPE_STRING,
- 		                                       "can-suspend",
- 		                                       G_TYPE_INVALID,
-@@ -233,13 +233,13 @@
- 
- 	/* Start Async call to see if we can suspend */
- 	if (hibernate_call == NULL) {
--		hibernate_call = dbus_g_proxy_begin_call(dkp_prop_proxy,
-+		hibernate_call = dbus_g_proxy_begin_call(up_prop_proxy,
- 		                                         "Get",
- 		                                         hibernate_prop_cb,
- 		                                         NULL,
- 		                                         NULL,
- 		                                         G_TYPE_STRING,
--		                                         DKP_INTERFACE,
-+		                                         UP_INTERFACE,
- 		                                         G_TYPE_STRING,
- 		                                         "can-hibernate",
- 		                                         G_TYPE_INVALID,
-@@ -254,39 +254,39 @@
-    DKp checking.  We're even setting up the calls for the props
-    we need */
- static void
--setup_dkp (void) {
-+setup_up (void) {
- 	DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
- 	g_return_if_fail(bus != NULL);
- 
--	if (dkp_main_proxy == NULL) {
--		dkp_main_proxy = dbus_g_proxy_new_for_name(bus,
--		                                           DKP_ADDRESS,
--		                                           DKP_OBJECT,
--		                                           DKP_INTERFACE);
--	}
--	g_return_if_fail(dkp_main_proxy != NULL);
--
--	if (dkp_prop_proxy == NULL) {
--		dkp_prop_proxy = dbus_g_proxy_new_for_name(bus,
--		                                           DKP_ADDRESS,
--		                                           DKP_OBJECT,
-+	if (up_main_proxy == NULL) {
-+		up_main_proxy = dbus_g_proxy_new_for_name(bus,
-+		                                           UP_ADDRESS,
-+		                                           UP_OBJECT,
-+		                                           UP_INTERFACE);
-+	}
-+	g_return_if_fail(up_main_proxy != NULL);
-+
-+	if (up_prop_proxy == NULL) {
-+		up_prop_proxy = dbus_g_proxy_new_for_name(bus,
-+		                                           UP_ADDRESS,
-+		                                           UP_OBJECT,
- 		                                           DBUS_INTERFACE_PROPERTIES);
- 	}
--	g_return_if_fail(dkp_prop_proxy != NULL);
-+	g_return_if_fail(up_prop_proxy != NULL);
- 
- 	/* Connect to changed signal */
--	dbus_g_proxy_add_signal(dkp_main_proxy,
-+	dbus_g_proxy_add_signal(up_main_proxy,
- 	                        "Changed",
- 	                        G_TYPE_INVALID);
- 
--	dbus_g_proxy_connect_signal(dkp_main_proxy,
-+	dbus_g_proxy_connect_signal(up_main_proxy,
- 	                            "Changed",
--	                            G_CALLBACK(dpk_changed_cb),
-+	                            G_CALLBACK(up_changed_cb),
- 	                            NULL,
- 	                            NULL);
- 
- 	/* Force an original "changed" event */
--	dpk_changed_cb(dkp_main_proxy, NULL);
-+	up_changed_cb(up_main_proxy, NULL);
- 
- 	return;
- }
-@@ -639,7 +639,7 @@
-                       G_CALLBACK (user_removed),
-                       root_menuitem);
- 
--	setup_dkp();
-+	setup_up();
- 
-     DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
-     dbusmenu_server_set_root(server, root_menuitem);