aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2011-06-28 16:03:17 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2011-06-28 16:03:17 +0100
commit1e55136d390f95a84065f733f1ad0ec9f6d9f3c9 (patch)
tree534f08a9a892d206d6eb3ddb307f12ec9f2c32d7
parentce435ff834bafc56e36306965b08e3a0627ad03d (diff)
downloadayatana-indicator-power-1e55136d390f95a84065f733f1ad0ec9f6d9f3c9.tar.gz
ayatana-indicator-power-1e55136d390f95a84065f733f1ad0ec9f6d9f3c9.tar.bz2
ayatana-indicator-power-1e55136d390f95a84065f733f1ad0ec9f6d9f3c9.zip
Remove dbus interface in the client side
We are not going to use a power service
-rw-r--r--Makefile.am2
-rw-r--r--src/dbus-shared-names.h34
-rw-r--r--src/indicator-power.c25
3 files changed, 0 insertions, 61 deletions
diff --git a/Makefile.am b/Makefile.am
index a2af6a5..dfe7690 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,6 @@ SUBDIRS = po
powerlibdir = $(INDICATORDIR)
powerlib_LTLIBRARIES = libpower.la
libpower_la_SOURCES = \
- src/dbus-shared-names.h \
- src/gen-power-service.xml.h \
src/indicator-power.c
libpower_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
deleted file mode 100644
index aec725c..0000000
--- a/src/dbus-shared-names.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
- Javier Jardon <javier.jardon@codethink.co.uk>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef __DBUS_SHARED_NAMES_H__
-#define __DBUS_SHARED_NAMES_H__
-
-
-#define INDICATOR_POWER_DBUS_NAME "com.canonical.indicator.power"
-#define INDICATOR_POWER_DBUS_VERSION 1
-#define INDICATOR_POWER_DBUS_OBJECT "/com/canonical/indicator/power/menu"
-
-
-#endif /* __DBUS_SHARED_NAMES_H__ */
-
diff --git a/src/indicator-power.c b/src/indicator-power.c
index c490ab1..ad878f0 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -32,11 +32,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
/* Indicator Stuff */
#include <libindicator/indicator.h>
#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-service-manager.h>
#include <libindicator/indicator-image-helper.h>
-#include "dbus-shared-names.h"
-
#define DEFAULT_ICON "battery"
#define INDICATOR_POWER_TYPE (indicator_power_get_type ())
@@ -67,8 +64,6 @@ GType indicator_power_get_type (void) G_GNUC_CONST;
struct _IndicatorPowerPrivate
{
- IndicatorServiceManager *service;
-
GtkMenu *menu;
GtkLabel *label;
@@ -188,19 +183,8 @@ indicator_power_init (IndicatorPower *self)
priv = self->priv;
/* Init variables */
- priv->service = NULL;
priv->menu = NULL;
- /* Do stuff with them */
- priv->service = indicator_service_manager_new_version (INDICATOR_POWER_DBUS_NAME,
- INDICATOR_POWER_DBUS_VERSION);
-/*
- g_signal_connect (G_OBJECT (priv->service),
- INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE,
- G_CALLBACK (connection_changed),
- self);
-*/
-
priv->menu = GTK_MENU (gtk_menu_new ());
gtk_menu_set_title (priv->menu, _("Power"));
@@ -222,15 +206,6 @@ indicator_power_init (IndicatorPower *self)
static void
indicator_power_dispose (GObject *object)
{
- IndicatorPower *self = INDICATOR_POWER (object);
- IndicatorPowerPrivate *priv = self->priv;
-
- if (priv->service != NULL)
- {
- g_object_unref (G_OBJECT (priv->service));
- priv->service = NULL;
- }
-
G_OBJECT_CLASS (indicator_power_parent_class)->dispose (object);
}