[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6416 - in gnunet-gtk: . src/common src/core src/include sr
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6416 - in gnunet-gtk: . src/common src/core src/include src/plugins/daemon src/plugins/fs src/plugins/fs/extensions src/plugins/peers src/plugins/stats |
|
Date: |
Fri, 22 Feb 2008 21:26:44 -0700 (MST) |
Author: grothoff
Date: 2008-02-22 21:26:44 -0700 (Fri, 22 Feb 2008)
New Revision: 6416
Modified:
gnunet-gtk/TODO
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/core/eggtrayicon.c
gnunet-gtk/src/core/main.c
gnunet-gtk/src/include/gnunetgtk_common.h
gnunet-gtk/src/plugins/daemon/daemon.c
gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/search.h
gnunet-gtk/src/plugins/fs/upload.c
gnunet-gtk/src/plugins/peers/peers.c
gnunet-gtk/src/plugins/stats/functions.c
gnunet-gtk/src/plugins/stats/statistics.c
Log:
cleaner pause resume, hiding confusing abort button
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/TODO 2008-02-23 04:26:44 UTC (rev 6416)
@@ -5,6 +5,23 @@
0.7.4 (goal: polish):
+- CRASH:
+(gdb) ba
+#0 0xb73d3057 in adns__internal_check () from /usr/lib/libadns.so.1
+#1 0xb73d33a9 in adns_check () from /usr/lib/libadns.so.1
+#2 0xb78937ba in cache_resolve (cache=0x844bf90) at dns.c:89
+#3 0xb7893dc2 in GNUNET_get_ip_as_string (sav=0x84518b4, salen=16,
do_resolve=1) at dns.c:256
+#4 0xb6ec3714 in collector (data=0x83e9640, identity=0x8451868,
address=0x84518b4,
+ addr_len=16, last_message=0, trust=59, bpmFromPeer=0) at peers.c:115
+#5 0xb6e4c177 in GNUNET_IDENTITY_request_peer_infos (sock=0x844a478,
+ callback=0xb6ec34fc <collector>, cls=0x83e9640) at clientapi.c:216
+#6 0xb6ec3db1 in getPeerModel () at peers.c:227
+#7 0xb6ec3f02 in updatePeerInfo (dummy=0x0) at peers.c:268
+#8 0xb7884ec3 in runJob (cron=0x806cf08) at cron.c:529
+#9 0xb7884fad in cron_main_method (ctx=0x806cf08) at cron.c:569
+#10 0xb76b2383 in start_thread () from /lib/libpthread.so.0
+#11 0xb763673e in clone () from /lib/libc.so.6
+
- #1045: ability to pause a search => requires FSUI changes! [RC]
- improve collection handling [RC]
+ show content of current collection somewhere
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/gnunet-gtk.glade 2008-02-23 04:26:44 UTC (rev 6416)
@@ -678,107 +678,6 @@
<placeholder/>
</child>
<child>
- <widget class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkButton"
id="abortDownloadButton">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Cancel the selected download (and all
sub-downloads)</property>
- <property
name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_abortDownloadButton_clicked_"/>
- </widget>
- <packing>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="stopDownloadButton">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Cancel the selected download (and all sub-downloads) and
remove them from the list</property>
- <property name="label">gtk-stop</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_stopDownloadButton_clicked_"/>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="clearCompletedDownloadsButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Clear completed downloads from the download list</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_clearCompletedDownloadsButton_clicked_"/>
- <child>
- <widget class="GtkHBox" id="hbox26">
- <property
name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image15">
- <property
name="visible">True</property>
- <property
name="stock">gtk-clear</property>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label14">
- <property
name="visible">True</property>
- <property name="label"
translatable="yes">_Clean</property>
- <property
name="use_underline">True</property>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
- <property name="x_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow10">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView"
id="activeDownloadsList">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="reorderable">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
<widget class="GtkHBox" id="hbox24">
<property name="visible">True</property>
<child>
@@ -893,6 +792,107 @@
<property name="y_padding">5</property>
</packing>
</child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow10">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView"
id="activeDownloadsList">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="reorderable">True</property>
+ <property name="rules_hint">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkButton"
id="abortDownloadButton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">Cancel the selected download (and all
sub-downloads)</property>
+ <property
name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked"
handler="on_abortDownloadButton_clicked_"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="stopDownloadButton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">Cancel the selected download (and all sub-downloads) and
remove them from the list</property>
+ <property name="label">gtk-stop</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked"
handler="on_stopDownloadButton_clicked_"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="clearCompletedDownloadsButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">Clear completed downloads from the download list</property>
+ <property name="response_id">0</property>
+ <signal name="clicked"
handler="on_clearCompletedDownloadsButton_clicked_"/>
+ <child>
+ <widget class="GtkHBox" id="hbox26">
+ <property
name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="image15">
+ <property
name="visible">True</property>
+ <property
name="stock">gtk-clear</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label14">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">_Clean</property>
+ <property
name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
+ <property name="x_padding">5</property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -1329,121 +1329,241 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="methodLabel">
+ <widget class="GtkCheckButton"
id="doExtractCheckButton">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label"
translatable="yes">Method:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">indexbutton</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">Controls if GNUnet should (automatically) extract metadata
for files. If unchecked, the default metadata for the upload will only contain
the filename. If checked, GNU libextractor will be used to provide additional
metadata (such as thumbnails). The option only applies when a directory is
uploaded. For individual files, GNU libextractor is always used (you will have
a chance to edit the extracted metadata in a dialog).</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment24">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox66">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image49">
+ <property
name="visible">True</property>
+ <property
name="stock">gtk-index</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label151">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Use libextractor for files in directories</property>
+ <property
name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="indexbutton">
+ <widget class="GtkSpinButton"
id="contentPrioritySpinButton">
+ <property name="width_request">94</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Indexing will avoid copying the file into the GNUnet
database. Instead, GNUnet will try to add a symbolic link to the specified
file. If that fails, a copy of the file will be created. Indexing should be
used if the local machine is unlikely to ever be compromised by an adversary
and if the uploaded file will not be modified or moved in the future. Indexing
is more efficient than insertion.</property>
- <property name="label"
translatable="yes">Inde_x</property>
+ <property name="tooltip" translatable="yes">How
important is the file (used to prioritize data in the local
datastore).</property>
+ <property name="adjustment">1000 0 100000000 50
500 500</property>
+ <property name="climb_rate">500</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="scopeFileOnlyButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Only
publish a single file</property>
+ <property name="label" translatable="yes">File
onl_y</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property
name="group">scopeRecursiveButton</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="insertButton">
+ <widget class="GtkButton"
id="mainFileSharingInsertBrowseButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Inserting a file means that an encrypted copy will be added
to the GNUnet database. Without the proper key (which is not stored in
plaintext anywhere) the file cannot be decrypted. Use this option for small
files, files that will be modified soon, files that maybe moved or if you are
afraid that an adversary may detect the file in plaintext on your machine
(after compromising your machine).</property>
- <property name="label"
translatable="yes">I_nsert</property>
- <property name="use_underline">True</property>
+ <property name="tooltip" translatable="yes">Browse
local computer for files (or directories) to publish</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">indexbutton</property>
+ <signal name="clicked"
handler="on_mainFileSharingInsertBrowseButton_clicked_"
object="fsinsertfilenamecombo"/>
+ <child>
+ <widget class="GtkHBox" id="hbox60">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image46">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label143">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Browse</property>
+ <property
name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="scopeLabel">
+ <widget class="GtkAlignment"
id="uploadFilenameAlignment">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label"
translatable="yes">Scope:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">scopeFileOnlyButton</property>
+ <child>
+ <widget class="GtkComboBoxEntry"
id="uploadFilenameComboBoxEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="changed"
handler="on_uploadFilenameComboBoxEntry_changed_"/>
+ <child internal-child="entry">
+ <widget class="GtkEntry"
id="comboboxentry-entry3">
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="anonymityUploadLabel">
+ <widget class="GtkLabel" id="label150">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
+ <property name="label"
translatable="yes">_Priority:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">uploadAnonymityLevelSpinButton</property>
+ <property
name="mnemonic_widget">contentPrioritySpinButton</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="scopeRecursiveButton">
+ <widget class="GtkLabel" id="uploadFilenameLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Recursively publish an entire directory tree</property>
- <property name="label"
translatable="yes">_Recursive (for entire directories)</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label"
translatable="yes">_Filename:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property
name="justify">GTK_JUSTIFY_CENTER</property>
+ <property
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="uploadAnonymityLevelSpinButton">
+ <widget class="GtkButton" id="fsinsertuploadbutton">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">What
level of sender-anonymity is desired when sharing this particular file? 0
allows direct connections (no anonymity). Higher levels require increasing
amounts of cover traffic per shared block, increasing your privacy at the
expense of efficiency.</property>
- <property name="adjustment">1 0 10000 1 10
10</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- <signal name="value_changed"
handler="on_anonymity_spin_changed_"/>
+ <property name="tooltip" translatable="yes">Share
the specified file with the selected options (you will then be prompted to
enter meta-data and keywords)</property>
+ <property name="response_id">0</property>
+ <signal name="clicked"
handler="on_fsinsertuploadbutton_clicked_"/>
+ <child>
+ <widget class="GtkHBox" id="hbox55">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image42">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label137">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Pub_lish</property>
+ <property
name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -1502,245 +1622,125 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="fsinsertuploadbutton">
+ <widget class="GtkSpinButton"
id="uploadAnonymityLevelSpinButton">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Share
the specified file with the selected options (you will then be prompted to
enter meta-data and keywords)</property>
- <property name="response_id">0</property>
- <signal name="clicked"
handler="on_fsinsertuploadbutton_clicked_"/>
- <child>
- <widget class="GtkHBox" id="hbox55">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image42">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label137">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Pub_lish</property>
- <property
name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="tooltip" translatable="yes">What
level of sender-anonymity is desired when sharing this particular file? 0
allows direct connections (no anonymity). Higher levels require increasing
amounts of cover traffic per shared block, increasing your privacy at the
expense of efficiency.</property>
+ <property name="adjustment">1 0 10000 1 10
10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_anonymity_spin_changed_"/>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="uploadFilenameLabel">
+ <widget class="GtkRadioButton"
id="scopeRecursiveButton">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label"
translatable="yes">_Filename:</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip"
translatable="yes">Recursively publish an entire directory tree</property>
+ <property name="label"
translatable="yes">_Recursive (for entire directories)</property>
<property name="use_underline">True</property>
- <property
name="justify">GTK_JUSTIFY_CENTER</property>
- <property
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label150">
+ <widget class="GtkLabel" id="anonymityUploadLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
- <property name="label"
translatable="yes">_Priority:</property>
+ <property name="label"
translatable="yes">_Anonymity:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">contentPrioritySpinButton</property>
+ <property
name="mnemonic_widget">uploadAnonymityLevelSpinButton</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment"
id="uploadFilenameAlignment">
+ <widget class="GtkLabel" id="scopeLabel">
<property name="visible">True</property>
- <child>
- <widget class="GtkComboBoxEntry"
id="uploadFilenameComboBoxEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed"
handler="on_uploadFilenameComboBoxEntry_changed_"/>
- <child internal-child="entry">
- <widget class="GtkEntry"
id="comboboxentry-entry3">
- </widget>
- </child>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label"
translatable="yes">Scope:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">scopeFileOnlyButton</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="mainFileSharingInsertBrowseButton">
+ <widget class="GtkRadioButton" id="insertButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Browse
local computer for files (or directories) to publish</property>
+ <property name="tooltip"
translatable="yes">Inserting a file means that an encrypted copy will be added
to the GNUnet database. Without the proper key (which is not stored in
plaintext anywhere) the file cannot be decrypted. Use this option for small
files, files that will be modified soon, files that maybe moved or if you are
afraid that an adversary may detect the file in plaintext on your machine
(after compromising your machine).</property>
+ <property name="label"
translatable="yes">I_nsert</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
- <signal name="clicked"
handler="on_mainFileSharingInsertBrowseButton_clicked_"
object="fsinsertfilenamecombo"/>
- <child>
- <widget class="GtkHBox" id="hbox60">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image46">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label143">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Browse</property>
- <property
name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="draw_indicator">True</property>
+ <property name="group">indexbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="scopeFileOnlyButton">
+ <widget class="GtkRadioButton" id="indexbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Only
publish a single file</property>
- <property name="label" translatable="yes">File
onl_y</property>
+ <property name="tooltip"
translatable="yes">Indexing will avoid copying the file into the GNUnet
database. Instead, GNUnet will try to add a symbolic link to the specified
file. If that fails, a copy of the file will be created. Indexing should be
used if the local machine is unlikely to ever be compromised by an adversary
and if the uploaded file will not be modified or moved in the future. Indexing
is more efficient than insertion.</property>
+ <property name="label"
translatable="yes">Inde_x</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property
name="group">scopeRecursiveButton</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="contentPrioritySpinButton">
- <property name="width_request">94</property>
+ <widget class="GtkLabel" id="methodLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">How
important is the file (used to prioritize data in the local
datastore).</property>
- <property name="adjustment">1000 0 100000000 50
500 500</property>
- <property name="climb_rate">500</property>
- <property name="numeric">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label"
translatable="yes">Method:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">indexbutton</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton"
id="doExtractCheckButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Controls if GNUnet should (automatically) extract metadata
for files. If unchecked, the default metadata for the upload will only contain
the filename. If checked, GNU libextractor will be used to provide additional
metadata (such as thumbnails). The option only applies when a directory is
uploaded. For individual files, GNU libextractor is always used (you will have
a chance to edit the extracted metadata in a dialog).</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child>
- <widget class="GtkAlignment" id="alignment24">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox66">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image49">
- <property
name="visible">True</property>
- <property
name="stock">gtk-index</property>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label151">
- <property
name="visible">True</property>
- <property name="label"
translatable="yes">Use libextractor for files in directories</property>
- <property
name="use_underline">True</property>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -2796,8 +2796,8 @@
<property name="response_id">-5</property>
<signal name="clicked" handler="gtk_widget_destroy"
object="metaDisplayDialog"/>
<signal name="activate" handler="gtk_widget_destroy"
object="metaDisplayDialog"/>
- <accelerator key="Escape" modifiers="" signal="activate"/>
<accelerator key="Return" modifiers="" signal="activate"/>
+ <accelerator key="Escape" modifiers="" signal="activate"/>
</widget>
</child>
</widget>
@@ -3026,7 +3026,6 @@
</child>
<child>
<widget class="GtkButton" id="searchCancelButton">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Abort the
search, but keep search tab open</property>
<property name="label">gtk-stop</property>
@@ -4994,8 +4993,8 @@
<property name="icon_name">gtk-save-as</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
- <property name="show_hidden">True</property>
<property name="do_overwrite_confirmation">True</property>
+ <property name="show_hidden">True</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/common/helper.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -42,9 +42,7 @@
/* Not used because libgksu2 headers have broken depends in Debian
And this is not really needed
#include <libgksu/libgksu.h> */
-gboolean
-gksu_run (gchar *command_line,
- GError **error);
+gboolean gksu_run (gchar * command_line, GError ** error);
#endif
typedef struct
@@ -359,7 +357,7 @@
GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "glade_xml_new",
gladeFile);
-#if GTK_CHECK_VERSION (2,10,0)
+#if GTK_CHECK_VERSION (2,10,0)
trayIcon = gtk_status_icon_new ();
#endif
initTrayIcon ();
@@ -465,8 +463,8 @@
i = 0;
while (GNUNET_SYSERR == GNUNET_semaphore_down (cls.sig, GNUNET_NO))
{
- if (i == -1)
- GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
+ if (i == -1)
+ GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
GNUNET_mutex_lock (sclock);
if (pscCount > 0)
{
@@ -609,78 +607,85 @@
* Start gnunet-setup, asking for a password if needed
*/
gboolean
-GNUNET_GTK_run_gnunet_setup (gchar *conffile, gboolean run_wizard)
+GNUNET_GTK_run_gnunet_setup (gchar * conffile, gboolean run_wizard)
{
GtkWidget *mainWindow;
GtkWidget *messageDialog;
GError *gerror = NULL;
char *error_message = NULL;
- if (0 == ACCESS(conffile, W_OK))
+ if (0 == ACCESS (conffile, W_OK))
{
if (run_wizard)
{
char *argv[]
- = {"gnunet-setup", "-d", "wizard-gtk", "-c", conffile, NULL};
+ = { "gnunet-setup", "-d", "wizard-gtk", "-c", conffile, NULL };
g_spawn_async (NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH|G_SPAWN_CHILD_INHERITS_STDIN,
- NULL, NULL, NULL, &gerror);
- }
+ G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN,
+ NULL, NULL, NULL, &gerror);
+ }
else
- {
+ {
char *argv[]
- = {"gnunet-setup", "-d", "gconfig", "-c", conffile, NULL};
+ = { "gnunet-setup", "-d", "gconfig", "-c", conffile, NULL };
g_spawn_async (NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH|G_SPAWN_CHILD_INHERITS_STDIN,
- NULL, NULL, NULL, &gerror);
- }
+ G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN,
+ NULL, NULL, NULL, &gerror);
+ }
if (gerror)
- {
- error_message = GNUNET_strdup(gerror->message);
+ {
+ error_message = GNUNET_strdup (gerror->message);
g_error_free (gerror);
}
}
else
#ifndef WITH_LIBGKSU2
- {
- error_message = GNUNET_strdup(_("You don't have rights to write to the
provided configuration file."));
- }
+ {
+ error_message =
+ GNUNET_strdup (_
+ ("You don't have rights to write to the provided
configuration file."));
+ }
#else
- {
- char *commandline;
+ {
+ char *commandline;
- if (run_wizard)
- {
- commandline = g_strconcat ("gnunet-setup -d wizard-gtk -c ", conffile,
NULL);
- gksu_run (commandline, &gerror);
- }
- else
- {
- commandline = g_strconcat ("gnunet-setup -d gconfig -c ", conffile,
NULL);
- gksu_run (commandline, &gerror);
- }
- GNUNET_free (commandline);
- if (gerror)
- {
- error_message = GNUNET_strdup(gerror->message);
- g_error_free (gerror);
- }
- }
+ if (run_wizard)
+ {
+ commandline =
+ g_strconcat ("gnunet-setup -d wizard-gtk -c ", conffile, NULL);
+ gksu_run (commandline, &gerror);
+ }
+ else
+ {
+ commandline =
+ g_strconcat ("gnunet-setup -d gconfig -c ", conffile, NULL);
+ gksu_run (commandline, &gerror);
+ }
+ GNUNET_free (commandline);
+ if (gerror)
+ {
+ error_message = GNUNET_strdup (gerror->message);
+ g_error_free (gerror);
+ }
+ }
#endif
- if(error_message) {
- mainWindow = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"mainWindow");
- messageDialog = gtk_message_dialog_new (GTK_WINDOW (mainWindow),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- _("Failed to run the configuration
tool (gnunet-setup): %s"),
- error_message);
- gtk_dialog_run (GTK_DIALOG (messageDialog));
- gtk_widget_destroy (messageDialog);
- GNUNET_free (error_message);
- return FALSE;
- }
+ if (error_message)
+ {
+ mainWindow =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+ messageDialog =
+ gtk_message_dialog_new (GTK_WINDOW (mainWindow),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
+ _
+ ("Failed to run the configuration tool
(gnunet-setup): %s"),
+ error_message);
+ gtk_dialog_run (GTK_DIALOG (messageDialog));
+ gtk_widget_destroy (messageDialog);
+ GNUNET_free (error_message);
+ return FALSE;
+ }
return TRUE;
}
Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/core/eggtrayicon.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -602,19 +602,18 @@
tray_clicked (GtkWidget * widget, GdkEvent * event)
{
#if GTK_CHECK_VERSION(2,10,0)
- GtkWidget *root;
- root =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "mainWindow");
- GdkWindowState main_window_state;
- if (gtk_window_is_active (GTK_WINDOW (root)))
- gtk_widget_hide (root);
- else
- gtk_window_present (GTK_WINDOW (root));
- main_window_state = GNUNET_GTK_get_main_window_state ();
- if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
- gtk_window_maximize (GTK_WINDOW (root));
- return TRUE;
+ GtkWidget *root;
+ root =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+ GdkWindowState main_window_state;
+ if (gtk_window_is_active (GTK_WINDOW (root)))
+ gtk_widget_hide (root);
+ else
+ gtk_window_present (GTK_WINDOW (root));
+ main_window_state = GNUNET_GTK_get_main_window_state ();
+ if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+ gtk_window_maximize (GTK_WINDOW (root));
+ return TRUE;
#elif !defined (WINDOWS)
if (event->type == GDK_BUTTON_PRESS)
{
@@ -653,10 +652,10 @@
#if GTK_CHECK_VERSION(2,10,0)
/* Function activated when the user tries to popup the menu */
static gboolean
-on_tray_popup_menu (GtkStatusIcon *status_icon, guint button,
+on_tray_popup_menu (GtkStatusIcon * status_icon, guint button,
guint activate_time, gpointer trayContextMenu)
{
- gtk_menu_popup (GTK_MENU(trayContextMenu), NULL, NULL, NULL, NULL,
+ gtk_menu_popup (GTK_MENU (trayContextMenu), NULL, NULL, NULL, NULL,
button, activate_time);
return TRUE;
}
@@ -673,7 +672,7 @@
GtkWidget *trayContextMenu;
GladeXML *trayContextMenuXML;
GtkWidget *tray_quit;
-
+
trayContextMenuXML =
glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
PACKAGE_NAME);
@@ -681,14 +680,16 @@
"trayContextMenu");
trayIcon = GNUNET_GTK_get_trayIcon ();
instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
- iconPath = g_strconcat (instDir, "/../gnunet-gtk/gnunet-gtk-tray.png", NULL);
+ iconPath =
+ g_strconcat (instDir, "/../gnunet-gtk/gnunet-gtk-tray.png", NULL);
GNUNET_free (instDir);
gtk_status_icon_set_from_file (trayIcon, iconPath);
g_free (iconPath);
gtk_status_icon_set_tooltip (trayIcon, _("GNU's peer-to-peer network"));
tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
g_signal_connect_swapped (G_OBJECT (tray_quit), "activate",
- G_CALLBACK (on_tray_quit_activate),
trayContextMenu);
+ G_CALLBACK (on_tray_quit_activate),
+ trayContextMenu);
g_signal_connect_swapped (G_OBJECT (trayIcon), "activate",
G_CALLBACK (tray_clicked), trayContextMenu);
g_signal_connect (G_OBJECT (trayIcon), "popup-menu",
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/core/main.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -138,9 +138,9 @@
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
gtk_window_maximize (GTK_WINDOW (root));
gtk_widget_show (root);
- gtk_window_present(GTK_WINDOW(root));
-
+ gtk_window_present (GTK_WINDOW (root));
+
/* start the event loop */
gdk_threads_enter ();
Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h 2008-02-23 03:35:38 UTC (rev
6415)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2008-02-23 04:26:44 UTC (rev
6416)
@@ -66,8 +66,7 @@
* Get the GtkStatusIcon for the tray icon (if GTK >= 2.10)
*/
#if GTK_CHECK_VERSION(2,10,0)
-GtkStatusIcon *
-GNUNET_GTK_get_trayIcon (void);
+GtkStatusIcon *GNUNET_GTK_get_trayIcon (void);
#endif
/**
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2008-02-23 03:35:38 UTC (rev
6415)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2008-02-23 04:26:44 UTC (rev
6416)
@@ -37,9 +37,7 @@
/* Not used because libgksu2 headers have broken depends in Debian
And this is not really needed
#include <libgksu/libgksu.h> */
-gboolean
-gksu_run (gchar *command_line,
- GError **error);
+gboolean gksu_run (gchar * command_line, GError ** error);
#endif
static struct GNUNET_CronManager *cron;
@@ -172,12 +170,12 @@
if (ret == 0)
{
canStart = 0;
- fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
- if (NULL == fn)
- GNUNET_GC_get_configuration_value_filename (cfg, "DAEMON",
-
"CONFIGFILE",
-
GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
-
&fn);
+ fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+ if (NULL == fn)
+ GNUNET_GC_get_configuration_value_filename (cfg, "DAEMON",
+ "CONFIGFILE",
+
GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
+ &fn);
if (isLocal && fn)
{
if (GNUNET_disk_file_test (ectx, fn) == GNUNET_YES)
@@ -195,7 +193,7 @@
#if defined(WINDOWS) || defined(WITH_LIBGKSU2)
canStart = 1;
#else
- struct passwd *pws;
+ struct passwd *pws;
if (NULL == (pws = getpwnam (user)))
{
canStart = 0;
@@ -246,9 +244,9 @@
int ret;
if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
- ret = 1;
+ ret = 1;
else
- ret = 0;
+ ret = 0;
GNUNET_GTK_save_call (&doUpdateMenus, &ret);
}
@@ -287,42 +285,41 @@
if (0 != GNUNET_GC_parse_configuration (dcfg, fn))
user = NULL;
GNUNET_GC_get_configuration_value_string (dcfg,
- "GNUNETD",
- "USER", "", &user);
+ "GNUNETD", "USER", "", &user);
#ifdef WITH_LIBGKSU2
- char *command;
- GError *gerror = NULL;
- struct passwd *pws;
- if (strlen (user) > 0)
- {
+ char *command;
+ GError *gerror = NULL;
+ struct passwd *pws;
+ if (strlen (user) > 0)
+ {
pws = getpwnam (user);
if (pws->pw_uid != getuid ())
- {
+ {
command = g_strconcat ("gnunetd -c ", fn, NULL);
- code = gksu_run (command, &gerror);
- GNUNET_free (command);
- if (gerror)
+ code = gksu_run (command, &gerror);
+ GNUNET_free (command);
+ if (gerror)
{
- GNUNET_GTK_add_log_entry (_("Launching
gnunetd failed\n"));
+ GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
- g_error_free (gerror);
+ g_error_free (gerror);
}
else
{
GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
}
- g_free (fn);
- cronCheckDaemon (NULL);
- return;
- }
- else
- code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
- }
+ g_free (fn);
+ cronCheckDaemon (NULL);
+ return;
+ }
+ else
+ code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
+ }
#else
- code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
+ code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
#endif
-
- if (GNUNET_SYSERR != code)
+
+ if (GNUNET_SYSERR != code)
{
GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
}
@@ -331,8 +328,8 @@
GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
}
if (fn != NULL)
- g_free (fn);
- cronCheckDaemon (NULL);
+ g_free (fn);
+ cronCheckDaemon (NULL);
}
}
@@ -432,17 +429,17 @@
("Configuration file for GNUnet daemon `%s'
does not exist! Run `gnunet-setup -d'.\n"),
daemon_config);
}
-
+
#ifndef WITH_LIBGKSU2
GtkWidget *startDaemonConfWizard;
GtkWidget *startDaemonConfTool;
startDaemonConfWizard
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "startDaemonConfWizard");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "startDaemonConfWizard");
startDaemonConfTool
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "startDaemonConfTool");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "startDaemonConfTool");
if (0 != ACCESS (daemon_config, W_OK))
{
gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
@@ -471,7 +468,9 @@
"applicationList");
gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
- w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"applicationList");
+ w =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "applicationList");
gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
}
@@ -480,15 +479,16 @@
* Launch 'gnunet-setup -d wizard-gtk' with needed rights
*/
void
-on_startDaemonConfWizard_clicked_daemon (GtkWidget *widget, gpointer data)
+on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
{
GtkWidget *filechooserbutton;
char *conffile;
filechooserbutton
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "gnunetdconfigFileChooserButton");
- conffile = gtk_file_chooser_get_filename
(GTK_FILE_CHOOSER(filechooserbutton));
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "gnunetdconfigFileChooserButton");
+ conffile =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
GNUNET_GTK_run_gnunet_setup (conffile, TRUE);
GNUNET_free (conffile);
}
@@ -497,15 +497,16 @@
* Launch 'gnunet-setup -d gconfig' with needed rights
*/
void
-on_startDaemonConfTool_clicked_daemon (GtkWidget *widget, gpointer data)
+on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
{
GtkWidget *filechooserbutton;
char *conffile;
filechooserbutton
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "gnunetdconfigFileChooserButton");
- conffile = gtk_file_chooser_get_filename
(GTK_FILE_CHOOSER(filechooserbutton));
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "gnunetdconfigFileChooserButton");
+ conffile =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
GNUNET_GTK_run_gnunet_setup (conffile, FALSE);
GNUNET_free (conffile);
}
@@ -514,8 +515,7 @@
* Update sensitivity of daemon buttons
*/
void
-on_gnunetdconfigfile_set_daemon (GtkWidget *filechooserbutton,
- gpointer data)
+on_gnunetdconfigfile_set_daemon (GtkWidget * filechooserbutton, gpointer data)
{
#ifndef WITH_LIBGKSU2
GtkWidget *startDaemonConfWizard;
@@ -524,18 +524,19 @@
int ret;
startDaemonConfWizard
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "startDaemonConfWizard");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "startDaemonConfWizard");
startDaemonConfTool
- = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
- "startDaemonConfTool");
- conffile = gtk_file_chooser_get_filename
(GTK_FILE_CHOOSER(filechooserbutton));
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "startDaemonConfTool");
+ conffile =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
if (0 == ACCESS (conffile, W_OK))
{
gtk_widget_set_sensitive (startDaemonConfWizard, TRUE);
gtk_widget_set_sensitive (startDaemonConfTool, TRUE);
}
- else
+ else
{
gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
gtk_widget_set_sensitive (startDaemonConfTool, FALSE);
Modified: gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
===================================================================
--- gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-02-23 03:35:38 UTC
(rev 6415)
+++ gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2008-02-23 04:26:44 UTC
(rev 6416)
@@ -518,13 +518,13 @@
while (dirkeywords[n])
{
GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
- dirkeywords[n]);
+ dirkeywords[n]);
n++;
}
/* Add a standard keyword to allow finding all available music albums
* on AFS in one search */
GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
- "music album");
+ "music album");
/* Manage files metadatas */
@@ -572,28 +572,28 @@
if (tempmetas[1])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- tempmetas[1]);
+ tempmetas[1]);
if ((useforallflags & 0x1) && dirmetas[0])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- dirmetas[0]);
+ dirmetas[0]);
else if (!(useforallflags & 0x1) && tempmetas[2])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
- tempmetas[2]);
+ tempmetas[2]);
if ((useforallflags & 0x2) && dirmetas[1])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
- dirmetas[1]);
+ dirmetas[1]);
else if (!(useforallflags & 0x2) && tempmetas[3])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
- tempmetas[3]);
+ tempmetas[3]);
if (tempmetas[4])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
- tempmetas[4]);
+ tempmetas[4]);
if (tempmetas[5])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
- tempmetas[5]);
+ tempmetas[5]);
if (tempmetas[6])
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
- tempmetas[6]);
+ tempmetas[6]);
if (!(useforallflags & 0x1))
{
@@ -601,7 +601,7 @@
while (dirkeywords[n])
{
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
- dirkeywords[n]);
+ dirkeywords[n]);
n++;
}
}
@@ -612,15 +612,15 @@
while (tempkeywords[n])
{
GNUNET_ECRS_meta_data_insert (tempmetadata,
- EXTRACTOR_KEYWORDS,
- tempkeywords[n]);
+ EXTRACTOR_KEYWORDS,
+ tempkeywords[n]);
n++;
}
g_strfreev (tempkeywords);
/* Add a standard keyword to allow finding all available music files
* on AFS in one search */
GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
- "music");
+ "music");
}
GNUNET_free (tempmetas);
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -144,6 +144,12 @@
case GNUNET_FSUI_search_aborted:
fs_search_aborted (event->data.SearchAborted.sc.cctx);
break;
+ case GNUNET_FSUI_search_paused:
+ fs_search_paused (event->data.SearchPaused.sc.cctx);
+ break;
+ case GNUNET_FSUI_search_restarted:
+ fs_search_restarted (event->data.SearchRestarted.sc.cctx);
+ break;
case GNUNET_FSUI_search_completed:
fs_search_aborted (event->data.SearchCompleted.sc.cctx);
break;
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/fs.h 2008-02-23 04:26:44 UTC (rev 6416)
@@ -230,20 +230,10 @@
unsigned int last_y;
/**
- * Did the user just ask to pause the search?
- */
- int is_paused;
-
- /**
* Desired anonymity level.
*/
unsigned int anonymityLevel;
- /**
- * Maximum number of results.
- */
- unsigned int max_results;
-
} SearchList;
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/meta.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -359,7 +359,7 @@
length);
free (thumb);
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
- binary);
+ binary);
GNUNET_free (binary);
}
}
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -164,7 +164,7 @@
GtkTreeStore *model;
GtkTreeIter iter;
enum GNUNET_URITRACK_STATE state;
- struct GNUNET_ECRS_URI * have;
+ struct GNUNET_ECRS_URI *have;
state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
if ((state & (GNUNET_URITRACK_INSERTED |
@@ -175,20 +175,19 @@
GNUNET_YES)))
return;
model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
- /* Check that the entry does not already exist (for resume!) */
+ /* Check that the entry does not already exist (for resume!) */
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
{
do
- {
- have = NULL;
- gtk_tree_model_get (GTK_TREE_MODEL(model),
- &iter, SEARCH_URI, &have, -1);
- if ( (have != NULL) &&
- (GNUNET_ECRS_uri_test_equal(have, uri)) )
- return; /* duplicate */
- }
- while (gtk_tree_model_iter_next (GTK_TREE_MODEL(model), &iter));
- }
+ {
+ have = NULL;
+ gtk_tree_model_get (GTK_TREE_MODEL (model),
+ &iter, SEARCH_URI, &have, -1);
+ if ((have != NULL) && (GNUNET_ECRS_uri_test_equal (have, uri)))
+ return; /* duplicate */
+ }
+ while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
+ }
gtk_tree_store_append (model, &iter, NULL);
addEntryToSearchTree (searchContext, NULL, info, &iter);
searchContext->resultsReceived++;
@@ -310,7 +309,7 @@
meta = GNUNET_ECRS_meta_data_create ();
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
- _("Saved search results"));
+ _("Saved search results"));
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
&directory, &dir_len,
@@ -405,18 +404,17 @@
list = search_head;
while (list != NULL)
{
- if ( (list->fsui_list == NULL) &&
- (list->uri != NULL) &&
- (GNUNET_ECRS_uri_test_equal(list->uri,
- uri)) )
- {
- list->fsui_list = fsui_list;
- for (i = 0; i < resultCount; i++)
- fs_search_result_received (list, &results[i], uri);
- if (resultCount == 0) /* otherwise already done! */
- updateSearchSummary (list);
- return list;
- }
+ if ((list->fsui_list == NULL) &&
+ (list->uri != NULL) &&
+ (GNUNET_ECRS_uri_test_equal (list->uri, uri)))
+ {
+ list->fsui_list = fsui_list;
+ for (i = 0; i < resultCount; i++)
+ fs_search_result_received (list, &results[i], uri);
+ if (resultCount == 0) /* otherwise already done! */
+ updateSearchSummary (list);
+ return list;
+ }
list = list->next;
}
@@ -643,14 +641,26 @@
void
fs_search_aborted (SearchList * list)
{
- 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"));
+ 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"));
}
+void
+fs_search_paused (SearchList * list)
+{
+ /* nothing to be done */
+}
+
+void
+fs_search_restarted (SearchList * list)
+{
+ /* nothing to be done */
+}
+
/**
* FSUI event: a search was stopped. Remove the
* respective tab and its entry in the summary.
@@ -666,14 +676,6 @@
int index;
int i;
- if (list->is_paused == GNUNET_YES)
- {
- /* if this was just a request to pause,
- then simply ignore the FS-stopped event */
- list->fsui_list = NULL;
- list->is_paused = GNUNET_NO;
- return;
- }
/* remove from linked list */
if (search_head == list)
{
@@ -760,8 +762,7 @@
search_start_helper (void *cls)
{
FSSS *fsss = cls;
- GNUNET_FSUI_search_start (ctx, fsss->anonymity,
- fsss->uri);
+ GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->uri);
return NULL;
}
@@ -896,7 +897,7 @@
list = list->next;
}
fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
- "searchAnonymitySelectionSpinButton");
+ "searchAnonymitySelectionSpinButton");
GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
GNUNET_ECRS_uri_destroy (fsss.uri);
}
@@ -942,7 +943,7 @@
if (list->fsui_list == NULL)
{
/* open directory or paused search;
- close directly */
+ close directly */
fs_search_stopped (list);
}
else
@@ -962,7 +963,7 @@
*/
void
on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
- GtkWidget * pauseButton)
+ GtkWidget * pauseButton)
{
SearchList *list;
struct FCBC fcbc;
@@ -975,13 +976,12 @@
list = list->next;
}
GNUNET_GE_ASSERT (ectx, list != NULL);
- gtk_widget_hide(pauseButton);
- gtk_widget_show(glade_xml_get_widget(list->searchXML,
- "searchResumeButton"));
+ gtk_widget_hide (pauseButton);
+ gtk_widget_show (glade_xml_get_widget (list->searchXML,
+ "searchResumeButton"));
if (list->fsui_list != NULL)
{
- list->is_paused = GNUNET_YES;
- fcbc.method = &GNUNET_FSUI_search_stop;
+ fcbc.method = &GNUNET_FSUI_search_pause;
fcbc.argument = list->fsui_list;
GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
@@ -992,10 +992,10 @@
*/
void
on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
- GtkWidget * resumeButton)
+ GtkWidget * resumeButton)
{
- FSSS fsss;
SearchList *list;
+ struct FCBC fcbc;
list = search_head;
while (list != NULL)
@@ -1005,13 +1005,15 @@
list = list->next;
}
GNUNET_GE_ASSERT (ectx, list != NULL);
- gtk_widget_hide(resumeButton);
- gtk_widget_show(glade_xml_get_widget(list->searchXML,
- "searchPauseButton"));
- fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
- "searchAnonymitySelectionSpinButton");
- fsss.uri = list->uri;
- GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
+ gtk_widget_hide (resumeButton);
+ gtk_widget_show (glade_xml_get_widget (list->searchXML,
+ "searchPauseButton"));
+ if (list->fsui_list != NULL)
+ {
+ fcbc.method = &GNUNET_FSUI_search_restart;
+ fcbc.argument = list->fsui_list;
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+ }
}
/**
@@ -1032,7 +1034,7 @@
list = list->next;
}
GNUNET_GE_ASSERT (ectx, list != NULL);
- gtk_widget_hide(abortButton);
+ gtk_widget_hide (abortButton);
if (list->fsui_list != NULL)
{
fcbc.method = &GNUNET_FSUI_search_abort;
Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/search.h 2008-02-23 04:26:44 UTC (rev 6416)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+ (C) 2005, 2006, 2008 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -71,6 +71,16 @@
void fs_search_aborted (SearchList * searchContext);
/**
+ * A search process has been aborted. Update display.
+ */
+void fs_search_paused (SearchList * searchContext);
+
+/**
+ * A search process has been aborted. Update display.
+ */
+void fs_search_restarted (SearchList * searchContext);
+
+/**
* A search process has stopped. Clean up.
*/
void fs_search_stopped (SearchList * searchContext);
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-02-23 03:35:38 UTC (rev 6415)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-02-23 04:26:44 UTC (rev 6416)
@@ -342,12 +342,12 @@
FSUC *fsuc = cls;
GNUNET_FSUI_upload_start (ctx,
- fsuc->filename,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, ectx, fsuc->anonymity,
- fsuc->priority, fsuc->index, fsuc->extract,
- fsuc->deep_index, fsuc->expire, fsuc->meta,
- fsuc->gkeywordURI, fsuc->keywordURI);
+ fsuc->filename,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, ectx, fsuc->anonymity,
+ fsuc->priority, fsuc->index, fsuc->extract,
+ fsuc->deep_index, fsuc->expire, fsuc->meta,
+ fsuc->gkeywordURI, fsuc->keywordURI);
return NULL;
}
Modified: gnunet-gtk/src/plugins/peers/peers.c
===================================================================
--- gnunet-gtk/src/plugins/peers/peers.c 2008-02-23 03:35:38 UTC (rev
6415)
+++ gnunet-gtk/src/plugins/peers/peers.c 2008-02-23 04:26:44 UTC (rev
6416)
@@ -219,7 +219,7 @@
GDK_TYPE_PIXBUF, /* flag */
G_TYPE_STRING, /* country name */
G_TYPE_UINT64); /* last time seen */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(model),
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
7, GTK_SORT_DESCENDING);
sock = GNUNET_client_connection_create (ectx, cfg);
if (sock != NULL)
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2008-02-23 03:35:38 UTC (rev
6415)
+++ gnunet-gtk/src/plugins/stats/functions.c 2008-02-23 04:26:44 UTC (rev
6416)
@@ -121,7 +121,7 @@
getConnectedNodesStat (const void *closure, gfloat ** data)
{
unsigned long long val;
-
+
if (connectionGoal == 0)
return GNUNET_SYSERR;
if (GNUNET_OK !=
@@ -483,124 +483,132 @@
static GdkPixbuf *iconDisconnected;
static GdkPixbuf *iconConnected;
#endif
-
+
if (once)
- {
- statusConnexionsLabel = glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (),
- "statusConnexionsLabel");
- statusConnexionsPic = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML
(),
- "statusConnexionsPic");
+ {
+ statusConnexionsLabel =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "statusConnexionsLabel");
+ statusConnexionsPic =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "statusConnexionsPic");
#if GTK_CHECK_VERSION (2,10,0)
- char *iconFile;
- char *finalPath;
- char *instDir;
- char *dataDir;
-
- instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
- dataDir = g_strconcat (instDir, "/../gnunet-gtk/", NULL);
+ char *iconFile;
+ char *finalPath;
+ char *instDir;
+ char *dataDir;
+
+ instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+ dataDir = g_strconcat (instDir, "/../gnunet-gtk/", NULL);
#if MINGW
- finalPath = GNUNET_malloc (_MAX_PATH + 1);
- plibc_conv_to_win_path (dataDir, finalPath);
+ finalPath = GNUNET_malloc (_MAX_PATH + 1);
+ plibc_conv_to_win_path (dataDir, finalPath);
#else
- finalPath = GNUNET_strdup (dataDir);
+ finalPath = GNUNET_strdup (dataDir);
#endif
- GNUNET_free (instDir);
- g_free (dataDir);
- iconFile = g_strconcat (finalPath, "tray-nodaemon.png", NULL);
- iconNoDaemon = gdk_pixbuf_new_from_file (iconFile, NULL);
- g_free (iconFile);
- iconFile = g_strconcat (finalPath, "tray-disconnected.png", NULL);
- iconDisconnected = gdk_pixbuf_new_from_file (iconFile, NULL);
- g_free (iconFile);
- iconFile = g_strconcat (finalPath, "tray-connected.png", NULL);
- iconConnected = gdk_pixbuf_new_from_file (iconFile, NULL);
- g_free (iconFile);
- GNUNET_free (finalPath);
+ GNUNET_free (instDir);
+ g_free (dataDir);
+ iconFile = g_strconcat (finalPath, "tray-nodaemon.png", NULL);
+ iconNoDaemon = gdk_pixbuf_new_from_file (iconFile, NULL);
+ g_free (iconFile);
+ iconFile = g_strconcat (finalPath, "tray-disconnected.png", NULL);
+ iconDisconnected = gdk_pixbuf_new_from_file (iconFile, NULL);
+ g_free (iconFile);
+ iconFile = g_strconcat (finalPath, "tray-connected.png", NULL);
+ iconConnected = gdk_pixbuf_new_from_file (iconFile, NULL);
+ g_free (iconFile);
+ GNUNET_free (finalPath);
#endif
- once = FALSE;
- }
+ once = FALSE;
+ }
if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
- {
- if (GNUNET_OK != getStatValue (&connected_peers, (GNUNET_CronTime *)
delta,
- NULL, "# of connected peers", GNUNET_NO))
- {
- if (last_status != -1)
+ {
+ if (GNUNET_OK !=
+ getStatValue (&connected_peers, (GNUNET_CronTime *) delta, NULL,
+ "# of connected peers", GNUNET_NO))
{
- GNUNET_GTK_add_log_entry (_("WARNING: Failed to obtain connection
statistics from gnunetd.\n"));
- gtk_label_set_text (GTK_LABEL(statusConnexionsLabel),
- _("Unknown status"));
- gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
- GTK_STOCK_DIALOG_ERROR, 1);
+ if (last_status != -1)
+ {
+ GNUNET_GTK_add_log_entry (_
+ ("WARNING: Failed to obtain connection
statistics from gnunetd.\n"));
+ gtk_label_set_text (GTK_LABEL (statusConnexionsLabel),
+ _("Unknown status"));
+ gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
+ GTK_STOCK_DIALOG_ERROR, 1);
#if GTK_CHECK_VERSION (2,10,0)
- gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
- _("Unknown status"));
- gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
- iconNoDaemon);
+ gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+ _("Unknown status"));
+ gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
+ iconNoDaemon);
#endif
- last_status = -1;
+ last_status = -1;
+ }
}
- }
else if (connected_peers > 0)
- {
- if (last_status != connected_peers)
- {
- if (connected_peers == 1)
- {
- gtk_label_set_text (GTK_LABEL(statusConnexionsLabel),
- _("Connected to 1 peer"));
+ {
+ if (last_status != connected_peers)
+ {
+ if (connected_peers == 1)
+ {
+ gtk_label_set_text (GTK_LABEL (statusConnexionsLabel),
+ _("Connected to 1 peer"));
#if GTK_CHECK_VERSION (2,10,0)
- gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
- _("GNUnet - Connected to 1 peer"));
+ gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+ _
+ ("GNUnet - Connected to 1
peer"));
#endif
- }
- else
- {
- label = g_strdup_printf (_("Connected to %Lu peers"),
- connected_peers);
- gtk_label_set_text (GTK_LABEL(statusConnexionsLabel), label);
- g_free (label);
+ }
+ else
+ {
+ label = g_strdup_printf (_("Connected to %Lu peers"),
+ connected_peers);
+ gtk_label_set_text (GTK_LABEL (statusConnexionsLabel),
+ label);
+ g_free (label);
#if GTK_CHECK_VERSION (2,10,0)
- label = g_strdup_printf (_("GNUnet - Connected to %Lu peers"),
+ label =
+ g_strdup_printf (_("GNUnet - Connected to %Lu peers"),
connected_peers);
- gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (), label);
- g_free (label);
+ gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+ label);
+ g_free (label);
#endif
- }
+ }
#if GTK_CHECK_VERSION (2,10,0)
- gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
- iconConnected);
+ gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
+ iconConnected);
#endif
- gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
- GTK_STOCK_NETWORK, 1);
- last_status = connected_peers;
- }
- }
+ gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
+ GTK_STOCK_NETWORK, 1);
+ last_status = connected_peers;
+ }
+ }
else if (last_status != 0)
- {
- gtk_label_set_markup (GTK_LABEL(statusConnexionsLabel),
- _("<b>Disconnected</b>"));
- gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+ {
+ gtk_label_set_markup (GTK_LABEL (statusConnexionsLabel),
+ _("<b>Disconnected</b>"));
+ gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
GTK_STOCK_DISCONNECT, 1);
#if GTK_CHECK_VERSION (2,10,0)
gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
- _("GNUnet - Disconnected"));
- gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+ _("GNUnet - Disconnected"));
+ gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
iconDisconnected);
#endif
last_status = 0;
- }
+ }
}
else if (last_status != -2)
{
- gtk_label_set_markup (GTK_LABEL(statusConnexionsLabel),
- _("<b>Daemon not running</b>"));
- gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+ gtk_label_set_markup (GTK_LABEL (statusConnexionsLabel),
+ _("<b>Daemon not running</b>"));
+ gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
GTK_STOCK_NO, 1);
#if GTK_CHECK_VERSION (2,10,0)
gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
_("GNUnet - Daemon not running"));
- gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+ gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon (),
iconNoDaemon);
#endif
last_status = -2;
Modified: gnunet-gtk/src/plugins/stats/statistics.c
===================================================================
--- gnunet-gtk/src/plugins/stats/statistics.c 2008-02-23 03:35:38 UTC (rev
6415)
+++ gnunet-gtk/src/plugins/stats/statistics.c 2008-02-23 04:26:44 UTC (rev
6416)
@@ -444,8 +444,9 @@
statusConnexionsLabel =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statusConnexionsLabel");
- gtk_label_set_width_chars (GTK_LABEL(statusConnexionsLabel),
- g_utf8_strlen (_("Connected to %Lu peers"), 40) -
1);
+ gtk_label_set_width_chars (GTK_LABEL (statusConnexionsLabel),
+ g_utf8_strlen (_("Connected to %Lu peers"),
+ 40) - 1);
statusConnexionsBox =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statusConnexionsBox");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6416 - in gnunet-gtk: . src/common src/core src/include src/plugins/daemon src/plugins/fs src/plugins/fs/extensions src/plugins/peers src/plugins/stats,
gnunet <=