gucharmap r1538 - in trunk: . gucharmap

[chpe svn gnome org]

Author: chpe
Date: Tue Jan 29 21:53:51 2008
New Revision: 1538
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1538&view=rev

Log:
2008-01-29  Christian Persch  <chpe gnome org>

	* gucharmap.pc.in:
	* gucharmap/gucharmap-chapters.c: (gucharmap_chapters_constructor):
	Merge from 2-22 branch.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gucharmap.pc.in
   trunk/gucharmap/gucharmap-chapters.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jan 29 21:53:51 2008
@@ -19,7 +19,7 @@
 
 AC_PREREQ([2.56])
 
-AC_INIT([GNOME Character Map],[2.21.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=gucharmap],[gucharmap])
+AC_INIT([GNOME Character Map],[2.23.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=gucharmap],[gucharmap])
 
 AC_CONFIG_SRCDIR([gucharmap/gucharmap.h])
 AC_CONFIG_HEADERS([config.h])

Modified: trunk/gucharmap.pc.in
==============================================================================
--- trunk/gucharmap.pc.in	(original)
+++ trunk/gucharmap.pc.in	Tue Jan 29 21:53:51 2008
@@ -6,6 +6,7 @@
 Name: gucharmap
 Description: GTK+ Unicode Character Map
 Version: @VERSION@
-Requires: gtk+-2.0 glib-2.0 @GCONFPKGS@
+Requires: gtk+-2.0 glib-2.0
+Requires.private: @GCONFPKGS@
 Libs: -L${libdir} -lgucharmap
 Cflags: -I${includedir}

Modified: trunk/gucharmap/gucharmap-chapters.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters.c	(original)
+++ trunk/gucharmap/gucharmap-chapters.c	Tue Jan 29 21:53:51 2008
@@ -22,6 +22,7 @@
 #include "gucharmap-chapters.h"
 #include "gucharmap-chapters-model.h"
 #include "gucharmap-chapters-view.h"
+#include "gucharmap-settings.h"
 #include "gucharmap-marshal.h"
 #include "gucharmap-intl.h"
 #include <string.h>
@@ -114,6 +115,7 @@
   gtk_container_add (GTK_CONTAINER (chapters), chapters->tree_view);
   gtk_widget_show (chapters->tree_view);
 
+  gucharmap_chapters_go_to_character (chapters, gucharmap_settings_get_last_char ());
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (chapters->tree_view));
   g_signal_connect (selection, "changed", G_CALLBACK (selection_changed), chapters);