aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-11-12 08:49:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-11-12 08:16:04 +0000
commit0a9cc2a474ff583c928e109468f20330aae0603c (patch)
treeda9f45620263ad12083d18bd2d9528ff3e2da14d
parent0f33bc4be7e9dffaa6b68cd758c3c531460c9a2f (diff)
downloadayatana-indicator-power-0a9cc2a474ff583c928e109468f20330aae0603c.tar.gz
ayatana-indicator-power-0a9cc2a474ff583c928e109468f20330aae0603c.tar.bz2
ayatana-indicator-power-0a9cc2a474ff583c928e109468f20330aae0603c.zip
Drop unnecessary dependency on Ubuntu's url-dispatcher.
-rw-r--r--CMakeLists.txt3
-rw-r--r--debian/control1
-rw-r--r--src/notifier.c11
-rw-r--r--src/service.c17
4 files changed, 2 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07843e7..db8c312 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,7 @@ pkg_check_modules(SERVICE_DEPS REQUIRED
gio-2.0>=2.36
gio-unix-2.0>=2.36
gudev-1.0>=204
- libnotify>=0.7.6
- url-dispatcher-1>=1)
+ libnotify>=0.7.6)
include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
diff --git a/debian/control b/debian/control
index 0e9147e..572c2a3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Build-Depends: cmake,
libnotify-dev (>= 0.7.6),
libglib2.0-dev (>= 2.36),
libgudev-1.0-dev,
- liburl-dispatcher1-dev,
python:any,
# for packaging
debhelper (>= 9),
diff --git a/src/notifier.c b/src/notifier.c
index 5608662..8a799f4 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -21,8 +21,6 @@
#include "dbus-shared.h"
#include "notifier.h"
-#include <url-dispatcher.h>
-
#include <libnotify/notify.h>
#include <glib/gi18n.h>
@@ -168,14 +166,6 @@ notification_clear (IndicatorPowerNotifier * self)
}
static void
-on_battery_settings_clicked(NotifyNotification * nn G_GNUC_UNUSED,
- char * action G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
-{
- url_dispatch_send("settings:///system/battery", NULL, NULL);
-}
-
-static void
on_dismiss_clicked(NotifyNotification * nn G_GNUC_UNUSED,
char * action G_GNUC_UNUSED,
gpointer user_data G_GNUC_UNUSED)
@@ -250,7 +240,6 @@ notification_show(IndicatorPowerNotifier * self)
notify_notification_set_hint(nn, "x-ayatana-snap-decisions-timeout", g_variant_new_int32(INT32_MAX));
notify_notification_set_timeout(nn, NOTIFY_EXPIRES_NEVER);
notify_notification_add_action(nn, "dismiss", _("OK"), on_dismiss_clicked, NULL, NULL);
- notify_notification_add_action(nn, "settings", _("Battery settings"), on_battery_settings_clicked, NULL, NULL);
}
/* if we can show it, keep it */
diff --git a/src/service.c b/src/service.c
index 6bd5959..679dc5e 100644
--- a/src/service.c
+++ b/src/service.c
@@ -20,7 +20,6 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <url-dispatcher.h>
#include "brightness.h"
#include "dbus-shared.h"
@@ -783,12 +782,7 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED,
if (control_center_cmd == NULL)
{
- if (g_getenv ("MIR_SOCKET") != NULL)
- {
- url_dispatch_send("settings:///system/battery", NULL, NULL);
- return;
- }
- else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+ if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
{
control_center_cmd = "xfce4-power-manager-settings";
}
@@ -828,14 +822,6 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED,
g_free (cmd);
}
-static void
-on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED,
- GVariant * param G_GNUC_UNUSED,
- gpointer gself G_GNUC_UNUSED)
-{
- url_dispatch_send("settings:///system/battery", NULL, NULL);
-}
-
/***
****
***/
@@ -872,7 +858,6 @@ init_gactions (IndicatorPowerService * self)
GActionEntry entries[] = {
{ "activate-settings", on_settings_activated },
- { "activate-phone-settings", on_phone_settings_activated },
{ "activate-statistics", on_statistics_activated, "s" }
};