From 0ff6a4d2393c1f56200bd5ca4e5f6f493cadec02 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 11:36:48 -0500 Subject: Making the server separator and putting it in. --- src/messages-service.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index f7b869e..29eaca3 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -26,6 +26,7 @@ with this program. If not, see . #include #include +#include #include #include "im-menu-item.h" @@ -71,6 +72,7 @@ typedef struct _serverList_t serverList_t; struct _serverList_t { IndicateListenerServer * server; AppMenuItem * menuitem; + DbusmenuMenuitem * separator; gboolean attention; guint count; GList * imList; @@ -113,6 +115,7 @@ struct _imList_t { IndicateListenerServer * server; IndicateListenerIndicator * indicator; DbusmenuMenuitem * menuitem; + DbusmenuMenuitem * separator; gulong timechange_cb; gulong attentionchange_cb; }; @@ -477,6 +480,10 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha sl_item->attention = FALSE; sl_item->count = 0; + /* Build a separator */ + sl_item->separator = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(sl_item->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + /* Incase we got an indicator first */ GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal); if (alreadythere != NULL) { @@ -494,8 +501,11 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha g_signal_connect(G_OBJECT(menuitem), APP_MENU_ITEM_SIGNAL_COUNT_CHANGED, G_CALLBACK(server_count_changed), sl_item); g_signal_connect(G_OBJECT(menuitem), APP_MENU_ITEM_SIGNAL_NAME_CHANGED, G_CALLBACK(server_name_changed), menushell); + /* Put our new menu item in, with the separator behind it. + resort_menu will take care of whether it should be hidden + or not. */ dbusmenu_menuitem_child_append(menushell, DBUSMENU_MENUITEM(menuitem)); - /* Should be prepend ^ */ + dbusmenu_menuitem_child_append(menushell, DBUSMENU_MENUITEM(sl_item->separator)); resort_menu(menushell); check_hidden(); -- cgit v1.2.3 From 83d7d67d01553c88e17568d918f6bf1da50262a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 11:42:40 -0500 Subject: Forgot to initialize a separator. Also initializing the locally defined server objects to make it easier to find bugs with not setting stuff. --- src/messages-service.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 29eaca3..73da691 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -590,7 +590,7 @@ static void server_removed (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data) { g_debug("Removing server: %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server)); - serverList_t slt; + serverList_t slt = {0}; slt.server = server; GList * lookup = g_list_find_custom(serverList, &slt, serverList_equal); @@ -755,7 +755,7 @@ indicator_added (IndicateListener * listener, IndicateListenerServer * server, I /* Looking for a server entry to attach this indicator to. If we can't find one then we have to build one and attach the indicator to it. */ - serverList_t sl_item_local; + serverList_t sl_item_local = {0}; serverList_t * sl_item = NULL; sl_item_local.server = server; GList * serverentry = g_list_find_custom(serverList, &sl_item_local, serverList_equal); @@ -769,6 +769,7 @@ indicator_added (IndicateListener * listener, IndicateListenerServer * server, I sl_item->imList = NULL; sl_item->attention = FALSE; sl_item->count = 0; + sl_item->separator = NULL; serverList = g_list_insert_sorted(serverList, sl_item, serverList_sort); } else { @@ -823,7 +824,7 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server, gboolean removed = FALSE; /* Find the server that was related to this item */ - serverList_t sl_item_local; + serverList_t sl_item_local = {0}; serverList_t * sl_item = NULL; sl_item_local.server = server; GList * serverentry = g_list_find_custom(serverList, &sl_item_local, serverList_equal); -- cgit v1.2.3 From 17ac8a0e9bde8373ded7beac533e04c6f300180b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 11:44:09 -0500 Subject: Initializing local imList_t objects. --- src/messages-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 73da691..9654e71 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -835,7 +835,7 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server, sl_item = (serverList_t *)serverentry->data; /* Look in the IM Hash Table */ - imList_t listData; + imList_t listData = {0}; listData.server = server; listData.indicator = indicator; -- cgit v1.2.3 From 240672fb38a107d0ab2dfd9e8daf23262f762a4c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 12:15:07 -0500 Subject: Handling separators on launchers. --- src/messages-service.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 9654e71..e5471ce 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -115,7 +115,6 @@ struct _imList_t { IndicateListenerServer * server; IndicateListenerIndicator * indicator; DbusmenuMenuitem * menuitem; - DbusmenuMenuitem * separator; gulong timechange_cb; gulong attentionchange_cb; }; @@ -157,6 +156,7 @@ imList_sort (gconstpointer a, gconstpointer b) typedef struct _launcherList_t launcherList_t; struct _launcherList_t { LauncherMenuItem * menuitem; + DbusmenuMenuitem * separator; GList * appdiritems; }; @@ -1063,11 +1063,16 @@ build_launcher (gpointer data) g_free(trimdesktop); ll->appdiritems = g_list_append(NULL, path); + /* Build a separator */ + ll->separator = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(ll->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + /* Add it to the list */ launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort); /* Add it to the menu */ dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem)); + dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator)); resort_menu(root_menuitem); if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem))) { -- cgit v1.2.3 From e1230edce3236b5825d4ea1da82ac3a5b6fda684 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 12:50:52 -0500 Subject: Putting the separators into the resorting of the menu. --- src/messages-service.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index e5471ce..990cb3c 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -674,6 +674,11 @@ check_hidden (void) return; } +/* This function takes care of putting the menu in the right order. + It basically it rebuilds the order by looking through all the + applications and launchers and puts them in the right place. The + menu functions will handle the cases where they don't move so this + is a good way to ensure everything is right. */ static void resort_menu (DbusmenuMenuitem * menushell) { @@ -686,13 +691,21 @@ resort_menu (DbusmenuMenuitem * menushell) for (serverentry = serverList; serverentry != NULL; serverentry = serverentry->next) { serverList_t * si = (serverList_t *)serverentry->data; + /* Looking to see if there are any launchers we need to insert + into the menu structure. We put as many as we need to. */ if (launcherentry != NULL) { launcherList_t * li = (launcherList_t *)launcherentry->data; while (launcherentry != NULL && g_strcmp0(launcher_menu_item_get_name(li->menuitem), app_menu_item_get_name(si->menuitem)) < 0) { + /* Putting the launcher item in */ g_debug("\tMoving launcher '%s' to position %d", launcher_menu_item_get_name(li->menuitem), position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position); + position++; + /* 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); position++; + launcherentry = launcherentry->next; if (launcherentry != NULL) { li = (launcherList_t *)launcherentry->data; @@ -700,12 +713,15 @@ resort_menu (DbusmenuMenuitem * menushell) } } + /* Putting the app menu item in */ if (si->menuitem != NULL) { g_debug("\tMoving app %s to position %d", INDICATE_LISTENER_SERVER_DBUS_NAME(si->server), position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(si->menuitem), position); position++; } + /* Putting all the indicators that are related to this application + after it. */ GList * imentry; for (imentry = si->imList; imentry != NULL; imentry = imentry->next) { imList_t * imi = (imList_t *)imentry->data; @@ -716,14 +732,29 @@ resort_menu (DbusmenuMenuitem * menushell) position++; } } + + /* Lastly putting the separator in */ + 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); + position++; + } } + /* Put any leftover launchers in at the end of the list. */ while (launcherentry != NULL) { launcherList_t * li = (launcherList_t *)launcherentry->data; + + /* Putting the launcher in */ g_debug("\tMoving launcher '%s' to position %d", launcher_menu_item_get_name(li->menuitem), position); dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position); + position++; + /* 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); position++; + launcherentry = launcherentry->next; } -- cgit v1.2.3 From bf8b441386fe6c85c74fe57f7fc6d088051094d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 12:58:00 -0500 Subject: When eclipsing a launcher we're hiding it's separator as well. --- src/messages-service.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 990cb3c..b672489 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -290,6 +290,7 @@ blacklist_add (gpointer udata) launcherList_t * item = (launcherList_t *)launcher->data; if (!g_strcmp0(trimdesktop, 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"); } } @@ -336,6 +337,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"); } } } @@ -970,6 +972,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"); break; } } @@ -994,6 +997,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"); break; } } @@ -1108,6 +1112,7 @@ build_launcher (gpointer data) if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem))) { launcher_menu_item_set_eclipsed(ll->menuitem, TRUE); + dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); } } else { /* If so add ourselves */ -- cgit v1.2.3 From 14e60e91042be1373bffd83040d411ef40664b1d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 13:34:32 -0500 Subject: Hiding the last item on the list depending on who is last. --- src/messages-service.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index b672489..3f0173a 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -687,6 +687,7 @@ resort_menu (DbusmenuMenuitem * menushell) guint position = 0; GList * serverentry; GList * launcherentry = launcherList; + gboolean sep_hidden = FALSE; g_debug("Reordering Menu:"); @@ -706,6 +707,7 @@ resort_menu (DbusmenuMenuitem * menushell) /* 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); + dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); position++; launcherentry = launcherentry->next; @@ -739,10 +741,20 @@ 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"); position++; } } + /* If there are no more launchers to add we need to hide the + separator on the last application item */ + if (launcherentry == NULL && serverList != NULL) { + serverentry = g_list_last(serverList); + serverList_t * si = (serverList_t *)serverentry->data; + dbusmenu_menuitem_property_set(si->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + sep_hidden = TRUE; + } + /* Put any leftover launchers in at the end of the list. */ while (launcherentry != NULL) { launcherList_t * li = (launcherList_t *)launcherentry->data; @@ -755,11 +767,18 @@ resort_menu (DbusmenuMenuitem * menushell) /* 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); + dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); position++; launcherentry = launcherentry->next; } + if (!sep_hidden && launcherList != NULL) { + launcherentry = g_list_last(launcherList); + launcherList_t * li = (launcherList_t *)launcherentry->data; + dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + } + return; } -- cgit v1.2.3 From f47cd3eaae4f33de08ba1a8d5f5ff15cf89f65fd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 13:40:46 -0500 Subject: Check eclipse to see if we should make indicators visible or not. --- src/messages-service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 3f0173a..b611357 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -707,7 +707,10 @@ resort_menu (DbusmenuMenuitem * menushell) /* 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); - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + 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"); + } position++; launcherentry = launcherentry->next; -- cgit v1.2.3 From 5a886cf768167eaef5b3e3c648bb8cddfe2c28d7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 13:44:50 -0500 Subject: Switch to checking the separator by keeping track of the last one incase there are a bunch of launchers that are eclipsed at the end of the list. We'll have too many cases, it's easier just to see who we unhide. --- src/messages-service.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index b611357..1013c7b 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -687,7 +687,7 @@ resort_menu (DbusmenuMenuitem * menushell) guint position = 0; GList * serverentry; GList * launcherentry = launcherList; - gboolean sep_hidden = FALSE; + DbusmenuMenuitem * last_separator = NULL; g_debug("Reordering Menu:"); @@ -710,6 +710,7 @@ resort_menu (DbusmenuMenuitem * menushell) 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"); + last_separator = li->separator; } position++; @@ -746,18 +747,10 @@ resort_menu (DbusmenuMenuitem * menushell) dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(si->separator), position); dbusmenu_menuitem_property_set(si->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); position++; + last_separator = si->separator; } } - /* If there are no more launchers to add we need to hide the - separator on the last application item */ - if (launcherentry == NULL && serverList != NULL) { - serverentry = g_list_last(serverList); - serverList_t * si = (serverList_t *)serverentry->data; - dbusmenu_menuitem_property_set(si->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); - sep_hidden = TRUE; - } - /* Put any leftover launchers in at the end of the list. */ while (launcherentry != NULL) { launcherList_t * li = (launcherList_t *)launcherentry->data; @@ -770,16 +763,20 @@ resort_menu (DbusmenuMenuitem * menushell) /* 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); - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "true"); + 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"); + last_separator = li->separator; + } position++; launcherentry = launcherentry->next; } - if (!sep_hidden && launcherList != NULL) { - launcherentry = g_list_last(launcherList); - launcherList_t * li = (launcherList_t *)launcherentry->data; - dbusmenu_menuitem_property_set(li->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + if (last_separator != NULL) { + dbusmenu_menuitem_property_set(last_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); + } else { + g_warning("No last separator on resort"); } return; -- cgit v1.2.3 From 7574e509af6dc2affbf884e4602c52e216d821c7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 14:51:19 -0500 Subject: When removing an application item we need to get rid of its separator as well. --- src/messages-service.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/messages-service.c') diff --git a/src/messages-service.c b/src/messages-service.c index 1013c7b..575de8e 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -588,14 +588,19 @@ im_attention_changed (ImMenuItem * imitem, gboolean requestit, gpointer data) return; } +/* Run when a server is removed from the indicator bus. It figures + out if we have it somewhere, and if so then we dump it out and + clean up all of it's entries. */ static void server_removed (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data) { + /* Look for the server */ g_debug("Removing server: %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server)); serverList_t slt = {0}; slt.server = server; GList * lookup = g_list_find_custom(serverList, &slt, serverList_equal); + /* If we don't have it, exit */ if (lookup == NULL) { g_debug("\tUnable to find server: %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server)); return; @@ -603,21 +608,32 @@ server_removed (IndicateListener * listener, IndicateListenerServer * server, gc serverList_t * sltp = (serverList_t *)lookup->data; - remove_eclipses(sltp->menuitem); - + /* Removing indicators from this server */ while (sltp->imList) { imList_t * imitem = (imList_t *)sltp->imList->data; indicator_removed(listener, server, imitem->indicator, data); } + /* Remove from the server list */ serverList = g_list_remove(serverList, sltp); + /* Remove launchers this could be eclipsing */ + remove_eclipses(sltp->menuitem); + + /* 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_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_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->separator)); + g_object_unref(G_OBJECT(sltp->separator)); + } + if (sltp->attention) { /* Check to see if this was the server causing the menu item to be lit up. */ -- cgit v1.2.3