[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7073 - in gnunet-gtk: . src/common src/core src/include sr
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7073 - in gnunet-gtk: . src/common src/core src/include src/plugins/fs |
Date: |
Sat, 7 Jun 2008 13:14:32 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 13:14:31 -0600 (Sat, 07 Jun 2008)
New Revision: 7073
Modified:
gnunet-gtk/TODO
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/common/logging.c
gnunet-gtk/src/core/main.c
gnunet-gtk/src/include/gnunetgtk_common.h
gnunet-gtk/src/plugins/fs/search.c
Log:
fixing gtk assertion errors
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2008-06-07 18:36:56 UTC (rev 7072)
+++ gnunet-gtk/TODO 2008-06-07 19:14:31 UTC (rev 7073)
@@ -4,8 +4,6 @@
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
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-06-07 18:36:56 UTC (rev 7072)
+++ gnunet-gtk/gnunet-gtk.glade 2008-06-07 19:14:31 UTC (rev 7073)
@@ -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 @@
<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 @@
<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 @@
<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>
Modified: gnunet-gtk/src/common/logging.c
===================================================================
--- gnunet-gtk/src/common/logging.c 2008-06-07 18:36:56 UTC (rev 7072)
+++ gnunet-gtk/src/common/logging.c 2008-06-07 19:14:31 UTC (rev 7073)
@@ -103,6 +103,12 @@
return NULL;
}
+void
+GNUNET_GTK_hide_info_window()
+{
+ gtk_widget_hide (infoWindow);
+}
+
/**
* Appends a message to the info window
*
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2008-06-07 18:36:56 UTC (rev 7072)
+++ gnunet-gtk/src/core/main.c 2008-06-07 19:14:31 UTC (rev 7073)
@@ -140,6 +140,7 @@
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));
Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h 2008-06-07 18:36:56 UTC (rev
7072)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2008-06-07 19:14:31 UTC (rev
7073)
@@ -90,6 +90,9 @@
*/
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
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-07 18:36:56 UTC (rev 7072)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-07 19:14:31 UTC (rev 7073)
@@ -993,8 +993,6 @@
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"));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7073 - in gnunet-gtk: . src/common src/core src/include src/plugins/fs,
gnunet <=