gucharmap r1628 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Fri Mar 21 10:46:33 2008
New Revision: 1628
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1628&view=rev

Log:
Make GucharmapCharmap struct private, to force all calls to go through the API.


Modified:
   trunk/gucharmap/gucharmap-charmap.c
   trunk/gucharmap/gucharmap-charmap.h
   trunk/gucharmap/gucharmap-search-dialog.c
   trunk/gucharmap/gucharmap-window.c
   trunk/gucharmap/main.c

Modified: trunk/gucharmap/gucharmap-charmap.c
==============================================================================
--- trunk/gucharmap/gucharmap-charmap.c	(original)
+++ trunk/gucharmap/gucharmap-charmap.c	Fri Mar 21 10:46:33 2008
@@ -30,6 +30,33 @@
 #include "gucharmap-marshal.h"
 #include "gucharmap-settings.h"
 
+struct _GucharmapCharmap
+{
+  GtkHPaned parent;
+
+  GucharmapTable *chartable;
+
+  gint _unused_1;
+  gboolean showing_details_page;
+
+  GtkWidget *details;  /* GtkTextView * */
+
+  GdkCursor *hand_cursor;
+  GdkCursor *regular_cursor;
+  gboolean hovering_over_link;
+};
+
+
+struct _GucharmapCharmapClass
+{
+  GtkHPanedClass parent_class;
+
+  void (* status_message) (GucharmapCharmap *charmap, const gchar *message);
+  void (* link_clicked) (GucharmapCharmap *charmap, 
+                         gunichar old_character,
+                         gunichar new_character);
+};
+
 gboolean _gucharmap_unicode_has_nameslist_entry (gunichar uc);
 
 enum 
@@ -871,6 +898,12 @@
     gucharmap_table_set_active_character (charmap->chartable, wc);
 }
 
+/**
+ * gucharmap_charmap_get_chartable:
+ * @charmap:
+ *
+ * Returns: the #GucharmapChartable in @charmap
+ */
 GucharmapTable *
 gucharmap_charmap_get_chartable (GucharmapCharmap *charmap)
 {

Modified: trunk/gucharmap/gucharmap-charmap.h
==============================================================================
--- trunk/gucharmap/gucharmap-charmap.h	(original)
+++ trunk/gucharmap/gucharmap-charmap.h	Fri Mar 21 10:46:33 2008
@@ -40,34 +40,6 @@
 typedef struct _GucharmapCharmap GucharmapCharmap;
 typedef struct _GucharmapCharmapClass GucharmapCharmapClass;
 
-struct _GucharmapCharmap
-{
-  GtkHPaned parent;
-
-  GucharmapTable *chartable;
-
-  gint _unused_1;
-  gboolean showing_details_page;
-
-  GtkWidget *details;  /* GtkTextView * */
-
-  GdkCursor *hand_cursor;
-  GdkCursor *regular_cursor;
-  gboolean hovering_over_link;
-};
-
-
-struct _GucharmapCharmapClass
-{
-  GtkHPanedClass parent_class;
-
-  void (* status_message) (GucharmapCharmap *charmap, const gchar *message);
-  void (* link_clicked) (GucharmapCharmap *charmap, 
-                         gunichar old_character,
-                         gunichar new_character);
-};
-
-
 GType                 gucharmap_charmap_get_type           (void);
 GtkWidget *           gucharmap_charmap_new                (GucharmapChapters *chapters);
 void                  gucharmap_charmap_set_font           (GucharmapCharmap  *charmap, 
@@ -79,6 +51,10 @@
                                                             GucharmapChapters *chapters);
 GucharmapChapters *   gucharmap_charmap_get_chapters       (GucharmapCharmap  *charmap);
 
+
+
+GucharmapTable *gucharmap_charmap_get_chartable (GucharmapCharmap *charmap);
+
 G_END_DECLS
 
 #endif  /* #ifndef GUCHARMAP_CHARMAP_H */

Modified: trunk/gucharmap/gucharmap-search-dialog.c
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.c	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.c	Fri Mar 21 10:46:33 2008
@@ -641,7 +641,7 @@
       if (priv->search_state)
         gucharmap_search_state_free (priv->search_state);
 
-      start_char = gucharmap_table_get_active_character (priv->guw->charmap->chartable);
+      start_char = gucharmap_table_get_active_character (gucharmap_charmap_get_chartable (priv->guw->charmap));
       start_index = gucharmap_codepoint_list_get_index (list, start_char);
       priv->search_state = gucharmap_search_state_new (list, gtk_entry_get_text (GTK_ENTRY (priv->entry)),
 			      start_index, direction,
@@ -650,7 +650,7 @@
     }
   else
     {
-      start_char = gucharmap_table_get_active_character (priv->guw->charmap->chartable);
+      start_char = gucharmap_table_get_active_character (gucharmap_charmap_get_chartable (priv->guw->charmap));
       priv->search_state->start_index = gucharmap_codepoint_list_get_index (list, start_char);
       priv->search_state->curr_index = priv->search_state->start_index;
       priv->search_state->increment = direction;

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 10:46:33 2008
@@ -284,7 +284,7 @@
                 GucharmapWindow  *guw)
 {
   gboolean is_active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-  gucharmap_table_set_snap_pow2 (guw->charmap->chartable, is_active);
+  gucharmap_table_set_snap_pow2 (gucharmap_charmap_get_chartable (guw->charmap), is_active);
   gucharmap_settings_set_snap_pow2 (is_active);
 }
 
@@ -428,11 +428,13 @@
                 GucharmapWindow *guw)
 {
   GucharmapCodepointList *codepoint_list;
+  GucharmapTable *chartable;
   gint index, start;
   gunichar wc;
 
-  start = index = gucharmap_table_get_active_cell (guw->charmap->chartable);
-  codepoint_list = gucharmap_table_get_codepoint_list (guw->charmap->chartable);
+  chartable = gucharmap_charmap_get_chartable (guw->charmap);
+  start = index = gucharmap_table_get_active_cell (chartable);
+  codepoint_list = gucharmap_table_get_codepoint_list (chartable);
 
   do
     {
@@ -445,7 +447,7 @@
     }
   while ((!gucharmap_unichar_isdefined (wc) || !gucharmap_unichar_validate (wc)) && index != start);
 
-  gucharmap_table_set_active_character (guw->charmap->chartable, wc);
+  gucharmap_table_set_active_character (chartable, wc);
 }
 
 static void
@@ -453,11 +455,13 @@
                 GucharmapWindow *guw)
 {
   GucharmapCodepointList *codepoint_list;
+  GucharmapTable *chartable;
   gint index, start;
   gunichar wc;
 
-  start = index = gucharmap_table_get_active_cell (guw->charmap->chartable);
-  codepoint_list = gucharmap_table_get_codepoint_list (guw->charmap->chartable);
+  chartable = gucharmap_charmap_get_chartable (guw->charmap);
+  start = index = gucharmap_table_get_active_cell (chartable);
+  codepoint_list = gucharmap_table_get_codepoint_list (chartable);
 
   do
     {
@@ -470,7 +474,7 @@
     }
   while ((!gucharmap_unichar_isdefined (wc) || !gucharmap_unichar_validate (wc)) && index != start);
 
-  gucharmap_table_set_active_character (guw->charmap->chartable, wc);
+  gucharmap_table_set_active_character (chartable, wc);
 }
 
 static void
@@ -752,7 +756,7 @@
 {
   gchar *font_name = gucharmap_mini_font_selection_get_font_name (fontsel);
 
-  gucharmap_table_set_font (guw->charmap->chartable, font_name);
+  gucharmap_table_set_font (gucharmap_charmap_get_chartable (guw->charmap), font_name);
   gucharmap_settings_set_font (font_name);
 
   g_free (font_name);
@@ -853,6 +857,7 @@
   GtkWidget *chapters;
   GtkWidget *big_vbox;
   GtkWidget *hbox;
+  GucharmapTable *chartable;
 
   switch (priv->chapters_mode)
     {
@@ -888,7 +893,9 @@
   priv->text_to_copy_container = make_text_to_copy (guw);
   gtk_container_set_border_width (GTK_CONTAINER (priv->text_to_copy_container), 6);
   gtk_box_pack_start (GTK_BOX (big_vbox), priv->text_to_copy_container, FALSE, FALSE, 0);
-  g_signal_connect (guw->charmap->chartable, "activate", G_CALLBACK (insert_character_in_text_to_copy), guw);
+  /* FIXMEchpe!! */
+  chartable =gucharmap_charmap_get_chartable (guw->charmap);
+  g_signal_connect (chartable, "activate", G_CALLBACK (insert_character_in_text_to_copy), guw);
 
   
   hbox = gtk_hbox_new (FALSE, 0);

Modified: trunk/gucharmap/main.c
==============================================================================
--- trunk/gucharmap/main.c	(original)
+++ trunk/gucharmap/main.c	Fri Mar 21 10:46:33 2008
@@ -29,6 +29,7 @@
 gint
 main (gint argc, gchar **argv)
 {
+  GucharmapTable *chartable;
   GtkWidget *window;
   GdkScreen *screen;
   gint monitor;
@@ -97,7 +98,8 @@
 
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  gucharmap_table_grab_focus (GUCHARMAP_WINDOW (window)->charmap->chartable);
+  chartable = gucharmap_charmap_get_chartable (GUCHARMAP_WINDOW (window)->charmap);
+  gucharmap_table_grab_focus (chartable);
 
   gtk_widget_show (window);