gucharmap r1655 - trunk/gucharmap

[chpe svn gnome org]

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

Log:
Remove redundant code.


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

Modified: trunk/gucharmap/gucharmap-private.h
==============================================================================
--- trunk/gucharmap/gucharmap-private.h	(original)
+++ trunk/gucharmap/gucharmap-private.h	Fri Mar 21 10:51:21 2008
@@ -293,4 +293,4 @@
   GtkWindowClass parent_class;
 };
 
-
+GdkCursor * _gucharmap_window_progress_cursor (void);

Modified: trunk/gucharmap/gucharmap-search-dialog.c
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.c	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.c	Fri Mar 21 10:51:21 2008
@@ -29,8 +29,6 @@
 
 #define GUCHARMAP_SEARCH_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), gucharmap_search_dialog_get_type (), GucharmapSearchDialogPrivate))
 
-GdkCursor * _gucharmap_window_progress_cursor ();
-
 enum
 {
   SEARCH_START,

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 10:51:21 2008
@@ -70,8 +70,6 @@
 
 G_DEFINE_TYPE (GucharmapWindow, gucharmap_window, GTK_TYPE_WINDOW)
 
-GdkCursor * _gucharmap_window_progress_cursor (void);
-
 static void
 status_message (GtkWidget       *widget, 
                 const gchar     *message, 
@@ -686,7 +684,6 @@
 {
   GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
   GtkWidget *menubar;
-  GtkAction *action;
   guint forward_keysym, back_keysym;
   GtkToggleAction *toggle_menu;
 
@@ -764,13 +761,7 @@
 
   gtk_widget_show_all (menubar);
 
-  if (! priv->file_menu_visible)
-    {
-      action = gtk_action_group_get_action (priv->action_group, "File");
-      gtk_action_set_visible (action, FALSE);
-      action = gtk_action_group_get_action (priv->action_group, "Quit");
-      gtk_action_set_sensitive (action, FALSE);
-    }
+  gucharmap_window_set_file_menu_visible (guw, TRUE);
 
   return menubar;
 }
@@ -1032,20 +1023,10 @@
 
   priv->file_menu_visible = visible;
 
-  if (priv->file_menu_visible)
-    {
-      action = gtk_action_group_get_action (priv->action_group, "File");
-      gtk_action_set_visible (action, TRUE);
-      action = gtk_action_group_get_action (priv->action_group, "Quit");
-      gtk_action_set_sensitive (action, TRUE);
-    }
-  else
-    {
-      action = gtk_action_group_get_action (priv->action_group, "File");
-      gtk_action_set_visible (action, FALSE);
-      action = gtk_action_group_get_action (priv->action_group, "Quit");
-      gtk_action_set_sensitive (action, FALSE);
-    }
+  action = gtk_action_group_get_action (priv->action_group, "File");
+  gtk_action_set_visible (action, visible);
+  action = gtk_action_group_get_action (priv->action_group, "Quit");
+  gtk_action_set_sensitive (action, visible);
 }
 
 GucharmapMiniFontSelection *