* Add a Settings... menu item to the indicator

* indicator-notifications-settings: check if a window already exists and
present it to avoid multiple windows

3 files changed, 54 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index eda87c8..d5a786f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ libnotifications_la_SOURCES = \
 	notification.h
 
 libnotifications_la_CFLAGS = \
+	-DSETTINGS_PATH=\""$(libexecdir)/indicator-notifications-settings"\" \
 	$(INDICATOR_CFLAGS) \
 	-Wall \
 	-DG_LOG_DOMAIN=\"Indicator-Notifications\"
diff --git a/src/indicator-notifications-settings.c b/src/indicator-notifications-settings.c
index 6a37491..6b9676c 100644
--- a/src/indicator-notifications-settings.c
+++ b/src/indicator-notifications-settings.c
@@ -212,6 +212,13 @@ indicator_notifications_settings_activate(GApplication *app)
 
   IndicatorNotificationsSettings *self = (IndicatorNotificationsSettings *) app;
 
+  /* Check for a pre-existing window */
+  GtkWindow *old_window = gtk_application_get_active_window(GTK_APPLICATION(app));
+  if (old_window != NULL) {
+    gtk_window_present_with_time(old_window, GDK_CURRENT_TIME);
+    return;
+  }
+
   /* GSettings */
   self->settings = g_settings_new(NOTIFICATIONS_SCHEMA);
 
diff --git a/src/indicator-notifications.c b/src/indicator-notifications.c
index 8d64d9a..a7ced67 100644
--- a/src/indicator-notifications.c
+++ b/src/indicator-notifications.c
@@ -69,6 +69,7 @@ struct _IndicatorNotificationsPrivate {
   GtkMenu     *menu;
   GtkWidget   *clear_item;
   GtkWidget   *clear_item_label;
+  GtkWidget   *settings_item;
 
   gchar       *accessible_desc;
 
@@ -106,13 +107,13 @@ static void         indicator_notifications_middle_click(IndicatorObject *io,
                                                          gpointer user_data);
 
 /* Utility Functions */
-static void       clear_menuitems(IndicatorNotifications *self);
-static void       insert_menuitem(IndicatorNotifications *self, GtkWidget *item);
-static void       remove_menuitem(IndicatorNotifications *self, GtkWidget *item);
-static void       set_unread(IndicatorNotifications *self, gboolean unread);
-static void       update_blacklist(IndicatorNotifications *self);
-static void       update_clear_item_markup(IndicatorNotifications *self);
-static void       update_indicator_visibility(IndicatorNotifications *self);
+static void clear_menuitems(IndicatorNotifications *self);
+static void insert_menuitem(IndicatorNotifications *self, GtkWidget *item);
+static void remove_menuitem(IndicatorNotifications *self, GtkWidget *item);
+static void set_unread(IndicatorNotifications *self, gboolean unread);
+static void update_blacklist(IndicatorNotifications *self);
+static void update_clear_item_markup(IndicatorNotifications *self);
+static void update_indicator_visibility(IndicatorNotifications *self);
 
 /* Callbacks */
 static void clear_item_activated_cb(GtkMenuItem *menuitem, gpointer user_data);
@@ -120,12 +121,13 @@ static void menu_visible_notify_cb(GtkWidget *menu, GParamSpec *pspec, gpointer
 static void message_received_cb(DBusSpy *spy, Notification *note, gpointer user_data);
 static void notification_clicked_cb(NotificationMenuItem *menuitem, guint button, gpointer user_data);
 static void setting_changed_cb(GSettings *settings, gchar *key, gpointer user_data);
+static void settings_item_activated_cb(GtkMenuItem *menuitem, gpointer user_data);
 
 /* Indicator Module Config */
 INDICATOR_SET_VERSION
 INDICATOR_SET_TYPE(INDICATOR_NOTIFICATIONS_TYPE)
 
-G_DEFINE_TYPE (IndicatorNotifications, indicator_notifications, INDICATOR_OBJECT_TYPE);
+G_DEFINE_TYPE(IndicatorNotifications, indicator_notifications, INDICATOR_OBJECT_TYPE);
 
 static void
 indicator_notifications_class_init(IndicatorNotificationsClass *klass)
@@ -166,6 +168,13 @@ indicator_notifications_init(IndicatorNotifications *self)
   self->priv->menu = GTK_MENU(gtk_menu_new());
   g_signal_connect(self->priv->menu, "notify::visible", G_CALLBACK(menu_visible_notify_cb), self);
 
+  /* Create the settings menuitem */
+  self->priv->settings_item = gtk_menu_item_new_with_label(_("Settings..."));
+  g_signal_connect(self->priv->settings_item, "activate", G_CALLBACK(settings_item_activated_cb), NULL);
+  gtk_widget_show(self->priv->settings_item);
+
+  gtk_menu_shell_prepend(GTK_MENU_SHELL(self->priv->menu), self->priv->settings_item);
+
   /* Create the clear menuitem */
   self->priv->clear_item_label = gtk_label_new(NULL);
   gtk_misc_set_alignment(GTK_MISC(self->priv->clear_item_label), 0, 0);
@@ -509,6 +518,35 @@ clear_item_activated_cb(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 /**
+ * settings_item_activated_cb:
+ * @menuitem: the settings menuitem
+ * @user_data: the indicator object
+ *
+ * Called when the settings menuitem is activated.
+ **/
+static void
+settings_item_activated_cb(GtkMenuItem *menuitem, gpointer user_data)
+{
+  g_return_if_fail(GTK_IS_MENU_ITEM(menuitem));
+
+  GError *error = NULL;
+
+  gchar *argv[] = { SETTINGS_PATH, NULL };
+
+  GPid pid;
+
+  g_spawn_async(NULL, argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, &pid, &error);
+
+  if (error != NULL) {
+    g_message("%s", error->message);
+    g_error_free(error);
+  }
+  else {
+    g_spawn_close_pid(pid);
+  }
+}
+
+/**
  * setting_changed_cb:
  * @settings: the GSettings object
  * @key: the GSettings key