Index: src/gdict-window.c
===================================================================
RCS file: /cvs/gnome/gnome-utils/gnome-dictionary/src/gdict-window.c,v
retrieving revision 1.7
diff -u -p -r1.7 gdict-window.c
--- src/gdict-window.c	24 Dec 2005 23:09:48 -0000	1.7
+++ src/gdict-window.c	29 Dec 2005 16:23:54 -0000
@@ -197,9 +197,6 @@ gdict_window_error_cb (GdictContext *con
 		       const GError *error,
 		       GdictWindow  *window)
 {
-  if (window->word)
-    g_free (window->word);
-
   gtk_statusbar_push (GTK_STATUSBAR (window->status), 0,
 		      _("No definitions found"));
 }
@@ -310,9 +307,7 @@ static void
 gdict_window_set_word (GdictWindow *window,
 		       const gchar *word)
 {
-  if (window->word)
-    g_free (window->word);
-  
+  g_free (window->word);
   window->word = g_strdup (word);
 }
 
@@ -794,9 +789,9 @@ entry_activate_cb (GtkWidget   *widget,
     return;
   
   word = gtk_entry_get_text (GTK_ENTRY (widget));
-  if (!word)
+  if (!word || *word == '\0')
     return;
-  
+
   gdict_window_set_word (window, word);
   
   title = g_strdup_printf (_("Dictionary - %s"), window->word);
@@ -829,9 +824,7 @@ gdict_window_drag_data_received_cb (GtkW
       
       gtk_entry_set_text (GTK_ENTRY (window->entry), text);
 
-      if (window->word)
-        g_free (window->word);
-      
+      g_free (window->word);
       window->word = g_strdup (text);
       
       title = g_strdup_printf (_("Dictionary - %s"), window->word);
