[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32007 - in gnunet-gtk: contrib src/conversation src/conver
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32007 - in gnunet-gtk: contrib src/conversation src/conversation/.deps |
Date: |
Wed, 22 Jan 2014 17:41:51 +0100 |
Author: yids
Date: 2014-01-22 17:41:51 +0100 (Wed, 22 Jan 2014)
New Revision: 32007
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk.Po
gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk_about.Po
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
fixed logging window
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
2014-01-22 16:35:34 UTC (rev 32006)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
2014-01-22 16:41:51 UTC (rev 32007)
@@ -91,7 +91,7 @@
<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"/>
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-01-22 16:35:34 UTC (rev 32006)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-01-22 16:41:51 UTC (rev 32007)
@@ -1,14 +1,12 @@
<?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-name contactName -->
<column type="gchararray"/>
- <!-- column-name logEvent -->
+ <!-- column-name contactType -->
<column type="gchararray"/>
- <!-- column-name logContact -->
- <column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow" id="GNUNET_GTK_conversation_window">
@@ -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,18 +422,20 @@
</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>
<object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>
Modified: gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk.Po
===================================================================
--- gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk.Po
2014-01-22 16:35:34 UTC (rev 32006)
+++ gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk.Po
2014-01-22 16:41:51 UTC (rev 32007)
@@ -100,8 +100,6 @@
/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 @@
/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:
Modified: gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk_about.Po
===================================================================
--- gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk_about.Po
2014-01-22 16:35:34 UTC (rev 32006)
+++ gnunet-gtk/src/conversation/.deps/gnunet-conversation-gtk_about.Po
2014-01-22 16:41:51 UTC (rev 32007)
@@ -100,8 +100,6 @@
/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 @@
/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:
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-01-22
16:35:34 UTC (rev 32006)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-01-22
16:41:51 UTC (rev 32007)
@@ -1053,7 +1053,7 @@
{
//GtkTreeIter iter;
GtkWindow *main_window;
-
+
//line = 0;
ml = cls;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32007 - in gnunet-gtk: contrib src/conversation src/conversation/.deps,
gnunet <=