session menu mgr in progress

5 files changed, 160 insertions, 36 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9bf43cd..2230910 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,9 @@ indicator_session_service_SOURCES = \
 	users-service-dbus.h \
 	users-service-dbus.c \
 	user-menu-mgr.h \
-	user-menu-mgr.c 	
+	user-menu-mgr.c \	
+	device-menu-mgr.h \
+	device-menu-mgr.c 	
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
new file mode 100644
index 0000000..2bddbb3
--- /dev/null
+++ b/src/device-menu-mgr.c
@@ -0,0 +1,69 @@
+/*
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "device-menu-mgr.h"
+
+struct _DeviceMenuMgr
+{
+	GObject parent_instance;
+  DbusmenuMenuitem* root_item;
+  SessionDbus* session_dbus_interface;  
+};
+
+G_DEFINE_TYPE (DeviceMenuMgr, device_menu_mgr, G_TYPE_OBJECT);
+
+static void
+device_menu_mgr_init (DeviceMenuMgr *object)
+{
+	/* TODO: Add initialization code here */
+}
+
+static void
+device_menu_mgr_finalize (GObject *object)
+{
+	/* TODO: Add deinitalization code here */
+
+	G_OBJECT_CLASS (device_menu_mgr_parent_class)->finalize (object);
+}
+
+static void
+device_menu_mgr_class_init (DeviceMenuMgrClass *klass)
+{
+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+	//GObjectClass* parent_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = device_menu_mgr_finalize;
+}
+
+DbusmenuMenuitem*
+device_mgr_get_root_item (DeviceMenuMgr* self)
+{
+  return self->root_item;
+}
+
+/*
+ * Clean Entry Point 
+ */
+DeviceMenuMgr* device_menu_mgr_new (SessionDbus* session_dbus)
+{
+  DeviceMenuMgr* device_mgr = g_object_new (DEVICE_TYPE_MENU_MGR, NULL);
+  device_mgr->session_dbus_interface = session_dbus;
+  //device_menu_mgr_rebuild_items (device_mgr);    
+  return device_mgr;
+}
diff --git a/src/device-menu-mgr.h b/src/device-menu-mgr.h
new file mode 100644
index 0000000..caa9aee
--- /dev/null
+++ b/src/device-menu-mgr.h
@@ -0,0 +1,54 @@
+/*
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef _DEVICE_MENU_MGR_H_
+#define _DEVICE_MENU_MGR_H_
+
+#include <glib-object.h>
+#include <libdbusmenu-gtk3/menuitem.h>
+
+#include "session-dbus.h"
+
+G_BEGIN_DECLS
+
+#define DEVICE_TYPE_MENU_MGR             (device_menu_mgr_get_type ())
+#define DEVICE_MENU_MGR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEVICE_TYPE_MENU_MGR, DeviceMenuMgr))
+#define DEVICE_MENU_MGR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), DEVICE_TYPE_MENU_MGR, DeviceMenuMgrClass))
+#define DEVICE_IS_MENU_MGR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEVICE_TYPE_MENU_MGR))
+#define DEVICE_IS_MENU_MGR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), DEVICE_TYPE_MENU_MGR))
+#define DEVICE_MENU_MGR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), DEVICE_TYPE_MENU_MGR, DeviceMenuMgrClass))
+
+typedef struct _DeviceMenuMgrClass DeviceMenuMgrClass;
+typedef struct _DeviceMenuMgr DeviceMenuMgr;
+
+struct _DeviceMenuMgrClass
+{
+	GObjectClass parent_class;
+};
+
+GType device_menu_mgr_get_type (void) G_GNUC_CONST;
+
+DeviceMenuMgr* device_menu_mgr_new (SessionDbus* session_dbus);
+
+DbusmenuMenuitem* device_mgr_get_root_item (DeviceMenuMgr* self);
+
+G_END_DECLS
+
+#endif /* _DEVICE_MENU_MGR_H_ */
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 8338739..611bcc7 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -1,22 +1,21 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * user-menu-mgr.c
- * Copyright (C) Conor Curran 2011 <conor.curran@canonical.com>
- * 
- * user-menu-mgr.c is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * user-menu-mgr.c is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
+Copyright 2011 Canonical Ltd.
 
- */
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include <libdbusmenu-glib/client.h>
 
diff --git a/src/user-menu-mgr.h b/src/user-menu-mgr.h
index 16ac055..ff2cb77 100644
--- a/src/user-menu-mgr.h
+++ b/src/user-menu-mgr.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * user-menu-mgr.c
- * Copyright (C) Conor Curran 2011 <conor.curran@canonical.com>
- * 
- * user-menu-mgr.c is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * user-menu-mgr.c is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-
- */
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 
 #ifndef _USER_MENU_MGR_H_
 #define _USER_MENU_MGR_H_