[patch] libtomoe-gtk-0.6.0-gucharmap2.patch

libtomoe-gtk-0.6.0-gucharmap2.patch (text/plain), 6.14 KB, created by Gilles Dartiguelongue (RETIRED) on 2008-12-03 23:19:33 UTC

---
 Update libtomoe-gtk to gucharmap-2 API

 bindings/python/Makefile.am |    5 +++-
 configure.ac                |    4 +--
 src/tomoe-gucharmap.c       |   46 +++++++++++++++++++++++---------------------
    3 files changed, 31 insertions(+), 24 deletions(-)

--- a/configure.ac	2008-12-03 23:06:59.000000000 +0100
+++ b/configure.ac	2008-12-03 23:08:59.000000000 +0100
@@ -102,8 +102,8 @@
             [use_gucharmap=yes])
 if test x"$use_gucharmap" = "xyes"; then
   # Checks for gucharmap
-  PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0])
-  TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap >= 1.4.0"
+  PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2])
+  TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap-2"
 else
   TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0"
 fi
--- a/src/tomoe-gucharmap.c 
+++ b/src/tomoe-gucharmap.c 
@@ -32,11 +32,12 @@
 typedef struct _TomoeGucharmapPrivate TomoeGucharmapPrivate;
 struct _TomoeGucharmapPrivate
 {
-    GtkWidget         *chapters_type_combobox;
-    GtkWidget         *chapters_combobox;
-    GucharmapChapters *chapters;
-    GucharmapCharmap  *charmap;
-    gchar             *selected;
+    GtkWidget              *chapters_type_combobox;
+    GtkWidget              *chapters_combobox;
+    GtkWidget              *chapters_view;
+    GucharmapChaptersModel *chapters_model;
+    GucharmapCharmap       *charmap;
+    gchar                   *selected;
 };
 
 #define TOMOE_GUCHARMAP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOMOE_TYPE_GUCHARMAP, TomoeGucharmapPrivate))
@@ -120,14 +121,16 @@
     gtk_widget_show (combobox);
 
     /* gucharmap */
-    priv->chapters  = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ());
-    priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new (priv->chapters));
+    priv->chapters_model = gucharmap_block_chapters_model_new ();
+    priv->chapters_view = gucharmap_chapters_view_new ();
+    priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new ());
+    gucharmap_charmap_set_chapters_model (priv->charmap, priv->chapters_model);
     widget = GTK_WIDGET (priv->charmap);
     gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 2);
     gtk_widget_show (widget);
 
     /* Hide chapters page by default. Usually use combo box instead. */
-    gtk_widget_hide (GTK_WIDGET (priv->chapters));
+    gtk_widget_hide (GTK_WIDGET (priv->chapters_view));
 
 #if 0
     /* CharDetails view will be here */
@@ -146,10 +149,10 @@
     g_signal_connect (G_OBJECT (priv->chapters_combobox), "changed",
                       G_CALLBACK (on_chapters_combo_changed),
                       (gpointer) page);
-    g_signal_connect (G_OBJECT (priv->charmap->chartable), "activate",
+    g_signal_connect (G_OBJECT (gucharmap_charmap_get_chartable (priv->charmap)), "activate",
                       G_CALLBACK (on_gucharmap_activate),
                       (gpointer) page);
-    g_signal_connect (G_OBJECT (priv->charmap->chartable),
+    g_signal_connect (G_OBJECT (gucharmap_charmap_get_chartable (priv->charmap)),
                       "button-release-event",
                       G_CALLBACK (on_gucharmap_button_release),
                       (gpointer) page);
@@ -162,7 +165,8 @@
 
     priv->chapters_type_combobox = NULL;
     priv->chapters_combobox      = NULL;
-    priv->chapters               = NULL;
+    priv->chapters_model         = NULL;
+    priv->chapters_view          = NULL;
     priv->charmap                = NULL;
     if (priv->selected) {
         g_free (priv->selected);
@@ -188,7 +192,7 @@
 tomoe_gucharmap_get_selected_char (TomoeGucharmap *page)
 {
     TomoeGucharmapPrivate *priv;
-    GucharmapTable *table;
+    GucharmapChartable *table;
     gunichar c;
     gchar buf[7];
     gint bytes;
@@ -196,9 +200,9 @@
     g_return_val_if_fail (TOMOE_IS_GUCHARMAP (page), NULL);
 
     priv = TOMOE_GUCHARMAP_GET_PRIVATE (page);
-    table = GUCHARMAP_TABLE (priv->charmap->chartable);
-
-    c = gucharmap_table_get_active_character (table);
+    table = gucharmap_charmap_get_chartable (priv->charmap);
+
+    c = gucharmap_chartable_get_active_character (table);
     bytes = g_unichar_to_utf8(c, buf);
 
     if (bytes > 0 && bytes < 7) {
@@ -222,7 +226,7 @@
 setup_chapters_combo_box (TomoeGucharmap *page)
 {
     TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page);
-    GtkTreeModel *model = priv->chapters->tree_model;
+    GtkTreeModel *model = GTK_TREE_MODEL (priv->chapters_model);
 
     gtk_combo_box_set_model (GTK_COMBO_BOX (priv->chapters_combobox), model);
     gtk_combo_box_set_active (GTK_COMBO_BOX (priv->chapters_combobox), 0);
@@ -236,11 +240,11 @@
     gint idx = gtk_combo_box_get_active (combobox);
 
     if (idx == 1)
-        priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ());
+        priv->chapters_model = gucharmap_script_chapters_model_new ();
     else
-        priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ());
-    gucharmap_charmap_set_chapters (priv->charmap, priv->chapters);
-    gtk_widget_hide (GTK_WIDGET (priv->chapters));
+        priv->chapters_model = gucharmap_block_chapters_model_new ();
+    gucharmap_charmap_set_chapters_model (priv->charmap, priv->chapters_model);
+    gtk_widget_hide (GTK_WIDGET (priv->chapters_view));
     setup_chapters_combo_box (page);
 }
 
@@ -256,7 +260,7 @@
     idx = gtk_combo_box_get_active (combobox);
     g_snprintf (buf, 8 , "%d", idx);
     path = gtk_tree_path_new_from_string (buf);
-    gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->chapters->tree_view),
+    gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->chapters_view),
                               path, NULL, FALSE);
     gtk_tree_path_free (path);
 }
--- a/bindings/python/Makefile.am 
+++ b/bindings/python/Makefile.am 
@@ -6,6 +6,7 @@
 	$(PYTHON_CFLAGS)	\
 	$(PYGOBJECT_CFLAGS)	\
 	$(PYGTK_CFLAGS)		\
+	$(GUCHARMAP_CFLAGS)	\
 	$(GTK2_CFLAGS)		\
 	$(TOMOE_CFLAGS)		\
 	-I$(top_srcdir)/src	\
@@ -21,11 +22,13 @@
 	-module				\
 	-avoid-version			\
 	$(TOMOE_LDFLAGS)		\
-	$(PYTHON_LDFLAGS)
+	$(PYTHON_LDFLAGS)		\
+	$(GUCHARMAP_LDFLAGS)
 
 tomoegtk_la_LIBADD =			\
 	$(TOMOE_LIBS)			\
 	$(PYGTK_LIBS)			\
+	$(GUCHARMAP_LIBS)		\
 	$(top_builddir)/src/libtomoe-gtk.la
 
 OVERRIDES =				\