libmessaging-menu: messaging-menu.[ch] -> messaing-menu-app.[ch]

4 files changed, 153 insertions, 127 deletions

diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am
index 7a6ee31..ed5655f 100644
--- a/libmessaging-menu/Makefile.am
+++ b/libmessaging-menu/Makefile.am
@@ -4,12 +4,13 @@ lib_LTLIBRARIES = libmessaging-menu.la
 libmessaging_menu_ladir = $(includedir)/messaging-menu
 
 libmessaging_menu_la_SOURCES = \
-	messaging-menu.c \
+	messaging-menu-app.c \
 	gtupleaction.c \
 	gtupleaction.h \
 	$(BUILT_SOURCES)
 
 libmessaging_menu_la_HEADERS = \
+	messaging-menu-app.h \
 	messaging-menu.h
 
 libmessaging_menu_la_LIBADD = $(GIO_LIBS)
@@ -52,7 +53,7 @@ MessagingMenu_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 MessagingMenu_1_0_gir_CFLAGS = $(INCLUDES) $(GIO_CFLAGS)
 MessagingMenu_1_0_gir_SCANNERFLAGS = --c-include="messaging-menu.h"
 MessagingMenu_1_0_gir_LIBS = libmessaging-menu.la
-MessagingMenu_1_0_gir_FILES = messaging-menu.c messaging-menu.h
+MessagingMenu_1_0_gir_FILES = messaging-menu-app.c messaging-menu-app.h
 MessagingMenu_1_0_gir_EXPORT_PACKAGES = messaging-menu
 INTROSPECTION_GIRS += MessagingMenu-1.0.gir
 
diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu-app.c
index 70861d3..c6a5561 100644
--- a/libmessaging-menu/messaging-menu.c
+++ b/libmessaging-menu/messaging-menu-app.c
@@ -17,7 +17,7 @@
  *     Lars Uebernickel <lars.uebernickel@canonical.com>
  */
 
-#include "messaging-menu.h"
+#include "messaging-menu-app.h"
 #include "indicator-messages-service.h"
 #include "gtupleaction.h"
 
diff --git a/libmessaging-menu/messaging-menu-app.h b/libmessaging-menu/messaging-menu-app.h
new file mode 100644
index 0000000..b9415ff
--- /dev/null
+++ b/libmessaging-menu/messaging-menu-app.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *     Lars Uebernickel <lars.uebernickel@canonical.com>
+ */
+
+#ifndef __messaging_menu_app_h__
+#define __messaging_menu_app_h__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define MESSAGING_MENU_TYPE_APP         messaging_menu_app_get_type()
+#define MESSAGING_MENU_APP(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGING_MENU_TYPE_APP, MessagingMenuApp))
+#define MESSAGING_MENU_APP_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), MESSAGING_MENU_TYPE_APP, MessagingMenuAppClass))
+#define MESSAGING_MENU_IS_APP(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MESSAGING_MENU_TYPE_APP))
+
+/**
+ * MessagingMenuStatus:
+ * @MESSAGING_MENU_STATUS_AVAILABLE: available
+ * @MESSAGING_MENU_STATUS_AWAY: away
+ * @MESSAGING_MENU_STATUS_BUSY: busy
+ * @MESSAGING_MENU_STATUS_INVISIBLE: invisible
+ * @MESSAGING_MENU_STATUS_OFFLINE: offline
+ *
+ * An enumeration for the possible chat statuses the messaging menu can be in.
+ */
+typedef enum {
+  MESSAGING_MENU_STATUS_AVAILABLE,
+  MESSAGING_MENU_STATUS_AWAY,
+  MESSAGING_MENU_STATUS_BUSY,
+  MESSAGING_MENU_STATUS_INVISIBLE,
+  MESSAGING_MENU_STATUS_OFFLINE
+} MessagingMenuStatus;
+
+
+typedef GObjectClass             MessagingMenuAppClass;
+typedef struct _MessagingMenuApp MessagingMenuApp;
+
+GType               messaging_menu_app_get_type                  (void) G_GNUC_CONST;
+
+MessagingMenuApp *  messaging_menu_app_new                       (const gchar *desktop_id);
+
+void                messaging_menu_app_register                  (MessagingMenuApp *app);
+void                messaging_menu_app_unregister                (MessagingMenuApp *app);
+
+void                messaging_menu_app_set_status                (MessagingMenuApp   *app,
+                                                                  MessagingMenuStatus status);
+
+void                messaging_menu_app_insert_source             (MessagingMenuApp *app,
+                                                                  gint              position,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label);
+
+void                messaging_menu_app_append_source             (MessagingMenuApp *app,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label);
+
+void                messaging_menu_app_insert_source_with_count  (MessagingMenuApp *app,
+                                                                  gint              position,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  guint             count);
+
+void                messaging_menu_app_append_source_with_count  (MessagingMenuApp *app,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  guint             count);
+
+void                messaging_menu_app_insert_source_with_time   (MessagingMenuApp *app,
+                                                                  gint              position,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  gint64            time);
+
+void                messaging_menu_app_append_source_with_time   (MessagingMenuApp *app,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  gint64            time);
+
+void                messaging_menu_app_append_source_with_string (MessagingMenuApp *app,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  const gchar      *str);
+
+void                messaging_menu_app_insert_source_with_string (MessagingMenuApp *app,
+                                                                  gint              position,
+                                                                  const gchar      *id,
+                                                                  GIcon            *icon,
+                                                                  const gchar      *label,
+                                                                  const gchar      *str);
+
+void                messaging_menu_app_remove_source             (MessagingMenuApp *app,
+                                                                  const gchar      *source_id);
+
+gboolean            messaging_menu_app_has_source                (MessagingMenuApp *app,
+                                                                  const gchar      *source_id);
+
+void                messaging_menu_app_set_source_label          (MessagingMenuApp *app,
+                                                                  const gchar      *source_id,
+                                                                  const gchar      *label);
+
+void                messaging_menu_app_set_source_icon           (MessagingMenuApp *app,
+                                                                  const gchar      *source_id,
+                                                                  GIcon            *icon);
+
+void                messaging_menu_app_set_source_count          (MessagingMenuApp *app,
+                                                                  const gchar      *source_id,
+                                                                  guint             count);
+
+void                messaging_menu_app_set_source_time           (MessagingMenuApp *app,
+                                                                  const gchar      *source_id,
+                                                                  gint64            time);
+
+void                messaging_menu_app_set_source_string         (MessagingMenuApp *app,
+                                                                  const gchar      *source_id,
+                                                                  const gchar      *str);
+
+void                messaging_menu_app_draw_attention            (MessagingMenuApp *app,
+                                                                  const gchar      *source_id);
+
+void                messaging_menu_app_remove_attention          (MessagingMenuApp *app,
+                                                                  const gchar      *source_id);
+
+G_END_DECLS
+
+#endif
diff --git a/libmessaging-menu/messaging-menu.h b/libmessaging-menu/messaging-menu.h
index 6c405c7..929b229 100644
--- a/libmessaging-menu/messaging-menu.h
+++ b/libmessaging-menu/messaging-menu.h
@@ -20,129 +20,6 @@
 #ifndef __messaging_menu_h__
 #define __messaging_menu_h__
 
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define MESSAGING_MENU_TYPE_APP         messaging_menu_app_get_type()
-#define MESSAGING_MENU_APP(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGING_MENU_TYPE_APP, MessagingMenuApp))
-#define MESSAGING_MENU_APP_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), MESSAGING_MENU_TYPE_APP, MessagingMenuAppClass))
-#define MESSAGING_MENU_IS_APP(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MESSAGING_MENU_TYPE_APP))
-
-/**
- * MessagingMenuStatus:
- * @MESSAGING_MENU_STATUS_AVAILABLE: available
- * @MESSAGING_MENU_STATUS_AWAY: away
- * @MESSAGING_MENU_STATUS_BUSY: busy
- * @MESSAGING_MENU_STATUS_INVISIBLE: invisible
- * @MESSAGING_MENU_STATUS_OFFLINE: offline
- *
- * An enumeration for the possible chat statuses the messaging menu can be in.
- */
-typedef enum {
-  MESSAGING_MENU_STATUS_AVAILABLE,
-  MESSAGING_MENU_STATUS_AWAY,
-  MESSAGING_MENU_STATUS_BUSY,
-  MESSAGING_MENU_STATUS_INVISIBLE,
-  MESSAGING_MENU_STATUS_OFFLINE
-} MessagingMenuStatus;
-
-
-typedef GObjectClass             MessagingMenuAppClass;
-typedef struct _MessagingMenuApp MessagingMenuApp;
-
-GType               messaging_menu_app_get_type                  (void) G_GNUC_CONST;
-
-MessagingMenuApp *  messaging_menu_app_new                       (const gchar *desktop_id);
-
-void                messaging_menu_app_register                  (MessagingMenuApp *app);
-void                messaging_menu_app_unregister                (MessagingMenuApp *app);
-
-void                messaging_menu_app_set_status                (MessagingMenuApp   *app,
-                                                                  MessagingMenuStatus status);
-
-void                messaging_menu_app_insert_source             (MessagingMenuApp *app,
-                                                                  gint              position,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label);
-
-void                messaging_menu_app_append_source             (MessagingMenuApp *app,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label);
-
-void                messaging_menu_app_insert_source_with_count  (MessagingMenuApp *app,
-                                                                  gint              position,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  guint             count);
-
-void                messaging_menu_app_append_source_with_count  (MessagingMenuApp *app,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  guint             count);
-
-void                messaging_menu_app_insert_source_with_time   (MessagingMenuApp *app,
-                                                                  gint              position,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  gint64            time);
-
-void                messaging_menu_app_append_source_with_time   (MessagingMenuApp *app,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  gint64            time);
-
-void                messaging_menu_app_append_source_with_string (MessagingMenuApp *app,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  const gchar      *str);
-
-void                messaging_menu_app_insert_source_with_string (MessagingMenuApp *app,
-                                                                  gint              position,
-                                                                  const gchar      *id,
-                                                                  GIcon            *icon,
-                                                                  const gchar      *label,
-                                                                  const gchar      *str);
-
-void                messaging_menu_app_remove_source             (MessagingMenuApp *app,
-                                                                  const gchar      *source_id);
-
-gboolean            messaging_menu_app_has_source                (MessagingMenuApp *app,
-                                                                  const gchar      *source_id);
-
-void                messaging_menu_app_set_source_label          (MessagingMenuApp *app,
-                                                                  const gchar      *source_id,
-                                                                  const gchar      *label);
-
-void                messaging_menu_app_set_source_icon           (MessagingMenuApp *app,
-                                                                  const gchar      *source_id,
-                                                                  GIcon            *icon);
-
-void                messaging_menu_app_set_source_count          (MessagingMenuApp *app,
-                                                                  const gchar      *source_id,
-                                                                  guint             count);
-
-void                messaging_menu_app_set_source_time           (MessagingMenuApp *app,
-                                                                  const gchar      *source_id,
-                                                                  gint64            time);
-
-void                messaging_menu_app_set_source_string         (MessagingMenuApp *app,
-                                                                  const gchar      *source_id,
-                                                                  const gchar      *str);
-
-void                messaging_menu_app_draw_attention            (MessagingMenuApp *app,
-                                                                  const gchar      *source_id);
-
-void                messaging_menu_app_remove_attention          (MessagingMenuApp *app,
-                                                                  const gchar      *source_id);
-
-G_END_DECLS
+#include "messaging-menu-app.h"
 
 #endif