gedit-plugins r407 - in trunk: . plugins/charmap

[icq svn gnome org]

Author: icq
Date: Tue Dec  2 21:17:24 2008
New Revision: 407
URL: http://svn.gnome.org/viewvc/gedit-plugins?rev=407&view=rev

Log:
2008-12-02  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * configure.ac:
        * plugins/charmap/gedit-charmap-plugin.c:
        * plugins/charmap/gedit-charmap-panel.c:
        * plugins/charmap/gedit-charmap-panel.h:
        Only support gucharmap 2.



Modified:
   trunk/ChangeLog
   trunk/plugins/charmap/gedit-charmap-panel.c
   trunk/plugins/charmap/gedit-charmap-panel.h
   trunk/plugins/charmap/gedit-charmap-plugin.c

Modified: trunk/plugins/charmap/gedit-charmap-panel.c
==============================================================================
--- trunk/plugins/charmap/gedit-charmap-panel.c	(original)
+++ trunk/plugins/charmap/gedit-charmap-panel.c	Tue Dec  2 21:17:24 2008
@@ -25,11 +25,7 @@
 #include <gedit/gedit-plugin.h>
 #include "gedit-charmap-panel.h"
 
-#ifdef HAVE_GUCHARMAP_2
 #include <gucharmap/gucharmap.h>
-#else
-#include <gucharmap/gucharmap-script-chapters.h>
-#endif
 
 #define GEDIT_CHARMAP_PANEL_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 (object),		       \
@@ -38,18 +34,12 @@
 
 struct _GeditCharmapPanelPrivate
 {
-#ifdef HAVE_GUCHARMAP_2
         GucharmapChaptersView *chapters_view;
         GucharmapChartable *chartable;
-#else
-	GtkWidget	*table;
-	GtkWidget	*chapters;
-#endif
 };
 
 GEDIT_PLUGIN_DEFINE_TYPE(GeditCharmapPanel, gedit_charmap_panel, GTK_TYPE_VBOX)
 
-#ifdef HAVE_GUCHARMAP_2
 static void
 on_chapter_view_selection_changed (GtkTreeSelection *selection,
                                    GeditCharmapPanel *panel)
@@ -66,35 +56,21 @@
         g_object_unref (codepoint_list);
 }
 
-#else
-
-static void
-on_chapter_changed (GucharmapChapters *chapters,
-		    GeditCharmapPanel *panel)
-{
-	gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (panel->priv->table),
-					    gucharmap_chapters_get_codepoint_list (chapters));
-}
-#endif /* HAVE_GUCHARMAP_2 */
-
 static void
 gedit_charmap_panel_init (GeditCharmapPanel *panel)
 {
         GeditCharmapPanelPrivate *priv;
 	GucharmapCodepointList *codepoint_list;
 	GtkPaned *paned;
-#ifdef HAVE_GUCHARMAP_2
         GtkWidget *scrolled_window, *view, *chartable;
         GtkTreeSelection *selection;
         GucharmapChaptersModel *model;
         GtkTreeIter iter;
-#endif
 
 	priv = panel->priv = GEDIT_CHARMAP_PANEL_GET_PRIVATE (panel);
 
 	paned = GTK_PANED (gtk_vpaned_new ());
 
-#ifdef HAVE_GUCHARMAP_2
         scrolled_window = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                         GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -134,27 +110,6 @@
         gtk_widget_show (scrolled_window);
 
         gucharmap_chapters_view_select_locale (priv->chapters_view);
-#else
-	priv->chapters = gucharmap_script_chapters_new ();
-	g_signal_connect (priv->chapters,
-			  "changed",
-			  G_CALLBACK (on_chapter_changed),
-			  panel);
-	
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (GUCHARMAP_CHAPTERS (priv->chapters)->tree_view),
-					   FALSE);
-
-	codepoint_list = gucharmap_chapters_get_codepoint_list 
-				(GUCHARMAP_CHAPTERS (priv->chapters));
-	
-	priv->table = gucharmap_table_new ();
-
-	gucharmap_table_set_codepoint_list (GUCHARMAP_TABLE (priv->table),
-					    codepoint_list);
-
-	gtk_paned_pack1 (paned, priv->chapters, FALSE, TRUE);
-	gtk_paned_pack2 (paned, priv->table, TRUE, TRUE);
-#endif /* HAVE_GUCHARMAP_2 */
 
 	gtk_paned_set_position (paned, 150);
 	
@@ -183,16 +138,8 @@
 	return GTK_WIDGET (g_object_new (GEDIT_TYPE_CHARMAP_PANEL, NULL));
 }
 
-#ifdef HAVE_GUCHARMAP_2
 GucharmapChartable *
 gedit_charmap_panel_get_chartable (GeditCharmapPanel *panel)
 {
 	return panel->priv->chartable;
 }
-#else
-GucharmapTable *
-gedit_charmap_panel_get_table (GeditCharmapPanel *panel)
-{
-	return GUCHARMAP_TABLE (panel->priv->table);
-}
-#endif

Modified: trunk/plugins/charmap/gedit-charmap-panel.h
==============================================================================
--- trunk/plugins/charmap/gedit-charmap-panel.h	(original)
+++ trunk/plugins/charmap/gedit-charmap-panel.h	Tue Dec  2 21:17:24 2008
@@ -27,11 +27,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#ifdef HAVE_GUCHARMAP_2
 #include <gucharmap/gucharmap.h>
-#else
-#include <gucharmap/gucharmap-table.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -78,11 +74,7 @@
 GType		 gedit_charmap_panel_register_type (GTypeModule * module);
 GtkWidget	*gedit_charmap_panel_new	   (void);
 
-#ifdef HAVE_GUCHARMAP_2
 GucharmapChartable *gedit_charmap_panel_get_chartable (GeditCharmapPanel *panel);
-#else
-GucharmapTable *gedit_charmap_panel_get_table	   (GeditCharmapPanel *panel);
-#endif
 
 G_END_DECLS
 

Modified: trunk/plugins/charmap/gedit-charmap-plugin.c
==============================================================================
--- trunk/plugins/charmap/gedit-charmap-plugin.c	(original)
+++ trunk/plugins/charmap/gedit-charmap-plugin.c	Tue Dec  2 21:17:24 2008
@@ -32,12 +32,7 @@
 #include <gedit/gedit-document.h>
 #include <gedit/gedit-prefs-manager.h>
 
-#ifdef HAVE_GUCHARMAP_2
 #include <gucharmap/gucharmap.h>
-#else
-#include <gucharmap/gucharmap-table.h>
-#include <gucharmap/gucharmap-unicode-info.h>
-#endif
 
 #define WINDOW_DATA_KEY	"GeditCharmapPluginWindowData"
 
@@ -77,11 +72,7 @@
 }
 
 static void
-#ifdef HAVE_GUCHARMAP_2
 on_table_status_message (GucharmapChartable *chartable,
-#else
-on_table_status_message (GucharmapTable *chartable,
-#endif
 			 const gchar    *message,
 			 GeditWindow    *window)
 {
@@ -100,24 +91,16 @@
 }
 
 static void
-#ifdef HAVE_GUCHARMAP_2
 on_table_sync_active_char (GucharmapChartable *chartable,
 			   GParamSpec         *psepc,
 			   GeditWindow        *window)
-#else
-on_table_set_active_char (GucharmapTable *chartable,
-			  gunichar        wc,
-			  GeditWindow    *window)
-#endif
 {
 	GString *gs;
 	const gchar **temps;
 	gint i;
-#ifdef HAVE_GUCHARMAP_2
 	gunichar wc;
 
 	wc = gucharmap_chartable_get_active_character (chartable);
-#endif
 
 	gs = g_string_new (NULL);
 	g_string_append_printf (gs, "U+%4.4X %s", wc, 
@@ -150,50 +133,32 @@
 			  GdkEventFocus  *event,
 			  GeditWindow    *window)
 {
-#ifdef HAVE_GUCHARMAP_2
 	GucharmapChartable *chartable;
-#else
-	GucharmapTable *chartable;
-#endif
 	WindowData *data;
 	
 	data = (WindowData *) g_object_get_data (G_OBJECT (window),
 						 WINDOW_DATA_KEY);
 	g_return_val_if_fail (data != NULL, FALSE);
 
-#ifdef HAVE_GUCHARMAP_2
 	chartable = gedit_charmap_panel_get_chartable
 					(GEDIT_CHARMAP_PANEL (data->panel));
-#else
-	chartable = gedit_charmap_panel_get_table
-					(GEDIT_CHARMAP_PANEL (data->panel));
-#endif
 
 	on_table_status_message (chartable, NULL, window);
 	return FALSE;
 }
 
-#ifdef HAVE_GUCHARMAP_2
 static void
 on_table_activate (GucharmapChartable *chartable,
 		   GeditWindow *window)
-#else
-static void
-on_table_activate (GucharmapTable *chartable, 
-		   gunichar        wc, 
-		   GeditWindow    *window)
-#endif
 {
 	GtkTextView   *view;
 	GtkTextBuffer *document;
 	GtkTextIter start, end;
 	gchar buffer[6];
 	gchar length;
-#ifdef HAVE_GUCHARMAP_2
         gunichar wc;
 
         wc = gucharmap_chartable_get_active_character (chartable);
-#endif
 	
 	g_return_if_fail (gucharmap_unichar_validate (wc));
 	
@@ -223,12 +188,8 @@
 create_charmap_panel (GeditWindow *window)
 {
 	GtkWidget      *panel;
-#ifdef HAVE_GUCHARMAP_2
 	GucharmapChartable *chartable;
 	PangoFontDescription *font_desc;
-#else
-	GucharmapTable *table;
-#endif
 	gchar *font;
 
 	panel = gedit_charmap_panel_new ();
@@ -236,19 +197,13 @@
 	/* Use the same font as the document */
 	font = gedit_prefs_manager_get_editor_font ();
 
-#ifdef HAVE_GUCHARMAP_2
 	chartable = gedit_charmap_panel_get_chartable (GEDIT_CHARMAP_PANEL (panel));
 	font_desc = pango_font_description_from_string (font);
 	gucharmap_chartable_set_font_desc (chartable, font_desc);
 	pango_font_description_free (font_desc);
-#else
-	table = gedit_charmap_panel_get_table (GEDIT_CHARMAP_PANEL (panel));
-	gucharmap_table_set_font (table, font);
-#endif
 
 	g_free (font);
 
-#ifdef HAVE_GUCHARMAP_2
 	g_signal_connect (chartable,
 			  "notify::active-character",
 			  G_CALLBACK (on_table_sync_active_char),
@@ -266,26 +221,6 @@
 			  G_CALLBACK (on_table_activate),
 			  window);
 
-#else
-	g_signal_connect (table,
-			  "set-active-char",
-			  G_CALLBACK (on_table_set_active_char),
-			  window);
-	/* Note: GucharmapTable does not provide focus-out-event ... */
-	g_signal_connect (table->drawing_area,
-			  "focus-out-event",
-			  G_CALLBACK (on_table_focus_out_event),
-			  window);
-	g_signal_connect (table,
-			  "status-message",
-			  G_CALLBACK (on_table_status_message),
-			  window);
-	g_signal_connect (table,
-			  "activate", 
-			  G_CALLBACK (on_table_activate),
-			  window);
-#endif /* HAVE_GUCHARMAP_2 */
-
 	gtk_widget_show_all (panel);
 
 	return panel;
@@ -341,11 +276,7 @@
 {
 	GeditPanel *panel;
 	WindowData *data;
-#ifdef HAVE_GUCHARMAP_2
 	GucharmapChartable *chartable;
-#else
-	GucharmapTable *chartable;
-#endif
 
 	gedit_debug (DEBUG_PLUGINS);
 
@@ -353,13 +284,8 @@
 						 WINDOW_DATA_KEY);
 	g_return_if_fail (data != NULL);
 
-#ifdef HAVE_GUCHARMAP_2
 	chartable = gedit_charmap_panel_get_chartable
 					(GEDIT_CHARMAP_PANEL (data->panel));
-#else
-	chartable = gedit_charmap_panel_get_table
-					(GEDIT_CHARMAP_PANEL (data->panel));
-#endif
 	on_table_status_message (chartable, NULL, window);
 
 	panel = gedit_window_get_side_panel (window);