diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-07-23 11:50:41 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-07-23 11:50:41 -0500 |
| commit | 6e63cf5c577dcf3d43866fb02b331327f167ea30 (patch) | |
| tree | 97c870eea389892b428b0d09d0f55c8f664c7b16 | |
| parent | a6db14f55cfa6060e18c3ee07f0308d8733308ff (diff) | |
| download | ayatana-indicator-power-6e63cf5c577dcf3d43866fb02b331327f167ea30.tar.gz ayatana-indicator-power-6e63cf5c577dcf3d43866fb02b331327f167ea30.tar.bz2 ayatana-indicator-power-6e63cf5c577dcf3d43866fb02b331327f167ea30.zip | |
rename create_devices_section as create_desktop_devices_section since we're about to add a sibling create_phone_devices_section
| -rw-r--r-- | src/service.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/service.c b/src/service.c index 4064914..0e3f63c 100644 --- a/src/service.c +++ b/src/service.c @@ -64,7 +64,7 @@ enum enum { PROFILE_DESKTOP, - PROFILE_GREETER, + PROFILE_DESKTOP_GREETER, N_PROFILES }; @@ -401,7 +401,7 @@ append_device_to_menu (GMenu * menu, const IndicatorPowerDevice * device) static GMenuModel * -create_devices_section (IndicatorPowerService * self) +create_desktop_devices_section (IndicatorPowerService * self) { GList * l; GMenu * menu = g_menu_new (); @@ -459,7 +459,7 @@ rebuild_now (IndicatorPowerService * self, guint sections) { priv_t * p = self->priv; struct ProfileMenuInfo * desktop = &p->menus[PROFILE_DESKTOP]; - struct ProfileMenuInfo * greeter = &p->menus[PROFILE_GREETER]; + struct ProfileMenuInfo * greeter = &p->menus[PROFILE_DESKTOP_GREETER]; if (p->conn == NULL) /* we haven't built the menus yet */ return; @@ -471,8 +471,8 @@ rebuild_now (IndicatorPowerService * self, guint sections) if (sections & SECTION_DEVICES) { - rebuild_section (desktop->submenu, 0, create_devices_section (self)); - rebuild_section (greeter->submenu, 0, create_devices_section (self)); + rebuild_section (desktop->submenu, 0, create_desktop_devices_section (self)); + rebuild_section (greeter->submenu, 0, create_desktop_devices_section (self)); } if (sections & SECTION_SETTINGS) @@ -514,12 +514,12 @@ create_menu (IndicatorPowerService * self, int profile) if (profile == PROFILE_DESKTOP) { - sections[n++] = create_devices_section (self); + sections[n++] = create_desktop_devices_section (self); sections[n++] = create_settings_section (self); } - else if (profile == PROFILE_GREETER) + else if (profile == PROFILE_DESKTOP_GREETER) { - sections[n++] = create_devices_section (self); + sections[n++] = create_desktop_devices_section (self); } /* add sections to the submenu */ |