diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-06-15 08:20:45 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-06-15 08:20:45 -0500 |
| commit | 8cb934f213894b998bc3c471f5636fa9f0ae1dd4 (patch) | |
| tree | c26d765b9cbe4d998fb89c4c4fb0896036ee60e0 /src/session-service.c | |
| parent | 0e41b34b88a06bf0ff9e02df6052b5dff846d22b (diff) | |
| download | ayatana-indicator-session-8cb934f213894b998bc3c471f5636fa9f0ae1dd4.tar.gz ayatana-indicator-session-8cb934f213894b998bc3c471f5636fa9f0ae1dd4.tar.bz2 ayatana-indicator-session-8cb934f213894b998bc3c471f5636fa9f0ae1dd4.zip | |
a step in merging the two menus: merge the DeviceMenuMgr and UserMenuMgr classes into a single SessionMenuMgr class
Diffstat (limited to 'src/session-service.c')
| -rw-r--r-- | src/session-service.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/session-service.c b/src/session-service.c index ece3a1d..598fcce 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -44,9 +44,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "dbus-shared-names.h" #include "users-service-dbus.h" -#include "user-menu-mgr.h" -#include "device-menu-mgr.h" #include "session-dbus.h" +#include "session-menu-mgr.h" //static UsersServiceDbus *dbus_interface = NULL; static SessionDbus *session_dbus = NULL; @@ -99,8 +98,7 @@ main (int argc, char ** argv) greeter_mode = get_greeter_mode(); DbusmenuMenuitem * root_item = dbusmenu_menuitem_new (); - device_menu_mgr_new (root_item, session_dbus, greeter_mode); - user_menu_mgr_new (root_item, session_dbus, greeter_mode); + session_menu_mgr_new (root_item, session_dbus, greeter_mode); DbusmenuServer* server = dbusmenu_server_new (INDICATOR_SESSION_DBUS_OBJECT); dbusmenu_server_set_root (server, root_item); |