Removed unnecessary function from interface, updated formatting in service.

4 files changed, 57 insertions, 130 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ba68cf..816c9fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ indicator_example_service_SOURCES = \
 indicator_example_service_CFLAGS = \
 	-Wall \
 	$(SERVICE_CFLAGS) \
-	-DTIMEZONE_FILE="\"/etc/timezone\"" \
 	-DG_LOG_DOMAIN=\"Indicator-Example\"
 indicator_example_service_LDADD = \
 	$(SERVICE_LIBS)
diff --git a/src/example-interface.c b/src/example-interface.c
index 1ca729a..2b5fe1b 100644
--- a/src/example-interface.c
+++ b/src/example-interface.c
@@ -181,27 +181,3 @@ example_interface_finalize (GObject *object)
 	return;
 }
 
-void
-example_interface_update (ExampleInterface *self)
-{
-	g_return_if_fail(IS_EXAMPLE_INTERFACE(self));
-
-	ExampleInterfacePrivate * priv = EXAMPLE_INTERFACE_GET_PRIVATE(self);
-	GError * error = NULL;
-
-	g_dbus_connection_emit_signal (priv->bus,
-	                               NULL,
-	                               SERVICE_OBJ,
-	                               SERVICE_IFACE,
-	                               "UpdateTime",
-	                               NULL,
-	                               &error);
-
-	if (error != NULL) {
-		g_error("Unable to send UpdateTime signal: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	return;
-}
diff --git a/src/example-interface.h b/src/example-interface.h
index 3c18c48..c3de461 100644
--- a/src/example-interface.h
+++ b/src/example-interface.h
@@ -40,8 +40,6 @@ typedef struct _ExampleInterfaceClass   ExampleInterfaceClass;
 
 struct _ExampleInterfaceClass {
 	GObjectClass parent_class;
-
-	void (*update_time) (void);
 };
 
 struct _ExampleInterface {
@@ -50,7 +48,6 @@ struct _ExampleInterface {
 };
 
 GType              example_interface_get_type       (void);
-void               example_interface_update         (ExampleInterface *self);
 
 G_END_DECLS
 
diff --git a/src/example-service.c b/src/example-service.c
index c58ca91..84a33bb 100644
--- a/src/example-service.c
+++ b/src/example-service.c
@@ -27,8 +27,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <math.h>
-#include <gconf/gconf-client.h>
 
 #include <libdbusmenu-gtk/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -39,120 +37,77 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "dbus-shared.h"
 #include "settings-shared.h"
 
-static IndicatorService * service = NULL;
-static GMainLoop * mainloop = NULL;
-static DbusmenuServer * server = NULL;
-static DbusmenuMenuitem * root = NULL;
-static ExampleInterface * dbus = NULL;
+static IndicatorService *service = NULL;
+static GMainLoop *mainloop = NULL;
+static DbusmenuServer *server = NULL;
+static DbusmenuMenuitem *root = NULL;
+static ExampleInterface *dbus = NULL;
 
 /* Global Items */
-static DbusmenuMenuitem * item_1 = NULL;
-static DbusmenuMenuitem * item_2 = NULL;
+static DbusmenuMenuitem *item_1 = NULL;
+static DbusmenuMenuitem *item_2 = NULL;
 
 static void
-build_menus (DbusmenuMenuitem * root)
+build_menus(DbusmenuMenuitem *root)
 {
-	g_debug("Building Menus.");
-	if (item_1 == NULL) {
-		item_1 = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (item_1, DBUSMENU_MENUITEM_PROP_LABEL, _("Test Item 1"));
-		dbusmenu_menuitem_property_set_bool(item_1, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
-		dbusmenu_menuitem_child_append(root, item_1);
-	}
-        if (item_2 == NULL) {
-		item_2 = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (item_2, DBUSMENU_MENUITEM_PROP_LABEL, _("Test Item 2"));
-		dbusmenu_menuitem_property_set_bool(item_2, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
-		dbusmenu_menuitem_child_append(root, item_2);
-	}
-
-	return;
-}
-
-static void
-session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name,
-                          GVariant * parameters, gpointer user_data)
-{
-	// Just returned from suspend
-	if (g_strcmp0(signal_name, "SystemIdleHintChanged") == 0) {
-		gboolean idle = FALSE;
-		g_variant_get(parameters, "(b)", &idle);
-		if (!idle) {
-			example_interface_update(EXAMPLE_INTERFACE(user_data));
-		}
-	}
-	return;
-}
-
-/* for hooking into console kit signal on wake from suspend */
-static void
-system_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
-{
-	GError * error = NULL;
-	
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for ConsoleKit: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	g_signal_connect(proxy, "g-signal", G_CALLBACK(session_active_change_cb), user_data);
+  g_debug("Building Menus.");
+  if (item_1 == NULL) {
+    item_1 = dbusmenu_menuitem_new();
+    dbusmenu_menuitem_property_set(item_1, DBUSMENU_MENUITEM_PROP_LABEL, _("Test Item 1"));
+    dbusmenu_menuitem_child_append(root, item_1);
+  }
+  if (item_2 == NULL) {
+    item_2 = dbusmenu_menuitem_new();
+    dbusmenu_menuitem_property_set(item_2, DBUSMENU_MENUITEM_PROP_LABEL, _("Test Item 2"));
+    dbusmenu_menuitem_child_append(root, item_2);
+  }
+
+  return;
 }
 
 /* Responds to the service object saying it's time to shutdown.
    It stops the mainloop. */
 static void 
-service_shutdown (IndicatorService * service, gpointer user_data)
+service_shutdown(IndicatorService *service, gpointer user_data)
 {
-	g_warning("Shutting down service!");
-	g_main_loop_quit(mainloop);
-	return;
+  g_warning("Shutting down service!");
+  g_main_loop_quit(mainloop);
+  return;
 }
 
 /* Function to build everything up.  Entry point from asm. */
 int
-main (int argc, char ** argv)
+main(int argc, char **argv)
 {
-	g_type_init();
-
-	/* Acknowledging the service init and setting up the interface */
-	service = indicator_service_new_version(SERVICE_NAME, SERVICE_VERSION);
-	g_signal_connect(service, INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL);
-
-	/* Setting up i18n and gettext.  Apparently, we need
-	   all of these. */
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	/* Building the base menu */
-	server = dbusmenu_server_new(MENU_OBJ);
-	root = dbusmenu_menuitem_new();
-	dbusmenu_server_set_root(server, root);
-	
-	build_menus(root);
-	
-	/* Setup dbus interface */
-	dbus = g_object_new(EXAMPLE_INTERFACE_TYPE, NULL);
-
-	/* And watch for system resumes */
-	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-		                  G_DBUS_PROXY_FLAGS_NONE,
-		                  NULL,
-		                  "org.freedesktop.ConsoleKit",
-		                  "/org/freedesktop/ConsoleKit/Manager",
-		                  "org.freedesktop.ConsoleKit.Manager",
-		                  NULL, system_proxy_cb, dbus);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(G_OBJECT(dbus));
-	g_object_unref(G_OBJECT(service));
-	g_object_unref(G_OBJECT(server));
-	g_object_unref(G_OBJECT(root));
-
-	return 0;
+  g_type_init();
+
+  /* Acknowledging the service init and setting up the interface */
+  service = indicator_service_new_version(SERVICE_NAME, SERVICE_VERSION);
+  g_signal_connect(service, INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL);
+
+  /* Setting up i18n and gettext.  Apparently, we need
+  all of these. */
+  setlocale(LC_ALL, "");
+  bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+  textdomain(GETTEXT_PACKAGE);
+
+  /* Building the base menu */
+  server = dbusmenu_server_new(MENU_OBJ);
+  root = dbusmenu_menuitem_new();
+  dbusmenu_server_set_root(server, root);
+
+  build_menus(root);
+
+  /* Setup dbus interface */
+  dbus = g_object_new(EXAMPLE_INTERFACE_TYPE, NULL);
+
+  mainloop = g_main_loop_new(NULL, FALSE);
+  g_main_loop_run(mainloop);
+
+  g_object_unref(G_OBJECT(dbus));
+  g_object_unref(G_OBJECT(service));
+  g_object_unref(G_OBJECT(server));
+  g_object_unref(G_OBJECT(root));
+
+  return 0;
 }