fixed logging window

5 files changed, 13 insertions, 29 deletions

diff --git a/contrib/gnunet_conversation_gtk_about_window.glade b/contrib/gnunet_conversation_gtk_about_window.glade
index a884d90f..131c04c7 100644
--- a/contrib/gnunet_conversation_gtk_about_window.glade
+++ b/contrib/gnunet_conversation_gtk_about_window.glade
@@ -91,7 +91,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;</property>
           <object class="GtkLabel" id="about_name_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">GNUnet-Peerinfo-GTK r31995</property>
+            <property name="label">GNUnet-Peerinfo-GTK r32004</property>
             <attributes>
               <attribute name="weight" value="bold"/>
               <attribute name="size" value="200"/>
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index c7a97f5a..ee3484d0 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
+  <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
     <columns>
-      <!-- column-name logTime -->
-      <column type="gchararray"/>
-      <!-- column-name logEvent -->
+      <!-- column-name contactName -->
       <column type="gchararray"/>
-      <!-- column-name logContact -->
+      <!-- column-name contactType -->
       <column type="gchararray"/>
     </columns>
   </object>
@@ -236,7 +234,7 @@
                 <property name="hscrollbar_policy">always</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTextView" id="GNUNET_GTK_conversation_history">
+                  <object class="GtkTextView" id="GNUNET_GTK_conversation_log">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="editable">False</property>
@@ -424,17 +422,19 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
+  <object class="GtkTreeStore" id="gnunet_conversation_gtk_contacts_treestore">
     <columns>
       <!-- column-name contactName -->
       <column type="gchararray"/>
-      <!-- column-name contactType -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkTreeStore" id="gnunet_conversation_gtk_contacts_treestore">
+  <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
     <columns>
-      <!-- column-name contactName -->
+      <!-- column-name logTime -->
+      <column type="gchararray"/>
+      <!-- column-name logEvent -->
+      <column type="gchararray"/>
+      <!-- column-name logContact -->
       <column type="gchararray"/>
     </columns>
   </object>
diff --git a/src/conversation/.deps/gnunet-conversation-gtk.Po b/src/conversation/.deps/gnunet-conversation-gtk.Po
index c0b4c9d6..dc963ff4 100644
--- a/src/conversation/.deps/gnunet-conversation-gtk.Po
+++ b/src/conversation/.deps/gnunet-conversation-gtk.Po
@@ -100,8 +100,6 @@ gnunet-conversation-gtk.o: gnunet-conversation-gtk.c \
  /usr/local/include/gnunet/gnunet_network_lib.h \
  /usr/local/include/gnunet/gnunet_disk_lib.h \
  /usr/local/include/gnunet/gnunet_configuration_lib.h \
- /usr/local/include/gcrypt.h /usr/local/include/gpg-error.h \
- /usr/include/x86_64-linux-gnu/sys/time.h \
  /usr/local/include/gnunet/gnunet_bandwidth_lib.h \
  /usr/local/include/gnunet/gnunet_bio_lib.h \
  /usr/local/include/gnunet/gnunet_container_lib.h \
@@ -942,12 +940,6 @@ gnunet-conversation-gtk.o: gnunet-conversation-gtk.c \
 
 /usr/local/include/gnunet/gnunet_configuration_lib.h:
 
-/usr/local/include/gcrypt.h:
-
-/usr/local/include/gpg-error.h:
-
-/usr/include/x86_64-linux-gnu/sys/time.h:
-
 /usr/local/include/gnunet/gnunet_bandwidth_lib.h:
 
 /usr/local/include/gnunet/gnunet_bio_lib.h:
diff --git a/src/conversation/.deps/gnunet-conversation-gtk_about.Po b/src/conversation/.deps/gnunet-conversation-gtk_about.Po
index 34bebbd0..7bd33199 100644
--- a/src/conversation/.deps/gnunet-conversation-gtk_about.Po
+++ b/src/conversation/.deps/gnunet-conversation-gtk_about.Po
@@ -100,8 +100,6 @@ gnunet-conversation-gtk_about.o: gnunet-conversation-gtk_about.c \
  /usr/local/include/gnunet/gnunet_network_lib.h \
  /usr/local/include/gnunet/gnunet_disk_lib.h \
  /usr/local/include/gnunet/gnunet_configuration_lib.h \
- /usr/local/include/gcrypt.h /usr/local/include/gpg-error.h \
- /usr/include/x86_64-linux-gnu/sys/time.h \
  /usr/local/include/gnunet/gnunet_bandwidth_lib.h \
  /usr/local/include/gnunet/gnunet_bio_lib.h \
  /usr/local/include/gnunet/gnunet_container_lib.h \
@@ -929,12 +927,6 @@ gnunet-conversation-gtk_about.o: gnunet-conversation-gtk_about.c \
 
 /usr/local/include/gnunet/gnunet_configuration_lib.h:
 
-/usr/local/include/gcrypt.h:
-
-/usr/local/include/gpg-error.h:
-
-/usr/include/x86_64-linux-gnu/sys/time.h:
-
 /usr/local/include/gnunet/gnunet_bandwidth_lib.h:
 
 /usr/local/include/gnunet/gnunet_bio_lib.h:
diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 054e8184..9c775d7b 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -1053,7 +1053,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   //GtkTreeIter iter;
   GtkWindow *main_window;
-
+  
   //line = 0;
 
   ml = cls;