A bit of renaming with the dbusmenu properties.

3 files changed, 17 insertions, 6 deletions

diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 6e8cd65..76d30ab 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -24,4 +24,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MENU_OBJ        "/com/launchpad/RecentNotifications/indicator/menu"
 
-#define DBUSMENU_NOTIFICATION_MENUITEM_TYPE "x-launchpad-recent-notifications-item"
+#define NOTIFICATION_MENUITEM_TYPE          "notification-menuitem"
+#define NOTIFICATION_MENUITEM_PROP_APP_NAME "notification-menuitem-prop-app-name"
+#define NOTIFICATION_MENUITEM_PROP_APP_ICON "notification-menuitem-prop-app-icon"
+#define NOTIFICATION_MENUITEM_PROP_SUMMARY  "notification-menuitem-prop-summary"
+#define NOTIFICATION_MENUITEM_PROP_BODY     "notification-menuitem-prop-body"
diff --git a/src/indicator-notifications.c b/src/indicator-notifications.c
index 045656e..77dadf3 100644
--- a/src/indicator-notifications.c
+++ b/src/indicator-notifications.c
@@ -165,7 +165,7 @@ indicator_notifications_init(IndicatorNotifications *self)
 
   DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(self->priv->menu);
 
-  dbusmenu_client_add_type_handler_full(DBUSMENU_CLIENT(client), DBUSMENU_NOTIFICATION_MENUITEM_TYPE, new_notification_menuitem, self, NULL);
+  dbusmenu_client_add_type_handler_full(DBUSMENU_CLIENT(client), NOTIFICATION_MENUITEM_TYPE, new_notification_menuitem, self, NULL);
 
   self->priv->service_proxy_cancel = g_cancellable_new();
 
@@ -293,7 +293,7 @@ new_notification_menuitem(DbusmenuMenuitem *new_item, DbusmenuMenuitem *parent,
 
   GtkWidget *item = gtk_menu_item_new();
   gtk_menu_item_set_label(GTK_MENU_ITEM(item), dbusmenu_menuitem_property_get(new_item,
-        DBUSMENU_MENUITEM_PROP_LABEL));
+        NOTIFICATION_MENUITEM_PROP_SUMMARY));
   gtk_widget_show(item);
 
   dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), new_item, GTK_MENU_ITEM(item), parent);
diff --git a/src/notifications-service.c b/src/notifications-service.c
index 2c07c57..880b889 100644
--- a/src/notifications-service.c
+++ b/src/notifications-service.c
@@ -46,6 +46,7 @@ static NotificationsInterface *dbus = NULL;
 /* Global Items */
 static DbusmenuMenuitem *clear_item = NULL;
 static DbusmenuMenuitem *filter_item = NULL;
+static DbusmenuMenuitem *all_applications_item = NULL;
 static GQueue *notification_items = NULL;
 static guint notification_limit = 5;
 
@@ -69,8 +70,8 @@ add_notification_item(gpointer user_data)
   DbusmenuMenuitem *item;
 
   item = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_NOTIFICATION_MENUITEM_TYPE);
-  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, notification_get_summary(note));
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_TYPE, NOTIFICATION_MENUITEM_TYPE);
+  dbusmenu_menuitem_property_set(item, NOTIFICATION_MENUITEM_PROP_SUMMARY, notification_get_summary(note));
   dbusmenu_menuitem_child_add_position(root, item, 1);
   g_queue_push_head(notification_items, item);
 
@@ -115,7 +116,7 @@ build_menus(DbusmenuMenuitem *root)
   g_debug("Building Menus.");
   if(clear_item == NULL) {
     clear_item = dbusmenu_menuitem_new();
-    dbusmenu_menuitem_property_set(clear_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Clear Notifications"));
+    dbusmenu_menuitem_property_set(clear_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Clear"));
     dbusmenu_menuitem_child_prepend(root, clear_item);
 
     g_signal_connect(G_OBJECT(clear_item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, 
@@ -125,6 +126,12 @@ build_menus(DbusmenuMenuitem *root)
     filter_item = dbusmenu_menuitem_new();
     dbusmenu_menuitem_property_set(filter_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Filter"));
     dbusmenu_menuitem_child_prepend(root, filter_item);
+
+    if(all_applications_item == NULL) {
+      all_applications_item = dbusmenu_menuitem_new();
+      dbusmenu_menuitem_property_set(all_applications_item, DBUSMENU_MENUITEM_PROP_LABEL, _("All Applications"));
+      dbusmenu_menuitem_child_append(filter_item, all_applications_item);
+    }
   }
 
   return;