From 3f3aa147ac8ee224f40d9c4e9800b4c5825fde59 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 22 May 2013 22:51:19 -0400
Subject: Add IdoMenuItemFactory

It's implementing the GtkMenuItemFactory extension point (only available in
Ubuntu's version of gtk+). It doesn't create any menu items yet.

The extension point must be registered before calling gtk_menu_new_from_model()
with a menu model that references any of the custom menu items ido will
provide. Registering means the type must exist in the type system. This patch
adds an ido_init() which does that. Consumers of libido are required to call
this function from now on.
---
 src/Makefile.am          |  6 +++--
 src/idomenuitemfactory.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/libido.c             | 36 +++++++++++++++++++++++++++++
 src/libido.h             |  2 ++
 4 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 src/idomenuitemfactory.c
 create mode 100644 src/libido.c

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e14efbf..d6012f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ sources_h =				\
 	idoscalemenuitem.h		\
 	idoswitchmenuitem.h		\
 	idotimeline.h			\
-	libido.h 
+	libido.h
 
 EXTRA_DIST =				\
 	ido.list			\
@@ -59,6 +59,7 @@ AM_CFLAGS =                             \
 	$(COVERAGE_CFLAGS)
 
 libido_0_1_la_SOURCES =			\
+	libido.c			\
 	idotypebuiltins.c		\
 	idocalendarmenuitem.c		\
 	idoentrymenuitem.c		\
@@ -66,7 +67,8 @@ libido_0_1_la_SOURCES =			\
 	idorange.c			\
 	idoscalemenuitem.c		\
 	idoswitchmenuitem.c		\
-	idotimeline.c                   
+	idotimeline.c			\
+	idomenuitemfactory.c
 
 libido3_0_1_la_SOURCES = $(libido_0_1_la_SOURCES)
 
diff --git a/src/idomenuitemfactory.c b/src/idomenuitemfactory.c
new file mode 100644
index 0000000..3eb8049
--- /dev/null
+++ b/src/idomenuitemfactory.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 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>
+ */
+
+#include <gtk/gtk.h>
+
+#define IDO_TYPE_MENU_ITEM_FACTORY         (ido_menu_item_factory_get_type ())
+#define IDO_MENU_ITEM_FACTORY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), IDO_TYPE_MENU_ITEM_FACTORY, IdoMenuItemFactory))
+#define IDO_IS_MENU_ITEM_FACTORY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), IDO_TYPE_MENU_ITEM_FACTORY))
+
+typedef GObject      IdoMenuItemFactory;
+typedef GObjectClass IdoMenuItemFactoryClass;
+
+GType       ido_menu_item_factory_get_type (void);
+static void ido_menu_item_factory_interface_init (GtkMenuItemFactoryInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (IdoMenuItemFactory, ido_menu_item_factory, G_TYPE_OBJECT,
+  G_IMPLEMENT_INTERFACE (GTK_TYPE_MENU_ITEM_FACTORY, ido_menu_item_factory_interface_init)
+  g_io_extension_point_implement (GTK_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME,
+                                  g_define_type_id, "ido", 0);)
+
+static GtkMenuItem *
+ido_menu_item_factory_create_menu_item (GtkMenuItemFactory *factory,
+                                        const gchar        *type,
+                                        GMenuItem          *menuitem,
+                                        GActionGroup       *actions)
+{
+  return NULL;
+}
+
+static void
+ido_menu_item_factory_class_init (IdoMenuItemFactoryClass *class)
+{
+}
+
+static void
+ido_menu_item_factory_interface_init (GtkMenuItemFactoryInterface *iface)
+{
+  iface->create_menu_item = ido_menu_item_factory_create_menu_item;
+}
+
+static void
+ido_menu_item_factory_init (IdoMenuItemFactory *factory)
+{
+}
diff --git a/src/libido.c b/src/libido.c
new file mode 100644
index 0000000..0c90213
--- /dev/null
+++ b/src/libido.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 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>
+ */
+
+#include <gio/gio.h>
+
+/**
+ * ido_init:
+ *
+ * Initializes ido. It has to be called after gtk_init(), but before any
+ * other calls into ido are made.
+ */
+void
+ido_init (void)
+{
+  GType ido_menu_item_factory_get_type (void);
+
+  /* make sure this extension point is registered so that gtk calls it
+   * when finding custom menu items */
+  g_type_ensure (ido_menu_item_factory_get_type ());
+}
diff --git a/src/libido.h b/src/libido.h
index 4c4f68b..43a8168 100644
--- a/src/libido.h
+++ b/src/libido.h
@@ -31,4 +31,6 @@
 #include <libido/idoentrymenuitem.h>
 #include <libido/idomessagedialog.h>
 
+void ido_init (void);
+
 #endif /* __IDO__ */
-- 
cgit v1.2.3