← Back to branch summary

~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3

« back to all changes in this revision

Viewing changes to keyboard-indicator/src/applet-notifications.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 02:38:17 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907023817-ish9a53i2wn0m7zg
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632054
https://launchpad.net/bugs/616176
https://launchpad.net/bugs/604034
https://launchpad.net/bugs/582452
* New Upstream Version (LP: #632054)
* Fixed a few bugs on LP:
 - LP: #616176 Dust Bin Hang and Incorrect Configuration
 - LP: #604034 Change terminal tab's name lost the color
 - LP: #582452 GMenu does not contain any applications
* Fixed a few bugs on glx-dock forum:
 - Fixed support of GMusicBrowser.
 - AlsaMixer has no emblem.
 - Status-Notifier doesn't be drawed into the dock.
* Updated translations
* debian/control:
 - Added cairo-dock-core as build-depends in order to prevent
   some builds errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
keyboard-indicator/src/applet-notifications.c
42
42
}
43
43
CD_APPLET_ON_BUILD_MENU_BEGIN
44
44
        GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
45
 
                CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
46
 
                
47
 
                XklEngine *pEngine = xkl_engine_get_instance (cairo_dock_get_Xdisplay ());  // singleton.
48
 
                const gchar **pGroupNames = xkl_engine_get_groups_names (pEngine);
49
 
                int i;
50
 
                for (i = 0; pGroupNames[i] != NULL && *pGroupNames[i] != '-'; i ++)
51
 
                {
52
 
                        CD_APPLET_ADD_IN_MENU_WITH_DATA (pGroupNames[i], _select_group, pSubMenu, GINT_TO_POINTER (i));
53
 
                }
 
45
        
 
46
        // Main Menu
 
47
        XklEngine *pEngine = xkl_engine_get_instance (cairo_dock_get_Xdisplay ());  // singleton.
 
48
        const gchar **pGroupNames = xkl_engine_get_groups_names (pEngine);
 
49
        int i;
 
50
        for (i = 0; pGroupNames[i] != NULL && *pGroupNames[i] != '-'; i ++)
 
51
        {
 
52
                CD_APPLET_ADD_IN_MENU_WITH_DATA (pGroupNames[i], _select_group, CD_APPLET_MY_MENU, GINT_TO_POINTER (i));
 
53
        }
 
54
        
 
55
        // Sub-Menu
 
56
        if (pSubMenu == CD_APPLET_MY_MENU)
 
57
                CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
 
58
        CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
54
59
CD_APPLET_ON_BUILD_MENU_END
55
60
 
56
61