[GNUnet-SVN] r3760 - in gnunet-gtk: . src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-11-13 20:34:40 -0800 (Mon, 13 Nov 2006)
New Revision: 3760

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/search.c
Log:
accellerators are causing gtk problems

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-11-14 03:00:26 UTC (rev 3759)
+++ gnunet-gtk/gnunet-gtk.glade 2006-11-14 04:34:40 UTC (rev 3760)
@@ -4383,7 +4383,6 @@
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">False</property>
                      <signal name="clicked" 
handler="on_downloadButton_clicked_" object="searchResults" 
last_modification_time="Mon, 23 May 2005 18:59:36 GMT"/>
-                     <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
 
                      <child>
                        <widget class="GtkAlignment" id="alignment10">
@@ -4524,7 +4523,6 @@
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">False</property>
                      <signal name="clicked" 
handler="on_abortSearchButton_clicked_" object="searchPageScrolledWindow" 
last_modification_time="Mon, 30 Oct 2006 03:58:55 GMT"/>
-                     <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -4543,7 +4541,6 @@
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">False</property>
                      <signal name="clicked" 
handler="on_closeSearchButton_clicked_" object="searchPageScrolledWindow" 
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
-                     <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
                    </widget>
                    <packing>
                      <property name="padding">0</property>

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2006-11-14 03:00:26 UTC (rev 3759)
+++ gnunet-gtk/src/plugins/fs/fs.c      2006-11-14 04:34:40 UTC (rev 3760)
@@ -96,7 +96,6 @@
     fs_search_stopped(event->data.SearchStopped.sc.cctx);
     break;
 
-
     /* download events */
   case FSUI_download_aborted:
     fs_download_aborted(event->data.DownloadAborted.dc.cctx);

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2006-11-14 03:00:26 UTC (rev 3759)
+++ gnunet-gtk/src/plugins/fs/search.c  2006-11-14 04:34:40 UTC (rev 3760)
@@ -435,7 +435,6 @@
   GE_BREAK(ectx, index != -1);
   gtk_notebook_remove_page(notebook,
                           index);
-
   /* recursively free search model */
   if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list->tree),
                                    &iter))
@@ -450,7 +449,6 @@
   gtk_tree_path_free(path);
   gtk_list_store_remove(search_summary,
                        &iter);
-
   /* free list state itself */
   UNREF(list->searchXML);
   UNREF(list->labelXML);