[gnome-user-share] obex: Remove the status icon
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] obex: Remove the status icon
- Date: Thu, 14 Nov 2013 21:14:36 +0000 (UTC)
commit 33defec866aed48824b2f5d4db522605c3ce3810
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 14 16:54:19 2013 +0100
obex: Remove the status icon
The Bluetooth icon will already show up when a transfer is on-going
so we don't need an extra icon showing up in a place where we
wouldn't look.
src/obexpush.c | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/src/obexpush.c b/src/obexpush.c
index c4e03ab..e992329 100644
--- a/src/obexpush.c
+++ b/src/obexpush.c
@@ -73,21 +73,9 @@ static BluetoothClient *client;
static AcceptSetting accept_setting = -1;
static gboolean show_notifications = FALSE;
-static GtkStatusIcon *statusicon = NULL;
-static guint num_notifications = 0;
-
-static void
-hide_statusicon (void)
-{
- num_notifications--;
- if (num_notifications == 0)
- gtk_status_icon_set_visible (statusicon, FALSE);
-}
-
static void
on_close_notification (NotifyNotification *notification)
{
- hide_statusicon ();
g_object_unref (notification);
}
@@ -135,8 +123,6 @@ notification_launch_action_on_file_cb (NotifyNotification *notification,
}
notify_notification_close (notification, NULL);
- /* No need to call hide_statusicon(), closing the notification
- * will call the close callback */
}
static void
@@ -194,17 +180,6 @@ show_notification (const char *filename)
}
static void
-show_icon (void)
-{
- if (statusicon == NULL) {
- statusicon = gtk_status_icon_new_from_icon_name ("gnome-obex-server");
- } else {
- gtk_status_icon_set_visible (statusicon, TRUE);
- }
- num_notifications++;
-}
-
-static void
ask_user_transfer_accepted (NotifyNotification *notification,
char *action,
GDBusMethodInvocation *invocation)
@@ -215,8 +190,6 @@ ask_user_transfer_accepted (NotifyNotification *notification,
g_dbus_method_invocation_return_value (invocation,
g_variant_new ("(s)", file));
-
- show_icon ();
}
static void
@@ -591,8 +564,6 @@ transfer_property_changed (GDBusProxy *transfer,
if (show_notifications) {
g_debug ("transfer completed, showing a notification");
show_notification (path);
- } else {
- hide_statusicon ();
}
g_free (path);
}
@@ -661,8 +632,6 @@ obex_agent_authorize_push (GObject *source_object,
g_dbus_method_invocation_return_value (invocation,
g_variant_new ("(s)", template));
- show_icon ();
-
g_debug ("Incoming transfer authorized: %s (temp file: %s)", filename, template);
g_free (template);
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]