summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-09-11 18:21:21 +0200
committerinfirit <[email protected]>2015-09-13 18:37:03 +0200
commitf3f4f23330512e0e6e72c1e4288ddfa506b9aa22 (patch)
treecdf5446cd9d06323d7019b19c9bb15a929ac559e /src/main.c
parent460f1d0a1a06e68c56e4265cb00dc86d4d194f78 (diff)
downloadmate-polkit-f3f4f23330512e0e6e72c1e4288ddfa506b9aa22.tar.bz2
mate-polkit-f3f4f23330512e0e6e72c1e4288ddfa506b9aa22.tar.xz
Add support for application indicators
Patch by Jan Arne Petersen taken from https://bugzilla.gnome.org/show_bug.cgi?id=609680
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c53
1 files changed, 53 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 5f8059c..197d29a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,6 +29,10 @@
#include <glib/gi18n.h>
#include <polkitagent/polkitagent.h>
+#ifdef HAVE_APPINDICATOR
+#include <libappindicator/app-indicator.h>
+#endif
+
#include "polkitmatelistener.h"
/* session management support for auto-restart */
@@ -47,7 +51,11 @@ static PolkitSubject *session = NULL;
/* the current set of temporary authorizations */
static GList *current_temporary_authorizations = NULL;
+#ifdef HAVE_APPINDICATOR
+static AppIndicator *app_indicator = NULL;
+#else
static GtkStatusIcon *status_icon = NULL;
+#endif
static GDBusProxy *sm_proxy;
static GDBusProxy *client_proxy = NULL;
@@ -82,6 +90,14 @@ revoke_tmp_authz (void)
NULL);
}
+#ifdef HAVE_APPINDICATOR
+static void
+on_menu_item_activate (GtkMenuItem *menu_item,
+ gpointer user_data)
+{
+ revoke_tmp_authz ();
+}
+#else
static void
on_status_icon_activate (GtkStatusIcon *status_icon,
gpointer user_data)
@@ -97,6 +113,7 @@ on_status_icon_popup_menu (GtkStatusIcon *status_icon,
{
revoke_tmp_authz ();
}
+#endif
static void
update_temporary_authorization_icon_real (void)
@@ -134,6 +151,31 @@ update_temporary_authorization_icon_real (void)
if (current_temporary_authorizations != NULL)
{
/* show icon */
+#ifdef HAVE_APPINDICATOR
+ if (app_indicator == NULL)
+ {
+ GtkWidget *item, *menu;
+
+ app_indicator = app_indicator_new ("mate-polkit",
+ "gtk-dialog-authentication",
+ APP_INDICATOR_CATEGORY_SYSTEM_SERVICES);
+
+ item = gtk_menu_item_new_with_label (_("Drop all elevated privileges"));
+ g_signal_connect (item,
+ "activate",
+ G_CALLBACK (on_menu_item_activate),
+ NULL);
+ menu = gtk_menu_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show_all (menu);
+
+ app_indicator_set_menu (app_indicator,
+ GTK_MENU (menu));
+ app_indicator_set_status (app_indicator,
+ APP_INDICATOR_STATUS_ACTIVE);
+ }
+
+#else
if (status_icon == NULL)
{
status_icon = gtk_status_icon_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION);
@@ -148,16 +190,27 @@ update_temporary_authorization_icon_real (void)
G_CALLBACK (on_status_icon_popup_menu),
NULL);
}
+#endif
}
else
{
/* hide icon */
+#ifdef HAVE_APPINDICATOR
+ if (app_indicator != NULL)
+ {
+ app_indicator_set_status (app_indicator,
+ APP_INDICATOR_STATUS_PASSIVE);
+ g_object_unref (app_indicator);
+ app_indicator = NULL;
+ }
+#else
if (status_icon != NULL)
{
gtk_status_icon_set_visible (status_icon, FALSE);
g_object_unref (status_icon);
status_icon = NULL;
}
+#endif
}
}