← Back to branch summary

~matttbe/ubuntu/precise/gnome-panel/975299

« back to all changes in this revision

Viewing changes to gnome-panel/panel-menu-items.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2011-04-19 08:48:23 UTC
  • Revision ID: james.westby@ubuntu.com-20110419084823-cu359b1xqyix0e04
Tags: 1:2.32.1-0ubuntu6.3
https://launchpad.net/bugs/506404
debian/patches/25_dynamic_fusa_detection.patch: Check for indicator
applet complete as well as fusa.  (LP: #506404)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/panel-menu-items.c
1535
1535
}
1536
1536
 
1537
1537
#define FUSA_APPLET_IID "OAFIID:GNOME_FastUserSwitchApplet"
 
1538
#define INDICATOR_APPLET_COMPLETE_IID "OAFIID:GNOME_IndicatorAppletComplete"
1538
1539
 
1539
1540
static void
1540
1541
panel_menu_items_hide_on_fusa (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget)
1549
1550
        if (iid == NULL)
1550
1551
                return;
1551
1552
 
1552
 
        if (!strcmp(iid, FUSA_APPLET_IID))
 
1553
        if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 ||
 
1554
                g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0)
1553
1555
                gtk_widget_hide(widget);
1554
1556
 
1555
1557
        return;
1568
1570
        if (iid == NULL)
1569
1571
                return;
1570
1572
 
1571
 
        if (!strcmp(iid, FUSA_APPLET_IID))
 
1573
        if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 ||
 
1574
                g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0)
1572
1575
                gtk_widget_show(widget);
1573
1576
 
1574
1577
        return;
1601
1604
        PanelAppletSignaler *signaler = panel_applet_signaler_get_default ();
1602
1605
 
1603
1606
        fusa = panel_applet_get_by_iid(FUSA_APPLET_IID);
 
1607
        if (fusa == NULL)
 
1608
                fusa = panel_applet_get_by_iid(INDICATOR_APPLET_COMPLETE_IID);
1604
1609
 
1605
1610
        separator_inserted = FALSE;
1606
1611
        children = gtk_container_get_children (GTK_CONTAINER (menu));