From a36d08d6fc86c835171d4f19fce17b3aff7a6035 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 17 Feb 2014 11:43:28 -0600 Subject: [PATCH] registryd: Remove some unused code --- registryd/de-marshaller.c | 22 ---------------------- registryd/registry-main.c | 9 --------- 2 files changed, 31 deletions(-) diff --git a/registryd/de-marshaller.c b/registryd/de-marshaller.c index 8b2b00f..fef8e48 100644 --- a/registryd/de-marshaller.c +++ b/registryd/de-marshaller.c @@ -100,25 +100,3 @@ dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_D e->modifiers = modifiers; return TRUE; } - -/* - * This is a rather annoying function needed to replace - * NULL values of strings with the empty string. Null string - * values can be created by the atk_object_get_name or text selection - */ -static const void * -provide_defaults(const gint type, - const void *val) -{ - switch (type) - { - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - if (!val) - return ""; - else - return val; - default: - return val; - } -} diff --git a/registryd/registry-main.c b/registryd/registry-main.c index 1b8676f..e8133fe 100644 --- a/registryd/registry-main.c +++ b/registryd/registry-main.c @@ -47,7 +47,6 @@ static GOptionEntry optentries[] = {NULL} }; -static GDBusConnection *bus_connection = NULL; static GDBusProxy *sm_proxy = NULL; static char *client_id = NULL; static GDBusProxy *client_proxy = NULL; @@ -58,8 +57,6 @@ static GDBusProxy *client_proxy = NULL; #define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" -static void registry_session_init (const char *previous_client_id, const char *exe); - static void on_session_over (GDBusProxy *proxy, gchar *sender_name, @@ -87,12 +84,6 @@ session_manager_connect (void) return (sm_proxy != NULL); } -static void -stop_cb (gpointer data) -{ - g_main_loop_quit (mainloop); -} - static gboolean end_session_response (gboolean is_okay, const gchar *reason) { -- 2.7.4