From 9c60e05653c79d4f231f100f0cc35966e6738f54 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Feb 2010 12:04:26 -0600 Subject: Adding in the ability to use keyfiles for the black list --- src/messages-service.c | 79 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 11 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index ca9e799..fa2a9f6 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -48,6 +48,8 @@ static GMainLoop * mainloop = NULL; static MessageServiceDbus * dbus_interface = NULL; +#define DESKTOP_FILE_GROUP "Messaging Menu" +#define DESKTOP_FILE_KEY_DESKTOP "DesktopFile" static void server_count_changed (AppMenuItem * appitem, guint count, gpointer data); static void server_name_changed (AppMenuItem * appitem, gchar * name, gpointer data); @@ -60,6 +62,8 @@ static gboolean build_launcher (gpointer data); static gboolean build_launchers (gpointer data); static gboolean blacklist_init (gpointer data); static gboolean blacklist_add (gpointer data); +static gboolean blacklist_keyfile_add (gpointer udata); +static void blacklist_add_core (gchar * desktop, gchar * definition); static gboolean blacklist_remove (gpointer data); static void blacklist_dir_changed (GFileMonitor * monitor, GFile * file, GFile * other_file, GFileMonitorEvent event_type, gpointer user_data); static void app_dir_changed (GFileMonitor * monitor, GFile * file, GFile * other_file, GFileMonitorEvent event_type, gpointer user_data); @@ -241,7 +245,11 @@ blacklist_init (gpointer data) while ((filename = g_dir_read_name(dir)) != NULL) { g_debug("Found file: %s", filename); gchar * path = g_build_filename(blacklistdir, filename, NULL); - g_idle_add(blacklist_add, path); + if (g_str_has_suffix(path, "keyfile")) { + g_idle_add(blacklist_keyfile_add, path); + } else { + g_idle_add(blacklist_add, path); + } } g_dir_close(dir); @@ -250,6 +258,42 @@ blacklist_init (gpointer data) return FALSE; } +/* Parses through a keyfile to find the desktop file entry and + pushes them into the blacklist. */ +static gboolean +blacklist_keyfile_add (gpointer udata) +{ + gchar * definition_file = (gchar *)udata; + GKeyFile * keyfile = g_key_file_new(); + GError * error = NULL; + + if (!g_key_file_load_from_file(keyfile, definition_file, G_KEY_FILE_NONE, &error)) { + g_warning("Unable to load keyfile '%s' because: %s", definition_file, error == NULL ? "unknown" : error->message); + g_error_free(error); + g_key_file_free(keyfile); + return FALSE; + } + + if (!g_key_file_has_group(keyfile, DESKTOP_FILE_GROUP)) { + g_warning("Unable to use keyfile '%s' as it has no '" DESKTOP_FILE_GROUP "' group.", definition_file); + g_key_file_free(keyfile); + return FALSE; + } + + if (!g_key_file_has_key(keyfile, DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_DESKTOP, &error)) { + g_warning("Unable to use keyfile '%s' as there is no key '" DESKTOP_FILE_KEY_DESKTOP "' in the group '" DESKTOP_FILE_GROUP "' because: %s", definition_file, error == NULL ? "unknown" : error->message); + g_error_free(error); + g_key_file_free(keyfile); + return FALSE; + } + + gchar * desktopfile = g_key_file_get_string(keyfile, DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_DESKTOP, &error); + blacklist_add_core(desktopfile, definition_file); + + g_key_file_free(keyfile); + return FALSE; +} + /* Add a definition file into the black list and eclipse and launchers that have the same file. */ static gboolean @@ -268,38 +312,51 @@ blacklist_add (gpointer udata) gchar * trimdesktop = pango_trim_string(desktop); g_free(desktop); + blacklist_add_core(trimdesktop, definition_file); + g_free(trimdesktop); + + return FALSE; +} + +/* This takes a desktop file and tries to add it to the black + list for applications in the messaging menu. If it can, + then the launcher item gets marked as eclipsed and hidden + from the user. */ +static void +blacklist_add_core (gchar * desktop, gchar * definition) +{ /* Check for conflicts */ - gpointer data = g_hash_table_lookup(blacklist, trimdesktop); + gpointer data = g_hash_table_lookup(blacklist, desktop); if (data != NULL) { gchar * oldfile = (gchar *)data; - if (!g_strcmp0(oldfile, definition_file)) { + if (!g_strcmp0(oldfile, definition)) { g_warning("Already added file '%s'", oldfile); } else { - g_warning("Already have desktop file '%s' in blacklist file '%s' not adding from '%s'", trimdesktop, oldfile, definition_file); + g_warning("Already have desktop file '%s' in blacklist file '%s' not adding from '%s'", desktop, oldfile, definition); } - g_free(trimdesktop); - g_free(definition_file); - return FALSE; + return; } /* Actually blacklist this thing */ - g_hash_table_insert(blacklist, trimdesktop, definition_file); - g_debug("Adding Blacklist item '%s' for desktop '%s'", definition_file, trimdesktop); + g_hash_table_insert(blacklist, desktop, definition); + g_debug("Adding Blacklist item '%s' for desktop '%s'", definition, desktop); /* Go through and eclipse folks */ GList * launcher; for (launcher = launcherList; launcher != NULL; launcher = launcher->next) { launcherList_t * item = (launcherList_t *)launcher->data; - if (!g_strcmp0(trimdesktop, launcher_menu_item_get_desktop(item->menuitem))) { + if (!g_strcmp0(desktop, launcher_menu_item_get_desktop(item->menuitem))) { launcher_menu_item_set_eclipsed(item->menuitem, TRUE); dbusmenu_menuitem_property_set(item->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); } } check_hidden(); + /* Shouldn't need a resort here as hiding shouldn't cause things to + move other than this item disappearing. */ - return FALSE; + return; } /* Remove a black list item based on the definition file -- cgit v1.2.3 From 0abfced4567f713a6bb2cd60a5d02c875765e2b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Feb 2010 12:44:17 -0600 Subject: Abstracting out the keyfile handling stuff. --- src/messages-service.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index fa2a9f6..40c06bb 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -62,6 +62,7 @@ static gboolean build_launcher (gpointer data); static gboolean build_launchers (gpointer data); static gboolean blacklist_init (gpointer data); static gboolean blacklist_add (gpointer data); +static gchar * desktop_file_from_keyfile (const gchar * definition_file); static gboolean blacklist_keyfile_add (gpointer udata); static void blacklist_add_core (gchar * desktop, gchar * definition); static gboolean blacklist_remove (gpointer data); @@ -264,6 +265,19 @@ static gboolean blacklist_keyfile_add (gpointer udata) { gchar * definition_file = (gchar *)udata; + gchar * desktopfile = desktop_file_from_keyfile(definition_file); + if (desktopfile != NULL) { + blacklist_add_core(desktopfile, definition_file); + g_free(desktopfile); + } + return FALSE; +} + +/* Takes a keyfile and finds the desktop file in it for + us. With some error handling. */ +static gchar * +desktop_file_from_keyfile (const gchar * definition_file) +{ GKeyFile * keyfile = g_key_file_new(); GError * error = NULL; @@ -271,27 +285,30 @@ blacklist_keyfile_add (gpointer udata) g_warning("Unable to load keyfile '%s' because: %s", definition_file, error == NULL ? "unknown" : error->message); g_error_free(error); g_key_file_free(keyfile); - return FALSE; + return NULL; } if (!g_key_file_has_group(keyfile, DESKTOP_FILE_GROUP)) { g_warning("Unable to use keyfile '%s' as it has no '" DESKTOP_FILE_GROUP "' group.", definition_file); g_key_file_free(keyfile); - return FALSE; + return NULL; } if (!g_key_file_has_key(keyfile, DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_DESKTOP, &error)) { g_warning("Unable to use keyfile '%s' as there is no key '" DESKTOP_FILE_KEY_DESKTOP "' in the group '" DESKTOP_FILE_GROUP "' because: %s", definition_file, error == NULL ? "unknown" : error->message); g_error_free(error); g_key_file_free(keyfile); - return FALSE; + return NULL; } gchar * desktopfile = g_key_file_get_string(keyfile, DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_DESKTOP, &error); - blacklist_add_core(desktopfile, definition_file); + gchar * desktop = NULL; + if (desktopfile != NULL) { + desktop = g_strdup(desktopfile); + } g_key_file_free(keyfile); - return FALSE; + return desktop; } /* Add a definition file into the black list and eclipse -- cgit v1.2.3 From 2edf04c593023c304c486c6cb9bc5d091a76368c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Feb 2010 13:09:26 -0600 Subject: Spliting out the launchers into the keyfiles --- src/messages-service.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index 40c06bb..ff6c62d 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -59,6 +59,8 @@ static void indicator_removed (IndicateListener * listener, IndicateListenerServ static void check_eclipses (AppMenuItem * ai); static void remove_eclipses (AppMenuItem * ai); static gboolean build_launcher (gpointer data); +static gboolean build_launcher_keyfile (gpointer data); +static void build_launcher_core (const gchar * desktop); static gboolean build_launchers (gpointer data); static gboolean blacklist_init (gpointer data); static gboolean blacklist_add (gpointer data); @@ -1193,11 +1195,34 @@ build_launcher (gpointer data) g_free(desktop); g_debug("\tcontents: %s", trimdesktop); + build_launcher_core(trimdesktop); + g_free(trimdesktop); + return FALSE; +} + +/* Use a key file to find the desktop file. */ +static gboolean +build_launcher_keyfile (gpointer data) +{ + gchar * path = (gchar *)data; + gchar * desktop = desktop_file_from_keyfile (path); + if (desktop != NULL) { + build_launcher_core(desktop); + g_free(desktop); + } + return FALSE; +} + +/* The core action of dealing with a desktop file that should + be a launcher */ +static void +build_launcher_core (const gchar * desktop) +{ /* Check to see if we already have a launcher */ GList * listitem; for (listitem = launcherList; listitem != NULL; listitem = listitem->next) { launcherList_t * li = (launcherList_t *)listitem->data; - if (!g_strcmp0(launcher_menu_item_get_desktop(li->menuitem), trimdesktop)) { + if (!g_strcmp0(launcher_menu_item_get_desktop(li->menuitem), desktop)) { break; } } @@ -1206,9 +1231,8 @@ build_launcher (gpointer data) /* If not */ /* Build the item */ launcherList_t * ll = g_new0(launcherList_t, 1); - ll->menuitem = launcher_menu_item_new(trimdesktop); - g_free(trimdesktop); - ll->appdiritems = g_list_append(NULL, path); + ll->menuitem = launcher_menu_item_new(desktop); + ll->appdiritems = g_list_append(NULL, g_strdup(desktop)); /* Build a separator */ ll->separator = dbusmenu_menuitem_new(); @@ -1234,10 +1258,10 @@ build_launcher (gpointer data) } else { /* If so add ourselves */ launcherList_t * ll = (launcherList_t *)listitem->data; - ll->appdiritems = g_list_append(ll->appdiritems, path); + ll->appdiritems = g_list_append(ll->appdiritems, g_strdup(desktop)); } - return FALSE; + return; } /* This function goes through all the launchers that we're -- cgit v1.2.3 From 20698c326aa8ae2bc4061d77d79b3554cf32ccbc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Feb 2010 13:22:45 -0600 Subject: If we see a keyfile, use the keyfile processing. --- src/messages-service.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index ff6c62d..52e9a48 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1057,7 +1057,11 @@ app_dir_changed (GFileMonitor * monitor, GFile * file, GFile * other_file, GFile case G_FILE_MONITOR_EVENT_CREATED: { gchar * path = g_file_get_path(file); g_debug("\tCreate: %s", path); - g_idle_add(build_launcher, path); + if (g_str_has_suffix(path, "keyfile")) { + g_idle_add(build_launcher_keyfile, path); + } else { + g_idle_add(build_launcher, path); + } break; } default: @@ -1295,7 +1299,11 @@ build_launchers (gpointer data) while ((filename = g_dir_read_name(dir)) != NULL) { g_debug("Found file: %s", filename); gchar * path = g_build_filename(directory, filename, NULL); - g_idle_add(build_launcher, path); + if (g_str_has_suffix(path, "keyfile")) { + g_idle_add(build_launcher_keyfile, path); + } else { + g_idle_add(build_launcher, path); + } } g_dir_close(dir); -- cgit v1.2.3 From 890a69be7f8df0137a55405afe915627599b3808 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 11:56:03 -0600 Subject: Adding a function to get the items that are in the desktop file. --- src/launcher-menu-item.c | 6 ++++++ src/launcher-menu-item.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 50e8ce6..089402d 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -214,3 +214,9 @@ launcher_menu_item_get_eclipsed (LauncherMenuItem * li) } return FALSE; } + +GList * +launcher_menu_item_get_items (LauncherMenuItem * li) +{ + return NULL; +} diff --git a/src/launcher-menu-item.h b/src/launcher-menu-item.h index 3e031d5..9aed0a7 100644 --- a/src/launcher-menu-item.h +++ b/src/launcher-menu-item.h @@ -59,6 +59,7 @@ const gchar * launcher_menu_item_get_desktop (LauncherMenuItem * launchitem); const gchar * launcher_menu_item_get_description (LauncherMenuItem * li); void launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed); gboolean launcher_menu_item_get_eclipsed (LauncherMenuItem * li); +GList * launcher_menu_item_get_items (LauncherMenuItem * li); G_END_DECLS -- cgit v1.2.3 From cccb9bc5f977a9d11ec3ee9b9055bbee3b2b6738 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:02:23 -0600 Subject: Adding in shortcuts and ids private variables. Full lifecycle. --- src/launcher-menu-item.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 089402d..238c4cf 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -27,6 +27,7 @@ with this program. If not, see . #include #include #include +#include #include "launcher-menu-item.h" #include "dbus-data.h" @@ -42,6 +43,8 @@ struct _LauncherMenuItemPrivate { GAppInfo * appinfo; gchar * desktop; + IndicatorDesktopShortcuts * ids; + GList * shortcuts; }; #define LAUNCHER_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemPrivate)) @@ -86,20 +89,21 @@ launcher_menu_item_init (LauncherMenuItem *self) priv->appinfo = NULL; priv->desktop = NULL; + priv->ids = NULL; + priv->shortcuts = NULL; + return; } static void -launcher_menu_item_dispose (GObject *object) +func_unref (gpointer data, gpointer user_data) { - // LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object); - // LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self); - - G_OBJECT_CLASS (launcher_menu_item_parent_class)->dispose (object); + g_object_unref(G_OBJECT(data)); + return; } static void -launcher_menu_item_finalize (GObject *object) +launcher_menu_item_dispose (GObject *object) { LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object); LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self); @@ -109,6 +113,26 @@ launcher_menu_item_finalize (GObject *object) priv->appinfo = NULL; } + if (priv->ids != NULL) { + g_object_unref(priv->ids); + priv->ids = NULL; + } + + if (priv->shortcuts != NULL) { + g_list_foreach(priv->shortcuts, func_unref, NULL); + g_list_free(priv->shortcuts); + priv->shortcuts = NULL; + } + + G_OBJECT_CLASS (launcher_menu_item_parent_class)->dispose (object); +} + +static void +launcher_menu_item_finalize (GObject *object) +{ + LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object); + LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self); + if (priv->desktop != NULL) { g_free(priv->desktop); priv->desktop = NULL; -- cgit v1.2.3 From 379d88af9fd622801b4143169ec44c867d5cd533 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:31:25 -0600 Subject: Build us some shortcut menuitems --- src/launcher-menu-item.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 238c4cf..c186e45 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -55,6 +55,7 @@ static void launcher_menu_item_init (LauncherMenuItem *self); static void launcher_menu_item_dispose (GObject *object); static void launcher_menu_item_finalize (GObject *object); static void activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data); +static void nick_activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data); G_DEFINE_TYPE (LauncherMenuItem, launcher_menu_item, DBUSMENU_TYPE_MENUITEM); @@ -151,9 +152,12 @@ launcher_menu_item_new (const gchar * desktop_file) LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self); + /* Parse the desktop file we've been given. */ priv->appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(desktop_file)); priv->desktop = g_strdup(desktop_file); + /* Set the appropriate values on this menu item based on the + app info that we've parsed */ g_debug("\tName: %s", launcher_menu_item_get_name(self)); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self)); @@ -161,6 +165,21 @@ launcher_menu_item_new (const gchar * desktop_file) g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); + /* Start to build static shortcuts */ + priv->ids = indicator_desktop_shortcuts_new(priv->desktop, "Messaging Menu"); + const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(priv->ids); + gint i; + for (i = 0; nicks[i] != NULL; i++) { + DbusmenuMenuitem * mi = dbusmenu_menuitem_new(); + g_object_set_data(G_OBJECT(mi), "ids-nick", (gpointer)nicks[i]); + + dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i])); + g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self); + + priv->shortcuts = g_list_append(priv->shortcuts, mi); + } + + /* Check to see if we should be eclipsed */ if (priv->appinfo == NULL) { launcher_menu_item_set_eclipsed(self, TRUE); } @@ -180,6 +199,13 @@ launcher_menu_item_get_name (LauncherMenuItem * appitem) } } +/* Respond to one of the shortcuts getting clicked on. */ +static void +nick_activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data) +{ + +} + /* When the menu item is clicked on it tries to launch the application that is represented by the desktop file */ static void -- cgit v1.2.3 From ca4026eca162910c907fb3224658491335bd98cf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:39:01 -0600 Subject: Responding to clicking on the shortcuts --- src/launcher-menu-item.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index c186e45..f24dfa9 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -49,6 +49,8 @@ struct _LauncherMenuItemPrivate #define LAUNCHER_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemPrivate)) +#define NICK_DATA "ids-nick-data" + /* Prototypes */ static void launcher_menu_item_class_init (LauncherMenuItemClass *klass); static void launcher_menu_item_init (LauncherMenuItem *self); @@ -171,7 +173,7 @@ launcher_menu_item_new (const gchar * desktop_file) gint i; for (i = 0; nicks[i] != NULL; i++) { DbusmenuMenuitem * mi = dbusmenu_menuitem_new(); - g_object_set_data(G_OBJECT(mi), "ids-nick", (gpointer)nicks[i]); + g_object_set_data(G_OBJECT(mi), NICK_DATA, (gpointer)nicks[i]); dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i])); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self); @@ -203,7 +205,21 @@ launcher_menu_item_get_name (LauncherMenuItem * appitem) static void nick_activate_cb (LauncherMenuItem * self, guint timestamp, gpointer data) { + gchar * nick = (gchar *)g_object_get_data(G_OBJECT(self), NICK_DATA); + LauncherMenuItem * lmi = LAUNCHER_MENU_ITEM(data); + + g_return_if_fail(nick != NULL); + g_return_if_fail(lmi != NULL); + + LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(lmi); + + g_return_if_fail(priv->ids != NULL); + if (!indicator_desktop_shortcuts_nick_exec(priv->ids, nick)) { + g_warning("Unable to execute nick '%s' for desktop file '%s'", nick, priv->desktop); + } + + return; } /* When the menu item is clicked on it tries to launch -- cgit v1.2.3 From 05436b2d6a483ea791b5a1ec396493ed08830b25 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:45:44 -0600 Subject: Making visible use boolean properties. --- src/launcher-menu-item.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index f24dfa9..a65aed0 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -263,22 +263,16 @@ void launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed) { g_debug("Laucher '%s' is %s", launcher_menu_item_get_name(li), eclipsed ? "now eclipsed" : "shown again"); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(li), DBUSMENU_MENUITEM_PROP_VISIBLE, eclipsed ? "false" : "true"); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(li), DBUSMENU_MENUITEM_PROP_VISIBLE, !eclipsed); return; } gboolean launcher_menu_item_get_eclipsed (LauncherMenuItem * li) { - const gchar * show = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(li), DBUSMENU_MENUITEM_PROP_VISIBLE); - if (show == NULL) { - return FALSE; - } - g_debug("Launcher check eclipse: %s", show); - if (!g_strcmp0(show, "false")) { - return TRUE; - } - return FALSE; + gboolean show = dbusmenu_menuitem_property_get_bool(DBUSMENU_MENUITEM(li), DBUSMENU_MENUITEM_PROP_VISIBLE); + g_debug("Launcher check eclipse: %s", show ? "false" : "true"); + return !show; } GList * -- cgit v1.2.3 From 5da2f0c0661f6d5ebced459ec677aa86441894b0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:50:12 -0600 Subject: Applying the eclipsed value to the shortcuts that are associted with this launcher. --- src/launcher-menu-item.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index a65aed0..e961573 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -257,13 +257,32 @@ launcher_menu_item_get_description (LauncherMenuItem * li) return g_app_info_get_description(priv->appinfo); } +/* Apply the eclipse value to all the shortcuts */ +static void +eclipse_shortcuts_cb (gpointer data, gpointer user_data) +{ + DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data); + g_return_if_fail(mi != NULL); + + gboolean eclipsed = GPOINTER_TO_UINT(user_data); + + dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !eclipsed); + return; +} + /* Hides the menu item based on whether it is eclipsed or not. */ void launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed) { + g_return_if_fail(IS_LAUNCHER_MENU_ITEM(li)); + LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(li); + g_debug("Laucher '%s' is %s", launcher_menu_item_get_name(li), eclipsed ? "now eclipsed" : "shown again"); dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(li), DBUSMENU_MENUITEM_PROP_VISIBLE, !eclipsed); + + g_list_foreach(priv->shortcuts, eclipse_shortcuts_cb, GINT_TO_POINTER(eclipsed)); + return; } -- cgit v1.2.3 From 3d07cf168800200269449e1d5d2b3e682c8fc033 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 12:53:03 -0600 Subject: Fleshing out the get_items function --- src/launcher-menu-item.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index e961573..d542e11 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -286,6 +286,7 @@ launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed) return; } +/* Check to see if this item is eclipsed */ gboolean launcher_menu_item_get_eclipsed (LauncherMenuItem * li) { @@ -294,8 +295,12 @@ launcher_menu_item_get_eclipsed (LauncherMenuItem * li) return !show; } +/* Gets the shortcuts that are associated with this + launcher. They're a list of DbusmenuMenuitems */ GList * launcher_menu_item_get_items (LauncherMenuItem * li) { - return NULL; + g_return_val_if_fail(IS_LAUNCHER_MENU_ITEM(li), NULL); + LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(li); + return priv->shortcuts; } -- cgit v1.2.3 From c271f6dbdc98ab96f10b4f1cbe82e3133c8254dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 13:09:06 -0600 Subject: Adding the shortcuts into the menuhandling code. --- src/messages-service.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/messages-service.c b/src/messages-service.c index 52e9a48..2893313 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -800,6 +800,15 @@ resort_menu (DbusmenuMenuitem * menushell) dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position); position++; + /* Inserting the shortcuts from the launcher */ + GList * shortcuts = launcher_menu_item_get_items(li->menuitem); + while (shortcuts != NULL) { + g_debug("\t\tMoving shortcut to position %d", position); + dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(shortcuts->data), position); + position++; + shortcuts = g_list_next(shortcuts); + } + /* Putting the launcher separator in */ g_debug("\tMoving launcher separator to position %d", position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->separator), position); @@ -856,6 +865,15 @@ resort_menu (DbusmenuMenuitem * menushell) dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position); position++; + /* Inserting the shortcuts from the launcher */ + GList * shortcuts = launcher_menu_item_get_items(li->menuitem); + while (shortcuts != NULL) { + g_debug("\t\tMoving shortcut to position %d", position); + dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(shortcuts->data), position); + position++; + shortcuts = g_list_next(shortcuts); + } + /* Putting the launcher separator in */ g_debug("\tMoving launcher separator to position %d", position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->separator), position); @@ -1247,6 +1265,11 @@ build_launcher_core (const gchar * desktop) /* Add it to the menu */ dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem)); + GList * shortcuts = launcher_menu_item_get_items(li->menuitem); + while (shortcuts != NULL) { + dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(shortcuts->data)); + shortcuts = g_list_next(shortcuts); + } dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator)); /* If we're in the black list or we've gotten eclipsed -- cgit v1.2.3 From 6a2abb99760ff8395a3e22dabbebf60b98c99f16 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 13:13:37 -0600 Subject: Switching over to using _bool for the visible property --- src/messages-service.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index 2893313..585589a 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -367,7 +367,7 @@ blacklist_add_core (gchar * desktop, gchar * definition) launcherList_t * item = (launcherList_t *)launcher->data; if (!g_strcmp0(desktop, launcher_menu_item_get_desktop(item->menuitem))) { launcher_menu_item_set_eclipsed(item->menuitem, TRUE); - dbusmenu_menuitem_property_set(item->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(item->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); } } @@ -416,7 +416,7 @@ blacklist_remove (gpointer data) } if (serveritem == NULL) { launcher_menu_item_set_eclipsed(li->menuitem, FALSE); - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + dbusmenu_menuitem_property_set_bool(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); } } } @@ -702,14 +702,14 @@ server_removed (IndicateListener * listener, IndicateListenerServer * server, gc /* If there is a menu item, let's get rid of it. */ if (sltp->menuitem != NULL) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(sltp->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->menuitem)); g_object_unref(G_OBJECT(sltp->menuitem)); } /* If there is a separator, let's get rid of it. */ if (sltp->separator != NULL) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->separator), DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(sltp->separator), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->separator)); g_object_unref(G_OBJECT(sltp->separator)); } @@ -814,7 +814,7 @@ resort_menu (DbusmenuMenuitem * menushell) dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->separator), position); if (!launcher_menu_item_get_eclipsed(li->menuitem)) { /* Only clear the visiblity if we're not eclipsed */ - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + dbusmenu_menuitem_property_set_bool(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); last_separator = li->separator; } position++; @@ -850,7 +850,7 @@ resort_menu (DbusmenuMenuitem * menushell) if (si->separator != NULL) { g_debug("\tMoving app %s separator to position %d", INDICATE_LISTENER_SERVER_DBUS_NAME(si->server), position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(si->separator), position); - dbusmenu_menuitem_property_set(si->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + dbusmenu_menuitem_property_set_bool(si->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); position++; last_separator = si->separator; } @@ -879,7 +879,7 @@ resort_menu (DbusmenuMenuitem * menushell) dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->separator), position); if (!launcher_menu_item_get_eclipsed(li->menuitem)) { /* Only clear the visiblity if we're not eclipsed */ - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + dbusmenu_menuitem_property_set_bool(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); last_separator = li->separator; } position++; @@ -888,7 +888,7 @@ resort_menu (DbusmenuMenuitem * menushell) } if (last_separator != NULL) { - dbusmenu_menuitem_property_set(last_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(last_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); } else { g_warning("No last separator on resort"); } @@ -1047,7 +1047,7 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server, /* Hide the item immediately, and then remove it which might take a little longer. */ - dbusmenu_menuitem_property_set(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), menuitem); removed = TRUE; } @@ -1108,7 +1108,7 @@ check_eclipses (AppMenuItem * ai) if (!g_strcmp0(aidesktop, lidesktop)) { launcher_menu_item_set_eclipsed(ll->menuitem, TRUE); - dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); break; } } @@ -1133,7 +1133,7 @@ remove_eclipses (AppMenuItem * ai) if (!g_strcmp0(aidesktop, lidesktop)) { launcher_menu_item_set_eclipsed(ll->menuitem, FALSE); - dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + dbusmenu_menuitem_property_set_bool(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); break; } } @@ -1185,7 +1185,7 @@ destroy_launcher (gpointer data) g_list_free(li->appdiritems); if (li->menuitem != NULL) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(li->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(li->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); dbusmenu_menuitem_child_delete(root_menuitem, DBUSMENU_MENUITEM(li->menuitem)); g_object_unref(G_OBJECT(li->menuitem)); li->menuitem = NULL; @@ -1265,7 +1265,7 @@ build_launcher_core (const gchar * desktop) /* Add it to the menu */ dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem)); - GList * shortcuts = launcher_menu_item_get_items(li->menuitem); + GList * shortcuts = launcher_menu_item_get_items(ll->menuitem); while (shortcuts != NULL) { dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(shortcuts->data)); shortcuts = g_list_next(shortcuts); @@ -1277,7 +1277,7 @@ build_launcher_core (const gchar * desktop) if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem)) || launcher_menu_item_get_eclipsed(ll->menuitem)) { launcher_menu_item_set_eclipsed(ll->menuitem, TRUE); - dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + dbusmenu_menuitem_property_set_bool(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); } resort_menu(root_menuitem); -- cgit v1.2.3 From abedb35f468b736aaa4d6f53b8270adb3109e107 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Feb 2010 13:40:20 -0600 Subject: Explicitly setting the visible property so we call pull it later. --- src/launcher-menu-item.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index d542e11..d6386a3 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -164,6 +164,7 @@ launcher_menu_item_new (const gchar * desktop_file) dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self)); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self)); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); -- cgit v1.2.3