[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12381 - in gnunet-gtk: . contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r12381 - in gnunet-gtk: . contrib src |
|
Date: |
Wed, 28 Jul 2010 21:27:09 +0200 |
Author: grothoff
Date: 2010-07-28 21:27:09 +0200 (Wed, 28 Jul 2010)
New Revision: 12381
Modified:
gnunet-gtk/contrib/Makefile.in
gnunet-gtk/contrib/main-window.glade
gnunet-gtk/gnunet_gtk_config.h.in
gnunet-gtk/src/main_window_view_toggles.c
gnunet-gtk/src/os_installation.c
gnunet-gtk/src/peerinfo.c
gnunet-gtk/src/peerinfo.h
Log:
update
Modified: gnunet-gtk/contrib/Makefile.in
===================================================================
--- gnunet-gtk/contrib/Makefile.in 2010-07-28 13:39:41 UTC (rev 12380)
+++ gnunet-gtk/contrib/Makefile.in 2010-07-28 19:27:09 UTC (rev 12381)
@@ -157,7 +157,6 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
Modified: gnunet-gtk/contrib/main-window.glade
===================================================================
--- gnunet-gtk/contrib/main-window.glade 2010-07-28 13:39:41 UTC (rev
12380)
+++ gnunet-gtk/contrib/main-window.glade 2010-07-28 19:27:09 UTC (rev
12381)
@@ -2,34 +2,26 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
- <columns>
- <!-- column-name peer_identity -->
- <column type="gchararray"/>
- <!-- column-name trust -->
- <column type="guint"/>
- <!-- column-name number_of_known_addresses -->
- <column type="guint"/>
- <!-- column-name country_name -->
- <column type="gchararray"/>
- <!-- column-name country_flag -->
- <column type="GdkPixbuf"/>
- <!-- column-name bandwidth -->
- <column type="guint64"/>
- </columns>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-down</property>
</object>
- <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
- <columns>
- <!-- column-name extractor_meta_type -->
- <column type="guint"/>
- <!-- column-name extractor_meta_format -->
- <column type="guint"/>
- <!-- column-name extractor_meta_type_string -->
- <column type="gchararray"/>
- <!-- column-name extracotr_meta_value -->
- <column type="gchararray"/>
- </columns>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</property>
</object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ </object>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-new</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_main_window">
<property name="title" translatable="yes">gnunet-gtk</property>
<property name="window_position">center</property>
@@ -211,18 +203,6 @@
</object>
</child>
<child>
- <object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_statistics">
- <property name="visible">True</property>
- <property name="tooltip_text"
translatable="yes">Activates panel showing statistics about our
operation</property>
- <property name="border_width">1</property>
- <property name="use_action_appearance">False</property>
- <property name="label"
translatable="yes">Statistics</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_statistics_toggled_cb" swapped="no"/>
- </object>
- </child>
- <child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_preview">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Show
preview (when available)</property>
@@ -265,10 +245,33 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
+ <object class="GtkToolbar" id="GNUNET_GTK_main_window_toolbar">
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToolButton" id="GNUNET_GTK_toolbar_search">
+ <property name="visible">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">_Search</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-find</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkHBox" id="GNUNET_GTK_main_window_hbox">
<property name="visible">True</property>
<child>
@@ -357,15 +360,6 @@
</packing>
</child>
<child>
- <object class="GtkNotebook"
id="GNUNET_GTK_statistics_notebook">
- <property name="can_focus">True</property>
- <property name="scrollable">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkTreeView"
id="GNUNET_GTK_main_window_peerinfo_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -401,27 +395,12 @@
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
<attributes>
- <attribute name="text">5</attribute>
+ <attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_peerinfo_trust_column">
- <property name="sizing">autosize</property>
- <property name="title"
translatable="yes">Trust</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_column_id">1</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_main_window_peerinfo_trust_renderer"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_peerinfo_country_column">
<property name="sizing">autosize</property>
<property name="title"
translatable="yes">Country</property>
@@ -432,14 +411,14 @@
<child>
<object class="GtkCellRendererPixbuf"
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
<attributes>
- <attribute name="pixbuf">4</attribute>
+ <attribute name="pixbuf">3</attribute>
</attributes>
</child>
</object>
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -451,44 +430,47 @@
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="GNUNET_GTK_main_status">
+ <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
<property name="visible">True</property>
- <property name="label" translatable="yes">Starting up...</property>
- <property name="use_markup">True</property>
- <property name="justify">center</property>
- <property name="wrap">True</property>
- <property name="track_visited_links">False</property>
+ <property name="spacing">2</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
+ <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+ <columns>
+ <!-- column-name extractor_meta_type -->
+ <column type="guint"/>
+ <!-- column-name extractor_meta_format -->
+ <column type="guint"/>
+ <!-- column-name extractor_meta_type_string -->
+ <column type="gchararray"/>
+ <!-- column-name extracotr_meta_value -->
+ <column type="gchararray"/>
+ </columns>
</object>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+ <columns>
+ <!-- column-name peer_identity -->
+ <column type="gchararray"/>
+ <!-- column-name number_of_known_addresses -->
+ <column type="guint"/>
+ <!-- column-name country_name -->
+ <column type="gchararray"/>
+ <!-- column-name country_flag -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name bandwidth -->
+ <column type="guint64"/>
+ </columns>
</object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- </object>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-find</property>
- </object>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-go-down</property>
- </object>
</interface>
Modified: gnunet-gtk/gnunet_gtk_config.h.in
===================================================================
--- gnunet-gtk/gnunet_gtk_config.h.in 2010-07-28 13:39:41 UTC (rev 12380)
+++ gnunet-gtk/gnunet_gtk_config.h.in 2010-07-28 19:27:09 UTC (rev 12381)
@@ -15,14 +15,6 @@
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
- the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
Modified: gnunet-gtk/src/main_window_view_toggles.c
===================================================================
--- gnunet-gtk/src/main_window_view_toggles.c 2010-07-28 13:39:41 UTC (rev
12380)
+++ gnunet-gtk/src/main_window_view_toggles.c 2010-07-28 19:27:09 UTC (rev
12381)
@@ -73,16 +73,6 @@
"GNUNET_GTK_main_menu_view_neighbours");
}
-/**
- * Statistics view is toggled.
- */
-void
-GNUNET_GTK_main_menu_view_statistics_toggled_cb (GtkWidget * dummy,
- gpointer data)
-{
- toggle_view ("GNUNET_GTK_statistics_notebook",
- "GNUNET_GTK_main_menu_view_statistics");
-}
/**
* Metadata view is toggled.
Modified: gnunet-gtk/src/os_installation.c
===================================================================
--- gnunet-gtk/src/os_installation.c 2010-07-28 13:39:41 UTC (rev 12380)
+++ gnunet-gtk/src/os_installation.c 2010-07-28 19:27:09 UTC (rev 12381)
@@ -32,24 +32,12 @@
* @author Christian Grothoff
*/
-#ifdef __cplusplus
-extern "C"
-{
-#if 0 /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
+#include "common.h"
#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_os_lib.h"
+#include <gnunet/gnunet_util_lib.h>
#if DARWIN
#include <mach-o/ldsyms.h>
#include <mach-o/dyld.h>
@@ -446,10 +434,4 @@
return tmp;
}
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
/* end of os_installation.c */
Modified: gnunet-gtk/src/peerinfo.c
===================================================================
--- gnunet-gtk/src/peerinfo.c 2010-07-28 13:39:41 UTC (rev 12380)
+++ gnunet-gtk/src/peerinfo.c 2010-07-28 19:27:09 UTC (rev 12381)
@@ -36,8 +36,7 @@
void
GNUNET_GTK_peerinfo_processor (void *cls,
const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_HELLO_Message * hello,
- uint32_t trust)
+ const struct GNUNET_HELLO_Message * hello)
{
GtkListStore *ls;
GtkTreeModel *tm;
@@ -79,10 +78,9 @@
gtk_list_store_set (ls,
&iter,
0, npid,
- 1, trust,
- 2, 0 /* number of known addresses */,
- 3, "" /* country name */,
- 4, NULL /* country flag */,
+ 1, 0 /* number of known addresses */,
+ 2, "" /* country name */,
+ 3, NULL /* country flag */,
-1);
}
Modified: gnunet-gtk/src/peerinfo.h
===================================================================
--- gnunet-gtk/src/peerinfo.h 2010-07-28 13:39:41 UTC (rev 12380)
+++ gnunet-gtk/src/peerinfo.h 2010-07-28 19:27:09 UTC (rev 12381)
@@ -35,13 +35,11 @@
* @param cls closure
* @param peer id of the peer, NULL for last call
* @param hello hello message for the peer (can be NULL)
- * @param trust amount of trust we have in the peer
*/
void
GNUNET_GTK_peerinfo_processor (void *cls,
const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_HELLO_Message * hello,
- uint32_t trust);
+ const struct GNUNET_HELLO_Message * hello);
/* end of peerinfo.h */
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12381 - in gnunet-gtk: . contrib src,
gnunet <=