gucharmap r1699 - trunk/gucharmap

[chpe svn gnome org]

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

Log:
Destroy the window, don't call gtk_main_quit directly.


Modified:
   trunk/gucharmap/gucharmap-window.c
   trunk/gucharmap/gucharmap-window.h
   trunk/gucharmap/main.c

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 10:58:23 2008
@@ -200,6 +200,13 @@
 }
 
 static void
+close_window (GtkAction *action,
+              GtkWidget *widget)
+{
+  gtk_widget_destroy (widget);
+}
+
+static void
 font_bigger (GtkAction       *action, 
              GucharmapWindow *guw)
 {
@@ -646,7 +653,7 @@
     { "Help", NULL, N_("_Help"), NULL, NULL, NULL },
 
     { "Close", GTK_STOCK_CLOSE, NULL, NULL,
-      NULL, G_CALLBACK (gtk_main_quit) },
+      NULL, G_CALLBACK (close_window) },
 
     { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, NULL,
       NULL, G_CALLBACK (font_bigger) },
@@ -846,8 +853,7 @@
   return GTK_WIDGET (g_object_new (gucharmap_window_get_type (), NULL));
 }
 
-GucharmapMiniFontSelection *
-gucharmap_window_get_mini_font_selection (GucharmapWindow *guw)
+void
+gucharmap_window_set_font (GucharmapWindow *window)
 {
-  return GUCHARMAP_MINI_FONT_SELECTION (guw->fontsel);
 }

Modified: trunk/gucharmap/gucharmap-window.h
==============================================================================
--- trunk/gucharmap/gucharmap-window.h	(original)
+++ trunk/gucharmap/gucharmap-window.h	Fri Mar 21 10:58:23 2008
@@ -63,11 +63,13 @@
 
 #define GUCHARMAP_ICON_NAME "gucharmap"
 
-GType                        gucharmap_window_get_type                   (void);
-GtkWidget *                  gucharmap_window_new                        (void);
-GucharmapMiniFontSelection * gucharmap_window_get_mini_font_selection    (GucharmapWindow *guw);
+GType       gucharmap_window_get_type  (void);
 
-GdkCursor *                 _gucharmap_window_progress_cursor (void);
+GtkWidget * gucharmap_window_new       (void);
+
+void        gucharmap_window_set_font  (GucharmapWindow *window); 
+
+GdkCursor *_gucharmap_window_progress_cursor (void);
 
 G_END_DECLS
 

Modified: trunk/gucharmap/main.c
==============================================================================
--- trunk/gucharmap/main.c	(original)
+++ trunk/gucharmap/main.c	Fri Mar 21 10:58:23 2008
@@ -62,6 +62,8 @@
   gtk_window_set_default_icon_name (GUCHARMAP_ICON_NAME);
 
   window = gucharmap_window_new ();
+  g_signal_connect (window, "destroy",
+                    G_CALLBACK (gtk_main_quit), NULL);
 
   screen = gtk_window_get_screen (GTK_WINDOW (window));
   monitor = gdk_screen_get_monitor_at_point (screen, 0, 0);
@@ -70,6 +72,7 @@
 
   gucharmap_settings_add_window (GTK_WINDOW (window));
 
+#if 0
   /* make the starting font 50% bigger than the default font */
   if (font == NULL) /* font could be set by command line option */
     {
@@ -94,8 +97,7 @@
       else
         gucharmap_mini_font_selection_reset_font_size (fontsel);
     }
-
-  g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
+#endif
 
   gtk_widget_show (window);