fixing gtk assertion errors

6 files changed, 18 insertions, 4 deletions

diff --git a/TODO b/TODO
index ecf9dd84..958efbe2 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@ Annotations:
   RC == Release Critical
 
 0.8.0 (new core features):
-- much more testing!!!
-  + find & fix GTK assertion errors
 - chat improvements:
   * allow leaving chat rooms
   * allow sending / joining by pressing ENTER
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 9d67109e..ea5ba5ce 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -3,6 +3,10 @@
 <!--*- mode: xml -*-->
 <glade-interface>
   <widget class="GtkWindow" id="mainWindow">
+    <property name="can_focus">True</property>
+    <property name="has_focus">True</property>
+    <property name="can_default">True</property>
+    <property name="has_default">True</property>
     <property name="title" translatable="yes">GNUnet, GNU's Peer-to-Peer Network</property>
     <property name="default_width">700</property>
     <property name="default_height">500</property>
@@ -2155,6 +2159,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
                       <widget class="GtkButton" id="on_chat_room_name_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
                         <property name="has_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="response_id">0</property>
@@ -4204,9 +4209,11 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
     <property name="width_request">780</property>
     <property name="height_request">300</property>
     <property name="border_width">5</property>
+    <property name="type">GTK_WINDOW_POPUP</property>
     <property name="title" translatable="yes">Messages</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="icon_name">gtk-dialog-info</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NOTIFICATION</property>
     <property name="focus_on_map">False</property>
     <child>
       <widget class="GtkVBox" id="vbox16">
@@ -4626,6 +4633,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
             <property name="position">5</property>
           </packing>
         </child>
diff --git a/src/common/logging.c b/src/common/logging.c
index 9384f9ad..1777e45d 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -103,6 +103,12 @@ doInfoMessage (void *args)
   return NULL;
 }
 
+void
+GNUNET_GTK_hide_info_window()
+{
+  gtk_widget_hide (infoWindow);
+}
+
 /**
  * Appends a message to the info window
  *
diff --git a/src/core/main.c b/src/core/main.c
index 7715fa30..5eedb1e8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -140,6 +140,7 @@ main (int argc, char *const *argv)
   dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), dataDir);
   GNUNET_free (dataDir);
+  GNUNET_GTK_hide_info_window();
   gtk_window_maximize (GTK_WINDOW (root));
   gtk_widget_show (root);
   gtk_window_present (GTK_WINDOW (root));
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index b98d132a..d95f8cec 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -90,6 +90,9 @@ void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
  */
 void GNUNET_GTK_add_log_entry (const char *txt, ...);
 
+void
+GNUNET_GTK_hide_info_window(void);
+
 struct GNUNET_GE_Context *GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask);
 
 #define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index df56d8ed..26e3844a 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -993,8 +993,6 @@ fs_search_aborted (SearchList * list)
   gtk_widget_show (glade_xml_get_widget (list->searchXML,
                                          "searchResumeButton"));
   gtk_widget_show (glade_xml_get_widget (list->searchXML,
-                                         "searchAbortButton"));
-  gtk_widget_show (glade_xml_get_widget (list->searchXML,
                                          "searchPauseButton"));
 }