gucharmap r1642 - trunk/gucharmap

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: gucharmap r1642 - trunk/gucharmap
Date: Fri, 21 Mar 2008 10:49:01 +0000 (GMT)
Author: chpe
Date: Fri Mar 21 10:49:00 2008
New Revision: 1642
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1642&view=rev

Log:
Put all types into gucharmap-types, and the real struct definitions into gucharmap-private.h.


Added:
   trunk/gucharmap/gucharmap-private.h
   trunk/gucharmap/gucharmap-types.h
Removed:
   trunk/gucharmap/gucharmap-chartable-private.h
   trunk/gucharmap/gucharmap-intl.h
Modified:
   trunk/gucharmap/Makefile.am
   trunk/gucharmap/gen-guch-unicode-tables.pl
   trunk/gucharmap/gucharmap-block-chapters-model.c
   trunk/gucharmap/gucharmap-block-chapters-model.h
   trunk/gucharmap/gucharmap-chapters-model.c
   trunk/gucharmap/gucharmap-chapters-model.h
   trunk/gucharmap/gucharmap-chapters-view.c
   trunk/gucharmap/gucharmap-chapters-view.h
   trunk/gucharmap/gucharmap-charmap.c
   trunk/gucharmap/gucharmap-charmap.h
   trunk/gucharmap/gucharmap-chartable-accessible.c
   trunk/gucharmap/gucharmap-chartable-accessible.h
   trunk/gucharmap/gucharmap-chartable-cell-accessible.c
   trunk/gucharmap/gucharmap-chartable-cell-accessible.h
   trunk/gucharmap/gucharmap-chartable.c
   trunk/gucharmap/gucharmap-chartable.h
   trunk/gucharmap/gucharmap-codepoint-list.c
   trunk/gucharmap/gucharmap-codepoint-list.h
   trunk/gucharmap/gucharmap-mini-fontsel.c
   trunk/gucharmap/gucharmap-mini-fontsel.h
   trunk/gucharmap/gucharmap-script-chapters-model.c
   trunk/gucharmap/gucharmap-script-chapters-model.h
   trunk/gucharmap/gucharmap-script-codepoint-list.c
   trunk/gucharmap/gucharmap-script-codepoint-list.h
   trunk/gucharmap/gucharmap-search-dialog.c
   trunk/gucharmap/gucharmap-search-dialog.h
   trunk/gucharmap/gucharmap-settings.c
   trunk/gucharmap/gucharmap-unicode-info.c
   trunk/gucharmap/gucharmap-window.c
   trunk/gucharmap/gucharmap-window.h
   trunk/gucharmap/gucharmap.h
   trunk/gucharmap/main.c
   trunk/gucharmap/unicode-blocks.h
   trunk/gucharmap/unicode-names.h
   trunk/gucharmap/unicode-scripts.h

Modified: trunk/gucharmap/Makefile.am
==============================================================================
--- trunk/gucharmap/Makefile.am	(original)
+++ trunk/gucharmap/Makefile.am	Fri Mar 21 10:49:00 2008
@@ -33,10 +33,10 @@
 	gucharmap-chartable-cell-accessible.c gucharmap-chartable-cell-accessible.h \
 	gucharmap-chartable.c gucharmap-chartable.h gucharmap-chartable-private.h \
 	gucharmap-codepoint-list.c gucharmap-codepoint-list.h \
-	gucharmap-intl.h \
 	gucharmap-init.c gucharmap-init.h \
 	gucharmap-marshal.c gucharmap-marshal.h \
 	gucharmap-mini-fontsel.c gucharmap-mini-fontsel.h \
+	gucharmap-private.h \ 
 	gucharmap-script-chapters-model.c gucharmap-script-chapters-model.h \
 	gucharmap-script-codepoint-list.c gucharmap-script-codepoint-list.h \
 	gucharmap-search-dialog.h gucharmap-search-dialog.c \
@@ -87,6 +87,7 @@
 	gucharmap-script-codepoint-list.h \
 	gucharmap-search-dialog.h \
 	gucharmap-settings.h \
+	gucharmap-types.h \
 	gucharmap-unicode-info.h \
 	gucharmap-window.h \
 	$(NULL)

Modified: trunk/gucharmap/gen-guch-unicode-tables.pl
==============================================================================
--- trunk/gucharmap/gen-guch-unicode-tables.pl	(original)
+++ trunk/gucharmap/gen-guch-unicode-tables.pl	Fri Mar 21 10:49:00 2008
@@ -95,7 +95,7 @@
     print $out "#define UNICODE_NAMES_H\n\n";
 
     print $out "#include <glib/gunicode.h>\n\n";
-    print $out "#include \"gucharmap-intl.h\"\n\n";
+    print $out "#include <glib/gi18n-lib.h>\n\n";
 
     my @unicode_pairs;
     my %names;
@@ -701,6 +701,7 @@
     print $out "#define UNICODE_BLOCKS_H\n\n";
 
     print $out "#include <glib/gunicode.h>\n";
+    print $out "#include <glib/gi18n-lib.h>\n\n";
 
     print $out "typedef struct _UnicodeBlock UnicodeBlock;\n";
     print $out "\n";
@@ -784,7 +785,7 @@
     print $out "#define UNICODE_SCRIPTS_H\n\n";
 
     print $out "#include <glib/gunicode.h>\n";
-    print $out "#include \"gucharmap-intl.h\"\n\n";
+    print $out "#include <glib/gi18n-lib.h>\n\n";
 
     print $out "typedef struct _UnicodeScript UnicodeScript;\n\n";
 

Modified: trunk/gucharmap/gucharmap-block-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-block-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-block-chapters-model.c	Fri Mar 21 10:49:00 2008
@@ -18,11 +18,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
  */
 
-#include "config.h"
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include "gucharmap-block-chapters-model.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-settings.h"
 #include "unicode-blocks.h"
+#include "gucharmap-private.h"
 
 enum 
 {

Modified: trunk/gucharmap/gucharmap-block-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-block-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-block-chapters-model.h	Fri Mar 21 10:49:00 2008
@@ -27,6 +27,7 @@
 #ifndef GUCHARMAP_BLOCK_CHAPTERS_MODEL_H
 #define GUCHARMAP_BLOCK_CHAPTERS_MODEL_H
 
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-chapters-model.h>
 
 G_BEGIN_DECLS
@@ -43,19 +44,6 @@
 #define GUCHARMAP_BLOCK_CHAPTERS_MODEL_GET_CLASS(obj) \
             (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_block_chapters_model_get_type (), GucharmapBlockChaptersModelClass))
 
-typedef struct _GucharmapBlockChaptersModel GucharmapBlockChaptersModel;
-typedef struct _GucharmapBlockChaptersModelClass GucharmapBlockChaptersModelClass;
-
-struct _GucharmapBlockChaptersModel
-{
-  GucharmapChaptersModel parent;
-};
-
-struct _GucharmapBlockChaptersModelClass
-{
-  GucharmapChaptersModelClass parent_class;
-};
-
 GType                   gucharmap_block_chapters_model_get_type (void);
 GucharmapChaptersModel* gucharmap_block_chapters_model_new      (void);
 

Modified: trunk/gucharmap/gucharmap-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.c	Fri Mar 21 10:49:00 2008
@@ -18,10 +18,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
  */
 
-#include "config.h"
+#include <config.h>
+
+#include <string.h>
+
 #include "gucharmap-chapters-model.h"
 #include "gucharmap-marshal.h"
-#include <string.h>
+#include "gucharmap-private.h"
 
 G_DEFINE_TYPE (GucharmapChaptersModel, gucharmap_chapters_model, GTK_TYPE_LIST_STORE)
 

Modified: trunk/gucharmap/gucharmap-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.h	Fri Mar 21 10:49:00 2008
@@ -25,6 +25,7 @@
 #define GUCHARMAP_CHAPTERS_MODEL_H
 
 #include <gtk/gtkliststore.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-codepoint-list.h>
 
 G_BEGIN_DECLS
@@ -43,9 +44,6 @@
 #define GUCHARMAP_CHAPTERS_MODEL_GET_CLASS(obj) \
             (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_chapters_model_get_type (), GucharmapChaptersModelClass))
 
-typedef struct _GucharmapChaptersModel GucharmapChaptersModel;
-typedef struct _GucharmapChaptersModelClass GucharmapChaptersModelClass;
-
 typedef enum
 {
   CHAPTERS_SCRIPT = 0,
@@ -58,27 +56,6 @@
   CHAPTERS_LABEL_COL = 1
 };
 
-struct _GucharmapChaptersModel
-{
-  GtkListStore parent_instance;
-
-  /*< protected >*/
-  GucharmapCodepointList *book_list;
-};
-
-struct _GucharmapChaptersModelClass
-{
-  GtkListStoreClass parent_class;
-
-  const char *title;
-  gboolean (* character_to_iter) (GucharmapChaptersModel *chapters,
-                                  gunichar wc,
-                                  GtkTreeIter *iter);
-  GucharmapCodepointList * (* get_codepoint_list) (GucharmapChaptersModel *chapters,
-                                                   GtkTreeIter *iter);
-  G_CONST_RETURN GucharmapCodepointList * (* get_book_codepoint_list) (GucharmapChaptersModel *chapters);
-};
-
 GType                                   gucharmap_chapters_model_get_type                (void);
 GucharmapCodepointList *                gucharmap_chapters_model_get_codepoint_list      (GucharmapChaptersModel *chapters,
                                                                                           GtkTreeIter            *iter);

Modified: trunk/gucharmap/gucharmap-chapters-view.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.c	Fri Mar 21 10:49:00 2008
@@ -19,9 +19,9 @@
 #include "config.h"
 #include <string.h>
 #include <gtk/gtk.h>
-#include "gucharmap-intl.h"
 #include "gucharmap-settings.h"
 #include "gucharmap-chapters-view.h"
+#include "gucharmap-private.h"
 #include "unicode-blocks.h"
 
 static void

Modified: trunk/gucharmap/gucharmap-chapters-view.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.h	Fri Mar 21 10:49:00 2008
@@ -26,6 +26,7 @@
 #define GUCHARMAP_CHAPTERS_VIEW_H
 
 #include <gtk/gtktreeview.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-chapters-model.h>
 
 G_BEGIN_DECLS
@@ -42,24 +43,8 @@
 #define GUCHARMAP_CHAPTERS_VIEW_GET_CLASS(obj) \
             (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_chapters_view_get_type (), GucharmapChaptersViewClass))
 
-typedef struct _GucharmapChaptersView GucharmapChaptersView;
-typedef struct _GucharmapChaptersViewClass GucharmapChaptersViewClass;
-
-struct _GucharmapChaptersView
-{
-  GtkTreeView parent_instance;
-
-  /*< private >*/
-  GtkTreeViewColumn *column;
-  GucharmapChaptersModel *model;
-};
-
-struct _GucharmapChaptersViewClass
-{
-  GtkTreeViewClass parent_class;
-};
-
 GType       gucharmap_chapters_view_get_type (void);
+
 GtkWidget * gucharmap_chapters_view_new      (void);
 
 void                    gucharmap_chapters_view_set_model (GucharmapChaptersView *view,

Modified: trunk/gucharmap/gucharmap-charmap.c
==============================================================================
--- trunk/gucharmap/gucharmap-charmap.c	(original)
+++ trunk/gucharmap/gucharmap-charmap.c	Fri Mar 21 10:49:00 2008
@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdlib.h>
@@ -25,40 +26,9 @@
 
 #include "gucharmap-charmap.h"
 #include "gucharmap-unicode-info.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-marshal.h"
 #include "gucharmap-settings.h"
-
-struct _GucharmapCharmap
-{
-  GtkHPaned parent;
-
-  GucharmapChaptersView *chapters_view;
-  GucharmapChartable *chartable;
-  GtkTextView *details_view;
-  GtkTextTag *text_tag_gimongous;
-  GtkTextTag *text_tag_big;
-
-  PangoFontDescription *font_desc;
-
-  GdkCursor *hand_cursor;
-  GdkCursor *regular_cursor;
-
-  guint hovering_over_link   : 1;
-  guint showing_details_page : 1;
-  guint last_character_set   : 1;
-};
-
-
-struct _GucharmapCharmapClass
-{
-  GtkHPanedClass parent_class;
-
-  void (* status_message) (GucharmapCharmap *charmap, const gchar *message);
-  void (* link_clicked) (GucharmapCharmap *charmap, 
-                         gunichar old_character,
-                         gunichar new_character);
-};
+#include "gucharmap-private.h"
 
 enum
 {

Modified: trunk/gucharmap/gucharmap-charmap.h
==============================================================================
--- trunk/gucharmap/gucharmap-charmap.h	(original)
+++ trunk/gucharmap/gucharmap-charmap.h	Fri Mar 21 10:49:00 2008
@@ -24,6 +24,7 @@
 #define GUCHARMAP_CHARMAP_H
 
 #include <gtk/gtk.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-chartable.h>
 #include <gucharmap/gucharmap-chapters-model.h>
 #include <gucharmap/gucharmap-chapters-view.h>
@@ -41,9 +42,6 @@
 #define GUCHARMAP_IS_CHARMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                                    gucharmap_charmap_get_type ()))
 
-typedef struct _GucharmapCharmap GucharmapCharmap;
-typedef struct _GucharmapCharmapClass GucharmapCharmapClass;
-
 GType                 gucharmap_charmap_get_type           (void);
 
 GtkWidget *           gucharmap_charmap_new                (void);

Modified: trunk/gucharmap/gucharmap-chartable-accessible.c
==============================================================================
--- trunk/gucharmap/gucharmap-chartable-accessible.c	(original)
+++ trunk/gucharmap/gucharmap-chartable-accessible.c	Fri Mar 21 10:49:00 2008
@@ -22,14 +22,15 @@
 
 #include <string.h>
 
+#include <glib/gi18n-lib.h>
+
 #include <gtk/gtk.h>
 
 #include "gucharmap.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-chartable.h"
-#include "gucharmap-chartable-private.h"
 #include "gucharmap-chartable-accessible.h"
 #include "gucharmap-chartable-cell-accessible.h"
+#include "gucharmap-private.h"
 
 typedef struct
 {

Modified: trunk/gucharmap/gucharmap-chartable-accessible.h
==============================================================================
--- trunk/gucharmap/gucharmap-chartable-accessible.h	(original)
+++ trunk/gucharmap/gucharmap-chartable-accessible.h	Fri Mar 21 10:49:00 2008
@@ -22,7 +22,7 @@
 #define GUCHARMAP_CHARTABLE_ACCESSIBLE_H
 
 #include <gtk/gtkaccessible.h>
-
+#include <gucharmap/gucharmap-types.h>
 #include "gucharmap-chartable.h"
 
 G_BEGIN_DECLS

Modified: trunk/gucharmap/gucharmap-chartable-cell-accessible.c
==============================================================================
--- trunk/gucharmap/gucharmap-chartable-cell-accessible.c	(original)
+++ trunk/gucharmap/gucharmap-chartable-cell-accessible.c	Fri Mar 21 10:49:00 2008
@@ -26,9 +26,9 @@
 
 #include "gucharmap.h"
 #include "gucharmap-chartable.h"
-#include "gucharmap-chartable-private.h"
 #include "gucharmap-chartable-accessible.h"
 #include "gucharmap-chartable-cell-accessible.h"
+#include "gucharmap-private.h"
 
 static void gucharmap_chartable_cell_accessible_class_init (GucharmapChartableCellAccessibleClass *klass);
 static void gucharmap_chartable_cell_accessible_init (GucharmapChartableCellAccessible *cell);

Modified: trunk/gucharmap/gucharmap-chartable-cell-accessible.h
==============================================================================
--- trunk/gucharmap/gucharmap-chartable-cell-accessible.h	(original)
+++ trunk/gucharmap/gucharmap-chartable-cell-accessible.h	Fri Mar 21 10:49:00 2008
@@ -21,6 +21,7 @@
 #define GUCHARMAP_CHARTABLE_CELL_ACCESSIBLE_H
 
 #include <atk/atk.h>
+#include <gucharmap/gucharmap-types.h>
 
 G_BEGIN_DECLS
 
@@ -32,22 +33,6 @@
 
 typedef struct _GucharmapChartableCellAccessible      GucharmapChartableCellAccessible;
 typedef struct _GucharmapChartableCellAccessibleClass GucharmapChartableCellAccessibleClass;
-  
-struct _GucharmapChartableCellAccessible
-{
-  AtkObject parent;
-
-  GtkWidget    *widget;
-  int           index;
-  AtkStateSet  *state_set;
-  gchar        *activate_description;
-  guint         action_idle_handler;
-};
-
-struct _GucharmapChartableCellAccessibleClass
-{
-  AtkObjectClass parent_class;
-};
 
 GType gucharmap_chartable_cell_accessible_get_type (void);
 

Modified: trunk/gucharmap/gucharmap-chartable.c
==============================================================================
--- trunk/gucharmap/gucharmap-chartable.c	(original)
+++ trunk/gucharmap/gucharmap-chartable.c	Fri Mar 21 10:49:00 2008
@@ -22,14 +22,14 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "gucharmap-marshal.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-chartable.h"
-#include "gucharmap-chartable-private.h"
 #include "gucharmap-unicode-info.h"
+#include "gucharmap-private.h"
 
 #define ENABLE_ACCESSIBLE
 

Modified: trunk/gucharmap/gucharmap-chartable.h
==============================================================================
--- trunk/gucharmap/gucharmap-chartable.h	(original)
+++ trunk/gucharmap/gucharmap-chartable.h	Fri Mar 21 10:49:00 2008
@@ -25,6 +25,7 @@
 #define GUCHARMAP_CHARTABLE_H
 
 #include <gtk/gtkdrawingarea.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-codepoint-list.h>
 
 G_BEGIN_DECLS
@@ -38,9 +39,6 @@
 
 #define GUCHARMAP_IS_CHARTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), gucharmap_chartable_get_type ()))
 
-typedef struct _GucharmapChartable GucharmapChartable;
-typedef struct _GucharmapChartableClass GucharmapChartableClass;
-
 GType gucharmap_chartable_get_type (void);
 GtkWidget * gucharmap_chartable_new (void);
 void gucharmap_chartable_set_font (GucharmapChartable *chartable, 

Modified: trunk/gucharmap/gucharmap-codepoint-list.c
==============================================================================
--- trunk/gucharmap/gucharmap-codepoint-list.c	(original)
+++ trunk/gucharmap/gucharmap-codepoint-list.c	Fri Mar 21 10:49:00 2008
@@ -20,6 +20,7 @@
 #include "config.h"
 #include <glib.h>
 #include "gucharmap-codepoint-list.h"
+#include "gucharmap-private.h"
 
 typedef struct _DefaultCodepointListPrivate DefaultCodepointListPrivate;
 

Modified: trunk/gucharmap/gucharmap-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-codepoint-list.h	Fri Mar 21 10:49:00 2008
@@ -25,6 +25,7 @@
 #define GUCHARMAP_CODEPOINT_LIST_H
 
 #include <glib-object.h>
+#include <gucharmap/gucharmap-types.h>
 
 G_BEGIN_DECLS
 
@@ -40,26 +41,6 @@
 #define GUCHARMAP_CODEPOINT_LIST_GET_CLASS(obj) \
              (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_codepoint_list_get_type (), GucharmapCodepointListClass))
 
-typedef struct _GucharmapCodepointList GucharmapCodepointList;
-typedef struct _GucharmapCodepointListClass GucharmapCodepointListClass;
-
-struct _GucharmapCodepointList
-{
-  GObject parent;
-};
-
-struct _GucharmapCodepointListClass
-{
-  GObjectClass parent_class;
-
-  /* zero is the first index */
-  gint     (*get_last_index) (GucharmapCodepointList *list);
-  gunichar (*get_char)       (GucharmapCodepointList *list, 
-                              gint                    index);
-  gint     (*get_index)      (GucharmapCodepointList *list, 
-                              gunichar                wc);
-};
-
 GType                    gucharmap_codepoint_list_get_type       (void);
 GucharmapCodepointList * gucharmap_codepoint_list_new            (gunichar start,
                                                                   gunichar end);

Modified: trunk/gucharmap/gucharmap-mini-fontsel.c
==============================================================================
--- trunk/gucharmap/gucharmap-mini-fontsel.c	(original)
+++ trunk/gucharmap/gucharmap-mini-fontsel.c	Fri Mar 21 10:49:00 2008
@@ -19,12 +19,13 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
 #include "gucharmap-mini-fontsel.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-marshal.h"
+#include "gucharmap-private.h"
 
 enum
 {

Modified: trunk/gucharmap/gucharmap-mini-fontsel.h
==============================================================================
--- trunk/gucharmap/gucharmap-mini-fontsel.h	(original)
+++ trunk/gucharmap/gucharmap-mini-fontsel.h	Fri Mar 21 10:49:00 2008
@@ -25,6 +25,7 @@
 #define GUCHARMAP_MINI_FONTSEL_H
 
 #include <gtk/gtk.h>
+#include <gucharmap/gucharmap-types.h>
 
 G_BEGIN_DECLS
 
@@ -39,33 +40,6 @@
 #define GUCHARMAP_IS_MINI_FONT_SELECTION(obj) \
         G_TYPE_CHECK_INSTANCE_TYPE ((obj), gucharmap_mini_font_selection_get_type ())
 
-typedef struct _GucharmapMiniFontSelection GucharmapMiniFontSelection;
-typedef struct _GucharmapMiniFontSelectionClass GucharmapMiniFontSelectionClass;
-
-struct _GucharmapMiniFontSelection
-{
-  GtkHBox parent;
-
-  GtkListStore         *family_store;
-  GtkWidget            *family; /* combo box */
-  GtkWidget            *bold;   /* toggle button*/
-  GtkWidget            *italic; /* toggle button*/
-
-  GtkObject            *size_adj; 
-  GtkWidget            *size;   /* spin button */
-  
-  PangoFontDescription *font_desc;
-
-  gint                  default_size;
-};
-
-struct _GucharmapMiniFontSelectionClass
-{
-  GtkHBoxClass parent_class;
-
-  void (* changed) (GucharmapMiniFontSelection *fontsel);
-};
-
 GType       gucharmap_mini_font_selection_get_type              (void);
 GtkWidget * gucharmap_mini_font_selection_new                   (void);
 gboolean    gucharmap_mini_font_selection_set_font_name         (GucharmapMiniFontSelection *fontsel,

Added: trunk/gucharmap/gucharmap-private.h
==============================================================================
--- (empty file)
+++ trunk/gucharmap/gucharmap-private.h	Fri Mar 21 10:49:00 2008
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2004 Noah Levitt
+ * Copyright (C) 2007 Christian Persch
+ *
+ * This program 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 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#include <gtk/gtk.h>
+
+#include "gucharmap-types.h"
+
+#define I_(string) g_intern_static_string (string)
+
+
+struct _GucharmapChaptersModel
+{
+  GtkListStore parent_instance;
+
+  /*< protected >*/
+  GucharmapCodepointList *book_list;
+};
+
+struct _GucharmapChaptersModelClass
+{
+  GtkListStoreClass parent_class;
+
+  const char *title;
+  gboolean (* character_to_iter) (GucharmapChaptersModel *chapters,
+                                  gunichar wc,
+                                  GtkTreeIter *iter);
+  GucharmapCodepointList * (* get_codepoint_list) (GucharmapChaptersModel *chapters,
+                                                   GtkTreeIter *iter);
+  G_CONST_RETURN GucharmapCodepointList * (* get_book_codepoint_list) (GucharmapChaptersModel *chapters);
+};
+
+
+struct _GucharmapBlockChaptersModel
+{
+  GucharmapChaptersModel parent;
+};
+
+struct _GucharmapBlockChaptersModelClass
+{
+  GucharmapChaptersModelClass parent_class;
+};
+
+
+struct _GucharmapChaptersView
+{
+  GtkTreeView parent_instance;
+
+  /*< private >*/
+  GtkTreeViewColumn *column;
+  GucharmapChaptersModel *model;
+};
+
+struct _GucharmapChaptersViewClass
+{
+  GtkTreeViewClass parent_class;
+};
+
+
+struct _GucharmapCharmap
+{
+  GtkHPaned parent;
+
+  GucharmapChaptersView *chapters_view;
+  GucharmapChartable *chartable;
+  GtkTextView *details_view;
+  GtkTextTag *text_tag_gimongous;
+  GtkTextTag *text_tag_big;
+
+  PangoFontDescription *font_desc;
+
+  GdkCursor *hand_cursor;
+  GdkCursor *regular_cursor;
+
+  guint hovering_over_link   : 1;
+  guint showing_details_page : 1;
+  guint last_character_set   : 1;
+};
+
+
+struct _GucharmapCharmapClass
+{
+  GtkHPanedClass parent_class;
+
+  void (* status_message) (GucharmapCharmap *charmap, const gchar *message);
+  void (* link_clicked) (GucharmapCharmap *charmap, 
+                         gunichar old_character,
+                         gunichar new_character);
+};
+
+
+struct _GucharmapChartableCellAccessible
+{
+  AtkObject parent;
+
+  GtkWidget    *widget;
+  int           index;
+  AtkStateSet  *state_set;
+  gchar        *activate_description;
+  guint         action_idle_handler;
+};
+
+struct _GucharmapChartableCellAccessibleClass
+{
+  AtkObjectClass parent_class;
+};
+
+
+struct _GucharmapChartable
+{
+  GtkDrawingArea parent_instance;
+
+  /* scrollable implementation */
+  GtkAdjustment *vadjustment;
+  gulong vadjustment_changed_handler_id;
+
+  /* Font */
+  PangoFontDescription *font_desc;
+  int drag_font_size;
+
+  /* Geometry */
+  int bare_minimal_column_width; /* depends only on font_desc */
+  int bare_minimal_row_height;   /* depends only on font_desc */
+  int minimal_column_width;      /* depends on font_desc and size allocation */
+  int minimal_row_height;        /* depends on font_desc and size allocation */
+  int n_padded_columns;          /* columns 0..n-1 will be 1px wider than minimal_column_width */
+  int n_padded_rows;             /* rows 0..n-1 will be 1px taller than minimal_row_height */
+  int rows;
+  int cols;
+  int page_size;       /* rows * cols */
+
+  int page_first_cell; /* the cell index of the top left corner */
+  int active_cell;     /* the active cell index */
+  int old_page_first_cell;
+  int old_active_cell;
+
+  /* Drawing */
+  GdkPixmap *pixmap;
+  PangoLayout *pango_layout;
+
+  /* Zoom popup */
+  GtkWidget *zoom_window;
+  GtkWidget *zoom_image;
+
+  /* for dragging (#114534) */
+  gdouble click_x, click_y; 
+
+  GtkTargetList *target_list;
+
+  GucharmapCodepointList *codepoint_list;
+  int last_cell; /* from gucharmap_codepoint_list_get_last_index */
+  gboolean codepoint_list_changed;
+
+  /* Settings */
+  guint snap_pow2_enabled : 1;
+  guint zoom_mode_enabled : 1;
+};
+
+struct _GucharmapChartableClass
+{
+  GtkDrawingAreaClass parent_class;
+
+  void    (* set_scroll_adjustments) (GucharmapChartable *chartable,
+                                      GtkAdjustment      *hadjustment,
+                                      GtkAdjustment      *vadjustment);
+  gboolean (* move_cursor)           (GucharmapChartable *chartable,
+                                      GtkMovementStep     step,
+                                      gint                count);
+  void (* activate) (GucharmapChartable *chartable);
+
+  void (* set_active_char) (GucharmapChartable *chartable, guint ch);
+  void (* status_message) (GucharmapChartable *chartable, const gchar *message);
+};
+
+gint _gucharmap_chartable_cell_column	(GucharmapChartable *chartable,
+					 guint cell);
+gint _gucharmap_chartable_column_width	(GucharmapChartable *chartable,
+					 gint col);
+gint _gucharmap_chartable_x_offset	(GucharmapChartable *chartable,
+					 gint col);
+gint _gucharmap_chartable_row_height	(GucharmapChartable *chartable,
+		 			 gint row);
+gint _gucharmap_chartable_y_offset	(GucharmapChartable *chartable,
+					 gint row);
+void _gucharmap_chartable_redraw	(GucharmapChartable *chartable,
+					 gboolean move_zoom);
+
+
+struct _GucharmapCodepointList
+{
+  GObject parent;
+};
+
+struct _GucharmapCodepointListClass
+{
+  GObjectClass parent_class;
+
+  /* zero is the first index */
+  gint     (*get_last_index) (GucharmapCodepointList *list);
+  gunichar (*get_char)       (GucharmapCodepointList *list, 
+                              gint                    index);
+  gint     (*get_index)      (GucharmapCodepointList *list, 
+                              gunichar                wc);
+};
+
+
+struct _GucharmapMiniFontSelection
+{
+  GtkHBox parent;
+
+  GtkListStore         *family_store;
+  GtkWidget            *family; /* combo box */
+  GtkWidget            *bold;   /* toggle button*/
+  GtkWidget            *italic; /* toggle button*/
+
+  GtkObject            *size_adj; 
+  GtkWidget            *size;   /* spin button */
+  
+  PangoFontDescription *font_desc;
+
+  gint                  default_size;
+};
+
+struct _GucharmapMiniFontSelectionClass
+{
+  GtkHBoxClass parent_class;
+
+  void (* changed) (GucharmapMiniFontSelection *fontsel);
+};
+
+
+struct _GucharmapScriptChaptersModel
+{
+  GucharmapChaptersModel parent;
+};
+
+struct _GucharmapScriptChaptersModelClass
+{
+  GucharmapChaptersModelClass parent_class;
+};
+
+
+struct _GucharmapScriptCodepointList
+{
+  GucharmapCodepointList parent;
+};
+
+struct _GucharmapScriptCodepointListClass
+{
+  GucharmapCodepointListClass parent_class;
+};
+
+
+struct _GucharmapSearchDialog
+{
+  GtkDialog parent;
+};
+
+struct _GucharmapSearchDialogClass
+{
+  GtkDialogClass parent_class;
+
+  /* signals */
+  void (* search_start)  (void);
+  void (* search_finish) (gunichar found_char);
+};
+
+
+struct _GucharmapWindow
+{
+  GtkWindow parent;
+
+  GucharmapCharmap *charmap; 
+};
+
+struct _GucharmapWindowClass
+{
+  GtkWindowClass parent_class;
+};
+
+

Modified: trunk/gucharmap/gucharmap-script-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-script-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-script-chapters-model.c	Fri Mar 21 10:49:00 2008
@@ -19,14 +19,16 @@
  */
 
 #include "config.h"
+
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gucharmap-intl.h"
 #include "gucharmap-unicode-info.h"
 #include "gucharmap-script-chapters-model.h"
 #include "gucharmap-script-codepoint-list.h"
 #include "gucharmap-settings.h"
+#include "gucharmap-private.h"
 
 static void
 gucharmap_script_chapters_model_init (GucharmapScriptChaptersModel *model)

Modified: trunk/gucharmap/gucharmap-script-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-script-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-script-chapters-model.h	Fri Mar 21 10:49:00 2008
@@ -25,6 +25,7 @@
 #ifndef GUCHARMAP_SCRIPT_CHAPTERS_MODEL_H
 #define GUCHARMAP_SCRIPT_CHAPTERS_MODEL_H
 
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-chapters-model.h>
 
 G_BEGIN_DECLS
@@ -41,19 +42,6 @@
 #define GUCHARMAP_SCRIPT_CHAPTERS_MODEL_GET_CLASS(obj) \
             (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_script_chapters_model_get_type (), GucharmapScriptChaptersModelClass))
 
-typedef struct _GucharmapScriptChaptersModel GucharmapScriptChaptersModel;
-typedef struct _GucharmapScriptChaptersModelClass GucharmapScriptChaptersModelClass;
-
-struct _GucharmapScriptChaptersModel
-{
-  GucharmapChaptersModel parent;
-};
-
-struct _GucharmapScriptChaptersModelClass
-{
-  GucharmapChaptersModelClass parent_class;
-};
-
 GType                   gucharmap_script_chapters_model_get_type (void);
 GucharmapChaptersModel* gucharmap_script_chapters_model_new      (void);
 

Modified: trunk/gucharmap/gucharmap-script-codepoint-list.c
==============================================================================
--- trunk/gucharmap/gucharmap-script-codepoint-list.c	(original)
+++ trunk/gucharmap/gucharmap-script-codepoint-list.c	Fri Mar 21 10:49:00 2008
@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include <glib.h>
-#include "gucharmap-intl.h"
 #include <string.h>
 #include "gucharmap-script-codepoint-list.h"
+#include "gucharmap-private.h"
 #include "unicode-scripts.h"
 
 typedef struct

Modified: trunk/gucharmap/gucharmap-script-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-script-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-script-codepoint-list.h	Fri Mar 21 10:49:00 2008
@@ -26,6 +26,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-codepoint-list.h>
 #include <gucharmap/gucharmap-unicode-info.h>
 
@@ -43,19 +44,6 @@
 #define GUCHARMAP_SCRIPT_CODEPOINT_LIST_GET_CLASS(obj) \
              (G_TYPE_INSTANCE_GET_CLASS ((obj), gucharmap_script_codepoint_list_get_type (), GucharmapScriptCodepointListClass))
 
-typedef struct _GucharmapScriptCodepointList GucharmapScriptCodepointList;
-typedef struct _GucharmapScriptCodepointListClass GucharmapScriptCodepointListClass;
-
-struct _GucharmapScriptCodepointList
-{
-  GucharmapCodepointList parent;
-};
-
-struct _GucharmapScriptCodepointListClass
-{
-  GucharmapCodepointListClass parent_class;
-};
-
 GType                    gucharmap_script_codepoint_list_get_type       (void);
 GucharmapCodepointList * gucharmap_script_codepoint_list_new            (void);
 gboolean                 gucharmap_script_codepoint_list_set_script     (GucharmapScriptCodepointList  *list,

Modified: trunk/gucharmap/gucharmap-search-dialog.c
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.c	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.c	Fri Mar 21 10:49:00 2008
@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,7 +26,7 @@
 #include "gucharmap-window.h"
 #include "gucharmap-unicode-info.h"
 #include "gucharmap-marshal.h"
-#include "gucharmap-intl.h"
+#include "gucharmap-private.h"
 
 #define GUCHARMAP_SEARCH_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), gucharmap_search_dialog_get_type (), GucharmapSearchDialogPrivate))
 

Modified: trunk/gucharmap/gucharmap-search-dialog.h
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.h	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.h	Fri Mar 21 10:49:00 2008
@@ -27,6 +27,7 @@
 #define GUCHARMAP_SEARCH_DIALOG_H
 
 #include <gtk/gtk.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-window.h>
 
 G_BEGIN_DECLS
@@ -40,23 +41,6 @@
 }
 GucharmapDirection;
 
-typedef struct _GucharmapSearchDialog GucharmapSearchDialog;
-typedef struct _GucharmapSearchDialogClass GucharmapSearchDialogClass;
-
-struct _GucharmapSearchDialog
-{
-  GtkDialog parent;
-};
-
-struct _GucharmapSearchDialogClass
-{
-  GtkDialogClass parent_class;
-
-  /* signals */
-  void (* search_start)  (void);
-  void (* search_finish) (gunichar found_char);
-};
-
 GType       gucharmap_search_dialog_get_type      (void);
 GtkWidget * gucharmap_search_dialog_new           (GucharmapWindow *parent);
 void        gucharmap_search_dialog_start_search  (GucharmapSearchDialog *search_dialog,

Modified: trunk/gucharmap/gucharmap-settings.c
==============================================================================
--- trunk/gucharmap/gucharmap-settings.c	(original)
+++ trunk/gucharmap/gucharmap-settings.c	Fri Mar 21 10:49:00 2008
@@ -25,7 +25,8 @@
 
 #include "gucharmap-chapters-model.h"
 #include "gucharmap-settings.h"
-#include "gucharmap-intl.h"
+#include "gucharmap-private.h"
+
 #if HAVE_GCONF
 #include <gconf/gconf-client.h>
 static GConfClient *client;

Added: trunk/gucharmap/gucharmap-types.h
==============================================================================
--- (empty file)
+++ trunk/gucharmap/gucharmap-types.h	Fri Mar 21 10:49:00 2008
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2004 Noah Levitt
+ * Copyright (C) 2007 Christian Persch
+ *
+ * This program 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 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
+#error "Only <gucharmap/gucharmap.h> can be included directly."
+#endif
+
+#ifndef GUCHARMAP_TYPES_H
+#define GUCHARMAP_TYPES_H
+
+typedef struct _GucharmapWindow GucharmapWindow;
+typedef struct _GucharmapWindowClass GucharmapWindowClass;
+
+typedef struct _GucharmapSearchDialog GucharmapSearchDialog;
+typedef struct _GucharmapSearchDialogClass GucharmapSearchDialogClass;
+
+typedef struct _GucharmapScriptCodepointList GucharmapScriptCodepointList;
+typedef struct _GucharmapScriptCodepointListClass GucharmapScriptCodepointListClass;
+
+typedef struct _GucharmapScriptChaptersModel GucharmapScriptChaptersModel;
+typedef struct _GucharmapScriptChaptersModelClass GucharmapScriptChaptersModelClass;
+
+typedef struct _GucharmapMiniFontSelection GucharmapMiniFontSelection;
+typedef struct _GucharmapMiniFontSelectionClass GucharmapMiniFontSelectionClass;
+
+typedef struct _GucharmapCodepointList GucharmapCodepointList;
+typedef struct _GucharmapCodepointListClass GucharmapCodepointListClass;
+
+typedef struct _GucharmapChartable GucharmapChartable;
+typedef struct _GucharmapChartableClass GucharmapChartableClass;
+
+typedef struct _GucharmapCharmap GucharmapCharmap;
+typedef struct _GucharmapCharmapClass GucharmapCharmapClass;
+
+typedef struct _GucharmapChaptersView GucharmapChaptersView;
+typedef struct _GucharmapChaptersViewClass GucharmapChaptersViewClass;
+
+typedef struct _GucharmapChaptersModel GucharmapChaptersModel;
+typedef struct _GucharmapChaptersModelClass GucharmapChaptersModelClass;
+
+typedef struct _GucharmapBlockChaptersModel GucharmapBlockChaptersModel;
+typedef struct _GucharmapBlockChaptersModelClass GucharmapBlockChaptersModelClass;
+
+#endif /* GUCHARMAP_TYPES_H */

Modified: trunk/gucharmap/gucharmap-unicode-info.c
==============================================================================
--- trunk/gucharmap/gucharmap-unicode-info.c	(original)
+++ trunk/gucharmap/gucharmap-unicode-info.c	Fri Mar 21 10:49:00 2008
@@ -22,6 +22,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include "gucharmap-unicode-info.h"
+#include "gucharmap-private.h"
 
 #include "unicode-names.h"
 #include "unicode-blocks.h"

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 10:49:00 2008
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include "gucharmap-window.h"
@@ -27,9 +28,9 @@
 #include "gucharmap-unicode-info.h"
 #include "gucharmap-script-chapters-model.h"
 #include "gucharmap-block-chapters-model.h"
-#include "gucharmap-intl.h"
 #include "gucharmap-search-dialog.h"
 #include "gucharmap-settings.h"
+#include "gucharmap-private.h"
 
 #ifndef ICON_PATH
 # define ICON_PATH ""
@@ -949,6 +950,8 @@
   gtk_window_set_icon_name (GTK_WINDOW (guw), "gucharmap");
 
   pack_stuff_in_window (guw);
+
+  gtk_widget_grab_focus (GTK_WIDGET (gucharmap_charmap_get_chartable (guw->charmap)));
 }
 
 static void

Modified: trunk/gucharmap/gucharmap-window.h
==============================================================================
--- trunk/gucharmap/gucharmap-window.h	(original)
+++ trunk/gucharmap/gucharmap-window.h	Fri Mar 21 10:49:00 2008
@@ -24,6 +24,7 @@
 #define GUCHARMAP_WINDOW_H
 
 #include <gtk/gtk.h>
+#include <gucharmap/gucharmap-types.h>
 #include <gucharmap/gucharmap-charmap.h>
 #include <gucharmap/gucharmap-mini-fontsel.h>
 
@@ -35,21 +36,6 @@
 
 #define GUCHARMAP_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), gucharmap_window_get_type ()))
 
-typedef struct _GucharmapWindow GucharmapWindow;
-typedef struct _GucharmapWindowClass GucharmapWindowClass;
-
-struct _GucharmapWindow
-{
-  GtkWindow parent;
-
-  GucharmapCharmap *charmap; 
-};
-
-struct _GucharmapWindowClass
-{
-  GtkWindowClass parent_class;
-};
-
 GType                        gucharmap_window_get_type                   (void);
 GtkWidget *                  gucharmap_window_new                        (void);
 void                         gucharmap_window_set_font_selection_visible (GucharmapWindow *guw, 

Modified: trunk/gucharmap/gucharmap.h
==============================================================================
--- trunk/gucharmap/gucharmap.h	(original)
+++ trunk/gucharmap/gucharmap.h	Fri Mar 21 10:49:00 2008
@@ -21,6 +21,8 @@
 
 #define __GUCHARMAP_GUCHARMAP_H_INSIDE__
 
+#include <gucharmap/gucharmap-types.h>
+
 #include <gucharmap/gucharmap-block-chapters-model.h>
 #include <gucharmap/gucharmap-chapters-model.h>
 #include <gucharmap/gucharmap-charmap.h>

Modified: trunk/gucharmap/main.c
==============================================================================
--- trunk/gucharmap/main.c	(original)
+++ trunk/gucharmap/main.c	Fri Mar 21 10:49:00 2008
@@ -30,7 +30,6 @@
 gint
 main (gint argc, gchar **argv)
 {
-  GucharmapChartable *chartable;
   GtkWidget *window;
   GdkScreen *screen;
   gint monitor;
@@ -99,9 +98,6 @@
 
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  chartable = gucharmap_charmap_get_chartable (GUCHARMAP_WINDOW (window)->charmap);
-  gtk_widget_grab_focus (GTK_WIDGET (chartable));
-
   gtk_widget_show (window);
 
   gtk_main ();

Modified: trunk/gucharmap/unicode-blocks.h
==============================================================================
--- trunk/gucharmap/unicode-blocks.h	(original)
+++ trunk/gucharmap/unicode-blocks.h	Fri Mar 21 10:49:00 2008
@@ -7,6 +7,8 @@
 #define UNICODE_BLOCKS_H
 
 #include <glib/gunicode.h>
+#include <glib/gi18n-lib.h>
+
 typedef struct _UnicodeBlock UnicodeBlock;
 
 static const struct _UnicodeBlock

Modified: trunk/gucharmap/unicode-names.h
==============================================================================
--- trunk/gucharmap/unicode-names.h	(original)
+++ trunk/gucharmap/unicode-names.h	Fri Mar 21 10:49:00 2008
@@ -8,7 +8,7 @@
 
 #include <glib/gunicode.h>
 
-#include "gucharmap-intl.h"
+#include <glib/gi18n-lib.h>
 
 static const char unicode_names_strings[] = \
   "<CJK Ideograph Extension A, First>\0"

Modified: trunk/gucharmap/unicode-scripts.h
==============================================================================
--- trunk/gucharmap/unicode-scripts.h	(original)
+++ trunk/gucharmap/unicode-scripts.h	Fri Mar 21 10:49:00 2008
@@ -7,7 +7,7 @@
 #define UNICODE_SCRIPTS_H
 
 #include <glib/gunicode.h>
-#include "gucharmap-intl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct _UnicodeScript UnicodeScript;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]