[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix conversation FTBFS
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix conversation FTBFS and other minor stuff |
|
Date: |
Sat, 31 Mar 2018 21:38:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 60d7d182 fix conversation FTBFS and other minor stuff
60d7d182 is described below
commit 60d7d182cd7545dda4492cdc03dc5f048bdc98b4
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Mar 31 21:38:51 2018 +0200
fix conversation FTBFS and other minor stuff
---
.../gnunet_conversation_gtk_about_window.glade.in | 2 +-
contrib/gnunet_conversation_gtk_main_window.glade | 286 +++++++++++----------
contrib/gnunet_fs_gtk_about_window.glade.in | 2 +-
contrib/gnunet_identity_gtk_about_window.glade.in | 2 +-
contrib/gnunet_namestore_gtk_about_window.glade.in | 2 +-
contrib/gnunet_setup_about_window.glade.in | 2 +-
.../gnunet_statistics_gtk_about_window.glade.in | 2 +-
src/conversation/gnunet-conversation-gtk.c | 6 +-
.../gnunet-conversation-gtk_contacts.c | 20 +-
src/conversation/gnunet-conversation-gtk_egos.c | 21 +-
.../gnunet-conversation-gtk_get_label.c | 3 +-
src/conversation/gnunet-conversation-gtk_import.c | 3 +-
src/conversation/gnunet-conversation-gtk_log.c | 2 +
src/conversation/gnunet-conversation-gtk_phone.c | 15 +-
.../gnunet-conversation-gtk_visibility.c | 17 +-
src/conversation/gnunet-conversation-gtk_zones.c | 34 ++-
src/conversation/gnunet-conversation-gtk_zones.h | 5 +-
src/lib/eventloop.c | 7 +-
src/main/gnunet-gtk.c | 3 +-
src/namestore/gnunet-namestore-gtk.c | 5 +
src/peerinfo/gnunet-peerinfo-gtk.c | 39 ++-
21 files changed, 256 insertions(+), 222 deletions(-)
diff --git a/contrib/gnunet_conversation_gtk_about_window.glade.in
b/contrib/gnunet_conversation_gtk_about_window.glade.in
index e7cd503a..a5720e51 100644
--- a/contrib/gnunet_conversation_gtk_about_window.glade.in
+++ b/contrib/gnunet_conversation_gtk_about_window.glade.in
@@ -79,7 +79,7 @@ Daniel Nylander <address@hidden></property>
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade
b/contrib/gnunet_conversation_gtk_main_window.glade
index a923aa65..2dde76a2 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkListStore"
id="gnunet_conversation_gtk_active_calls_liststore">
@@ -87,7 +87,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem"
id="gnunet_conversation_gtk_file_menuitem">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_File</property>
@@ -99,7 +98,6 @@
<child>
<object class="GtkImageMenuItem"
id="gnunet_conversation_conversation_quit_imagemenuitem">
<property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -113,7 +111,6 @@
</child>
<child>
<object class="GtkMenuItem"
id="gnunet_conversation_gtk_view_menu">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
@@ -134,7 +131,6 @@
</child>
<child>
<object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_caller_id_checkmenuitem">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Caller
Identity</property>
@@ -143,18 +139,7 @@
</object>
</child>
<child>
- <object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_zone_selection_checkmenuitem">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Zone
Selection</property>
- <property name="use_underline">True</property>
- <signal name="toggled"
handler="gnunet_conversation_gtk_view_zone_selection_checkmenuitem_toggled_cb"
swapped="no"/>
- </object>
- </child>
- <child>
<object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_history_checkmenuitem">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">_History</property>
@@ -164,7 +149,6 @@
</child>
<child>
<object class="GtkCheckMenuItem"
id="gnunet_conversation_gtk_view_log_checkmenuitem">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">_Logs</property>
@@ -178,7 +162,6 @@
</child>
<child>
<object class="GtkMenuItem"
id="gnunet_conversation_gtk_help_menuitem">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
@@ -190,7 +173,6 @@
<child>
<object class="GtkImageMenuItem"
id="gnunet_conversation_gtk_about_imagemenuitem">
<property name="label">gtk-about</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
@@ -314,7 +296,6 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_ego_copy_button">
<property name="label">gtk-copy</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -338,6 +319,7 @@
<object class="GtkLabel"
id="gnunet_conversation_gtk_ego_frame_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
<property name="label"
translatable="yes"><b>Caller Identity</b></property>
<property name="use_markup">True</property>
</object>
@@ -345,7 +327,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -475,13 +457,11 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_add_contact_button">
<property name="label"
translatable="yes">> contact</property>
- <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
<property name="tooltip_text"
translatable="yes">Copy the phone address of the selected caller to our address
book.</property>
- <property
name="xalign">0.4699999988079071</property>
<signal name="clicked"
handler="gnunet_conversation_gtk_add_contact_button_clicked_cb" swapped="no"/>
</object>
<packing>
@@ -494,7 +474,6 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_accept_button">
<property name="label"
translatable="yes">accept</property>
- <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
@@ -512,7 +491,6 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_refuse_button">
<property name="label"
translatable="yes">refuse</property>
- <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
@@ -530,7 +508,6 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_resume_button">
<property name="label"
translatable="yes">resume</property>
- <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
@@ -569,7 +546,8 @@
<object class="GtkLabel"
id="gnunet_conversation_gtk_call_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Call Information</b></property>
+ <property name="margin_left">5</property>
+ <property name="label"
translatable="yes"><b>Active conversations</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -593,17 +571,139 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_initiate_calls_toplevel_vbox">
+ <object class="GtkBox"
id="gnunet_conversation_gtk_call_action_button_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="gnunet_conversation_call_address_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Target:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="gnunet_conversation_gtk_address_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Enter the GNU Name System name of the person you want to
call here to initiate a call. During a call, the name of the caller is shown
here.</property>
+ <property
name="invisible_char">•</property>
+ <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_call_button">
+ <property
name="label">gtk-connect</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Initiate a conversation.</property>
+ <property
name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_call_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_suspend_button">
+ <property
name="label">gtk-media-pause</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Suspend the call, putting the other person on
hold.</property>
+ <property name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_suspend_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="gnunet_conversation_gtk_hangup_button">
+ <property
name="label">gtk-disconnect</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Terminate a conversation.</property>
+ <property name="use_stock">True</property>
+ <property
name="image_position">top</property>
+ <signal name="clicked"
handler="gnunet_conversation_gtk_hangup_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="gnunet_conversation_initiate_calls_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="label"
translatable="yes"><b>Initiate conversation</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="gnunet_conversation_gtk_addressbook_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox"
id="gnunet_conversation_gtk_addressbook_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
<child>
<object class="GtkBox"
id="gnunet_conversation_gtk_zone_hbox">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="gnunet_conversation_gtk_contacts_zone_chooser_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Pick which zone to use for the address book below.</property>
<property name="label"
translatable="yes">Zone:</property>
</object>
<packing>
@@ -644,105 +744,6 @@
</packing>
</child>
<child>
- <object class="GtkBox"
id="gnunet_conversation_gtk_call_action_button_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="gnunet_conversation_call_address_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Target:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="gnunet_conversation_gtk_address_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">Enter the GNU Name System name of the person you want to
call here to initiate a call. During a call, the name of the caller is shown
here.</property>
- <property
name="invisible_char">•</property>
- <signal name="changed"
handler="gnunet_conversation_gtk_address_entry_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_call_button">
- <property
name="label">gtk-connect</property>
- <property
name="use_action_appearance">False</property>
- <property
name="visible">True</property>
- <property
name="sensitive">False</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes">Initiate a conversation.</property>
- <property
name="use_underline">True</property>
- <property
name="use_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_call_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_suspend_button">
- <property
name="label">gtk-media-pause</property>
- <property
name="use_action_appearance">False</property>
- <property
name="sensitive">False</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes">Suspend the call, putting the other person on
hold.</property>
- <property
name="use_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_suspend_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="gnunet_conversation_gtk_hangup_button">
- <property
name="label">gtk-disconnect</property>
- <property
name="use_action_appearance">False</property>
- <property
name="sensitive">False</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes">Terminate a conversation.</property>
- <property
name="use_stock">True</property>
- <property
name="image_position">top</property>
- <signal name="clicked"
handler="gnunet_conversation_gtk_hangup_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox"
id="gnunet_conversation_gtk_address_book_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -761,13 +762,14 @@
<property
name="search_column">0</property>
<signal name="row-activated"
handler="gnunet_conversation_gtk_contact_list_treeview_row_activated_cb"
swapped="no"/>
<child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection"/>
+ <object
class="GtkTreeSelection"/>
</child>
<child>
<object
class="GtkTreeViewColumn" id="gnunet_conversation_gtk_contact_list_type_column">
<property
name="sizing">fixed</property>
<property
name="fixed_width">60</property>
<property name="title"
translatable="yes">Type</property>
+ <property
name="clickable">True</property>
<property
name="reorderable">True</property>
<property
name="sort_indicator">True</property>
<property
name="sort_column_id">1</property>
@@ -781,7 +783,6 @@
</child>
<child>
<object
class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_label_column">
- <property
name="resizable">True</property>
<property
name="sizing">autosize</property>
<property name="title"
translatable="yes">Name</property>
<property
name="expand">True</property>
@@ -799,9 +800,9 @@
</child>
<child>
<object
class="GtkTreeViewColumn"
id="gnunet_conversation_gtk_contact_list_value_treeviewcolumn">
- <property
name="resizable">True</property>
<property
name="sizing">autosize</property>
<property name="title"
translatable="yes">Value</property>
+ <property
name="clickable">True</property>
<property
name="reorderable">True</property>
<property
name="sort_indicator">True</property>
<property
name="sort_column_id">2</property>
@@ -818,6 +819,7 @@
<property
name="sizing">fixed</property>
<property
name="fixed_width">60</property>
<property name="title"
translatable="yes">Public?</property>
+ <property
name="clickable">True</property>
<property
name="reorderable">True</property>
<property
name="sort_indicator">True</property>
<property
name="sort_column_id">3</property>
@@ -843,7 +845,6 @@
<child>
<object class="GtkButton"
id="gnunet_conversation_gtk_contacts_paste_button">
<property
name="label">gtk-paste</property>
- <property
name="use_action_appearance">False</property>
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
@@ -863,7 +864,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -871,19 +872,21 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel"
id="gnunet_conversation_initiate_calls_label">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Initiate Calls</b></property>
- <property name="use_markup">True</property>
+ <property name="margin_left">5</property>
+ <property name="label"
translatable="yes">Addressbook</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -973,6 +976,7 @@
<object class="GtkLabel"
id="gnunet_conversation_gtk_history_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
<property name="label"
translatable="yes"><b>History</b></property>
<property name="use_markup">True</property>
</object>
@@ -982,7 +986,7 @@
<property name="expand">True</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -1018,6 +1022,7 @@
<object class="GtkLabel"
id="gnunet_conversation_gtk_log_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">5</property>
<property name="label"
translatable="yes"><b>Logs</b></property>
<property name="use_markup">True</property>
</object>
@@ -1027,7 +1032,7 @@
<property name="expand">True</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -1056,5 +1061,8 @@
</child>
</object>
</child>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/contrib/gnunet_fs_gtk_about_window.glade.in
b/contrib/gnunet_fs_gtk_about_window.glade.in
index eab81bd6..ba121537 100644
--- a/contrib/gnunet_fs_gtk_about_window.glade.in
+++ b/contrib/gnunet_fs_gtk_about_window.glade.in
@@ -17,7 +17,7 @@
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/gnunet_identity_gtk_about_window.glade.in
b/contrib/gnunet_identity_gtk_about_window.glade.in
index e7cd503a..a5720e51 100644
--- a/contrib/gnunet_identity_gtk_about_window.glade.in
+++ b/contrib/gnunet_identity_gtk_about_window.glade.in
@@ -79,7 +79,7 @@ Daniel Nylander <address@hidden></property>
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/gnunet_namestore_gtk_about_window.glade.in
b/contrib/gnunet_namestore_gtk_about_window.glade.in
index e61bc471..b84f4d14 100644
--- a/contrib/gnunet_namestore_gtk_about_window.glade.in
+++ b/contrib/gnunet_namestore_gtk_about_window.glade.in
@@ -79,7 +79,7 @@ Daniel Nylander <address@hidden></property>
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/gnunet_setup_about_window.glade.in
b/contrib/gnunet_setup_about_window.glade.in
index e61bc471..b84f4d14 100644
--- a/contrib/gnunet_setup_about_window.glade.in
+++ b/contrib/gnunet_setup_about_window.glade.in
@@ -79,7 +79,7 @@ Daniel Nylander <address@hidden></property>
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/gnunet_statistics_gtk_about_window.glade.in
b/contrib/gnunet_statistics_gtk_about_window.glade.in
index 41ab8f63..e537476e 100644
--- a/contrib/gnunet_statistics_gtk_about_window.glade.in
+++ b/contrib/gnunet_statistics_gtk_about_window.glade.in
@@ -79,7 +79,7 @@ Daniel Nylander <address@hidden></property>
<object class="GtkImage" id="about_logo_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="pixbuf">gnunet_logo.png</property>
+ <property name="pixbuf">gnunet-logo-color.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/conversation/gnunet-conversation-gtk.c
b/src/conversation/gnunet-conversation-gtk.c
index eb4e295c..ca8912a7 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -64,6 +64,8 @@ static char *ego_name;
GObject *
GCG_get_main_window_object (const char *name)
{
+ if (NULL == ml)
+ return NULL;
return GNUNET_GTK_main_loop_get_object (ml, name);
}
@@ -145,8 +147,6 @@ run (void *cls)
gtk_window_present (GTK_WINDOW (main_window));
GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
NULL);
- if (NULL == ego_name)
- ego_name = GNUNET_strdup ("master-zone");
GCG_HISTORY_init ();
GCG_ZONES_init (ego_name);
GCG_EGOS_init (ego_name);
@@ -180,7 +180,7 @@ main (int argc, char *const *argv)
GNUNET_GETOPT_option_string ('e',
"ego",
"EGO",
- gettext_noop ("select ego to use"),
+ gettext_noop ("select ego to use"),
&ego_name),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c
b/src/conversation/gnunet-conversation-gtk_contacts.c
index 88b9a6f2..8c175389 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2010-2014 GNUnet e.V.
+ Copyright (C) 2010-2014, 2018 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -111,7 +111,9 @@
gnunet_conversation_gtk_contact_list_treeview_row_activated_cb (GtkTreeView *tr
GtkTreeIter iter;
gchar *name;
GtkEntry *address_entry;
+ const char *tld;
+ GNUNET_assert (NULL != GCG_ZONES_get_selected_zone (&tld));
if (! gtk_tree_model_get_iter (contacts_treemodel,
&iter,
path))
@@ -127,14 +129,16 @@
gnunet_conversation_gtk_contact_list_treeview_row_activated_cb (GtkTreeView *tr
if (0 == strcmp (type, "PKEY"))
{
GNUNET_asprintf (&address,
- "phone.%s.gnu",
- name);
+ "phone.%s.%s",
+ name,
+ tld);
}
else
{
GNUNET_asprintf (&address,
- "%s.gnu",
- name);
+ "%s.%s",
+ name,
+ tld);
}
g_free (name);
g_free (type);
@@ -163,7 +167,6 @@ display_record (void *cls,
unsigned int rd_len,
const struct GNUNET_GNSRECORD_Data *rd)
{
- unsigned int i;
GtkTreeIter iter;
gboolean do_display;
const char *type;
@@ -174,7 +177,7 @@ display_record (void *cls,
do_display = FALSE;
value = NULL;
- for (i = 0; i < rd_len; i++)
+ for (unsigned int i = 0; i < rd_len; i++)
{
switch (rd[i].record_type)
{
@@ -314,6 +317,7 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb
(GtkComboBox *widget,
{
struct GNUNET_IDENTITY_Ego *ego;
const struct GNUNET_CRYPTO_EcdsaPrivateKey *temp_zone_pkey;
+ const char *tld;
if (NULL != zone_mon)
{
@@ -321,7 +325,7 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb
(GtkComboBox *widget,
zone_mon = NULL;
}
gtk_list_store_clear (contacts_liststore);
- ego = GCG_ZONES_get_selected_zone ();
+ ego = GCG_ZONES_get_selected_zone (&tld);
if (NULL == ego)
{
/* ego deselected (likely shutdown) */
diff --git a/src/conversation/gnunet-conversation-gtk_egos.c
b/src/conversation/gnunet-conversation-gtk_egos.c
index 0324ffb7..716d7cdf 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -102,6 +102,7 @@ identity_cb (void *cls,
const char *name)
{
GtkTreeIter iter;
+ GtkTreeIter iter2;
GtkTreeRowReference *rr;
GtkTreePath *path;
GtkComboBox *cb;
@@ -121,17 +122,18 @@ identity_cb (void *cls,
EGO_LS_NAME, name,
EGO_LS_EGO, ego,
-1);
- if ( (NULL != default_ego) &&
- (0 == strcmp (name,
- default_ego)) )
+ cb = GTK_COMBO_BOX (GCG_get_main_window_object
+ ("gnunet_conversation_gtk_ego_combobox"));
+ if ( (! gtk_combo_box_get_active_iter (cb,
+ &iter2)) &&
+ ( (NULL == default_ego) ||
+ (0 == strcmp (name,
+ default_ego))) )
{
/* found the ego that we were supposed to use by default, select
it! */
- GNUNET_free (default_ego);
- default_ego = NULL;
- cb = GTK_COMBO_BOX (GCG_get_main_window_object
- ("gnunet_conversation_gtk_ego_combobox"));
- gtk_combo_box_set_active_iter (cb, &iter);
+ gtk_combo_box_set_active_iter (cb,
+ &iter);
}
path = gtk_tree_model_get_path (GTK_TREE_MODEL (ego_liststore),
&iter);
@@ -213,7 +215,8 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb
(GtkButton *button,
void
GCG_EGOS_init (const char *ego_name)
{
- default_ego = GNUNET_strdup (ego_name);
+ if (NULL != ego_name)
+ default_ego = GNUNET_strdup (ego_name);
ego_liststore
= GTK_LIST_STORE (GCG_get_main_window_object
("gnunet_conversation_gtk_ego_liststore"));
diff --git a/src/conversation/gnunet-conversation-gtk_get_label.c
b/src/conversation/gnunet-conversation-gtk_get_label.c
index 5bdf83d3..54d0ea66 100644
--- a/src/conversation/gnunet-conversation-gtk_get_label.c
+++ b/src/conversation/gnunet-conversation-gtk_get_label.c
@@ -106,6 +106,7 @@ gnunet_conversation_gtk_enter_label_entry_changed_cb
(GtkEditable *editable,
GtkWidget *b_add;
struct GNUNET_IDENTITY_Ego *ego;
const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey;
+ const char *tld;
if (NULL != qe)
{
@@ -127,7 +128,7 @@ gnunet_conversation_gtk_enter_label_entry_changed_cb
(GtkEditable *editable,
label);
return;
}
- ego = GCG_ZONES_get_selected_zone ();
+ ego = GCG_ZONES_get_selected_zone (&tld);
if (NULL == ego)
return;
pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
diff --git a/src/conversation/gnunet-conversation-gtk_import.c
b/src/conversation/gnunet-conversation-gtk_import.c
index 0123d57d..ff9336fd 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -134,6 +134,7 @@ GSC_add_contact (const gchar *name,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zkey;
uint32_t type;
char cname[256];
+ const char *tld;
if (GNUNET_OK !=
GNUNET_DNSPARSER_check_name (address))
@@ -190,7 +191,7 @@ GSC_add_contact (const gchar *name,
| GNUNET_GNSRECORD_RF_PRIVATE;
rd.expiration_time
= GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- ego = GCG_ZONES_get_selected_zone ();
+ ego = GCG_ZONES_get_selected_zone (&tld);
zkey = GNUNET_IDENTITY_ego_get_private_key (ego);
add_contact_qe
= GNUNET_NAMESTORE_records_store (ns,
diff --git a/src/conversation/gnunet-conversation-gtk_log.c
b/src/conversation/gnunet-conversation-gtk_log.c
index a32ac7fb..168049aa 100644
--- a/src/conversation/gnunet-conversation-gtk_log.c
+++ b/src/conversation/gnunet-conversation-gtk_log.c
@@ -47,6 +47,8 @@ GCG_log (const char *message,
log_view = GTK_TEXT_VIEW (GCG_get_main_window_object
("gnunet_conversation_gtk_log"));
+ if (NULL == log_view)
+ return;
logbuff = GTK_TEXT_BUFFER (gtk_text_view_get_buffer (log_view));
va_start (ap, message);
fmsg = g_strdup_vprintf (message,
diff --git a/src/conversation/gnunet-conversation-gtk_phone.c
b/src/conversation/gnunet-conversation-gtk_phone.c
index 7f2f90a0..49f15893 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -566,13 +566,14 @@ static void
check_call_sensitivity ()
{
gboolean sens;
+ const char *tld;
sens = (NULL == active_in) && (NULL == active_out);
if (0 == strlen (gtk_entry_get_text (address_entry)))
sens = FALSE;
if (NULL == phone)
sens = FALSE;
- if (NULL == GCG_ZONES_get_selected_zone ())
+ if (NULL == GCG_ZONES_get_selected_zone (&tld))
sens = FALSE;
gtk_widget_set_sensitive (b_call, sens);
}
@@ -903,6 +904,7 @@ phone_event_handler (void *cls,
struct IncomingCall *ic;
GtkTreePath *path;
struct GNUNET_IDENTITY_Ego *my_zone;
+ const char *tld;
switch (code)
{
@@ -914,7 +916,7 @@ phone_event_handler (void *cls,
ic->caller_id = *caller_id;
ic->caller_id_str = GNUNET_strdup (GNUNET_GNSRECORD_pkey_to_zkey
(caller_id));
- my_zone = GCG_ZONES_get_selected_zone ();
+ my_zone = GCG_ZONES_get_selected_zone (&tld);
ic->qe = GNUNET_NAMESTORE_zone_to_name (GCG_IMPORT_get_namestore (),
GNUNET_IDENTITY_ego_get_private_key (my_zone),
&ic->caller_id,
@@ -1567,7 +1569,6 @@ gnunet_conversation_gtk_call_button_clicked_cb (GtkButton
*button,
{
struct GNUNET_IDENTITY_Ego *caller_id;
- struct GNUNET_IDENTITY_Ego *zone_id;
GtkTreePath *path;
GtkTreeIter iter;
struct OutgoingCall *oc;
@@ -1575,7 +1576,6 @@ gnunet_conversation_gtk_call_button_clicked_cb (GtkButton
*button,
arg = gtk_entry_get_text (address_entry);
caller_id = GCG_EGOS_get_selected_ego ();
- zone_id = GCG_ZONES_get_selected_zone ();
if ( (NULL == caller_id) ||
(NULL != active_out) ||
(NULL != active_in) )
@@ -1593,10 +1593,11 @@ gnunet_conversation_gtk_call_button_clicked_cb
(GtkButton *button,
oc->call =
GNUNET_CONVERSATION_call_start (GCG_get_configuration (),
caller_id,
- zone_id,
arg,
- speaker, mic,
- &call_event_handler, oc);
+ speaker,
+ mic,
+ &call_event_handler,
+ oc);
if (NULL == oc->call)
{
GCG_HISTORY_add (GCG_HISTORY_TYPE_FAILED,
diff --git a/src/conversation/gnunet-conversation-gtk_visibility.c
b/src/conversation/gnunet-conversation-gtk_visibility.c
index a0607ca8..4be9691d 100644
--- a/src/conversation/gnunet-conversation-gtk_visibility.c
+++ b/src/conversation/gnunet-conversation-gtk_visibility.c
@@ -95,21 +95,6 @@
gnunet_conversation_gtk_view_caller_id_checkmenuitem_toggled_cb (GtkWidget * dum
/**
- * Zone selection view is toggled.
- *
- * @param dummy widget triggering the event
- * @param data main window builder (unused)
- */
-void
-gnunet_conversation_gtk_view_zone_selection_checkmenuitem_toggled_cb
(GtkWidget * dummy,
- gpointer
data)
-{
- toggle_view ("gnunet_conversation_gtk_zone_hbox",
- "gnunet_conversation_gtk_view_zone_selection_checkmenuitem");
-}
-
-
-/**
* Address book view is toggled.
*
* @param dummy widget triggering the event
@@ -119,7 +104,7 @@ void
gnunet_conversation_gtk_view_address_book_checkmenuitem_toggled_cb (GtkWidget
*dummy,
gpointer data)
{
- toggle_view ("gnunet_conversation_gtk_address_book_hbox",
+ toggle_view ("gnunet_conversation_gtk_addressbook_frame",
"gnunet_conversation_gtk_view_address_book_checkmenuitem");
}
diff --git a/src/conversation/gnunet-conversation-gtk_zones.c
b/src/conversation/gnunet-conversation-gtk_zones.c
index d0e824f0..bfb8d2e6 100644
--- a/src/conversation/gnunet-conversation-gtk_zones.c
+++ b/src/conversation/gnunet-conversation-gtk_zones.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2013-2014 GNUnet e.V.
+ Copyright (C) 2013-2014, 2018 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -66,10 +66,11 @@ static char *default_ego;
/**
* Obtain the currently selected zone.
*
+ * @param name[out] set to the name of the ego
* @return NULL if no ego is selected
*/
struct GNUNET_IDENTITY_Ego *
-GCG_ZONES_get_selected_zone ()
+GCG_ZONES_get_selected_zone (const char **name)
{
struct GNUNET_IDENTITY_Ego *ego;
GtkTreeIter iter;
@@ -79,10 +80,14 @@ GCG_ZONES_get_selected_zone ()
("gnunet_conversation_gtk_contacts_zone_combobox"));
if (! gtk_combo_box_get_active_iter (cb,
&iter))
+ {
+ *name = NULL;
return NULL;
+ }
gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
&iter,
ZONE_LS_EGO, &ego,
+ ZONE_LS_NAME, name,
-1);
return ego;
}
@@ -103,6 +108,7 @@ identity_cb (void *cls,
const char *name)
{
GtkTreeIter iter;
+ GtkTreeIter iter2;
GtkTreeRowReference *rr;
GtkTreePath *path;
GtkComboBox *cb;
@@ -122,17 +128,18 @@ identity_cb (void *cls,
ZONE_LS_NAME, name,
ZONE_LS_EGO, ego,
-1);
- if ( (NULL != default_ego) &&
- (0 == strcmp (name,
- default_ego)) )
+ cb = GTK_COMBO_BOX (GCG_get_main_window_object
+ ("gnunet_conversation_gtk_contacts_zone_combobox"));
+ if ( (! gtk_combo_box_get_active_iter (cb,
+ &iter2)) &&
+ ( (NULL == default_ego) ||
+ (0 == strcmp (name,
+ default_ego)) ) )
{
- /* found the ego that we were supposed to use by default, select
- it! */
- GNUNET_free (default_ego);
- default_ego = NULL;
- cb = GTK_COMBO_BOX (GCG_get_main_window_object
- ("gnunet_conversation_gtk_contacts_zone_combobox"));
- gtk_combo_box_set_active_iter (cb, &iter);
+ /* found an ego (or the ego) that we were supposed to use by
+ default, select it! */
+ gtk_combo_box_set_active_iter (cb,
+ &iter);
}
path = gtk_tree_model_get_path (GTK_TREE_MODEL (zone_liststore),
&iter);
@@ -173,7 +180,8 @@ identity_cb (void *cls,
void
GCG_ZONES_init (const char *ego_name)
{
- default_ego = GNUNET_strdup (ego_name);
+ if (NULL != ego_name)
+ default_ego = GNUNET_strdup (ego_name);
zone_liststore
= GTK_LIST_STORE (GCG_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_liststore"));
diff --git a/src/conversation/gnunet-conversation-gtk_zones.h
b/src/conversation/gnunet-conversation-gtk_zones.h
index df991066..a9f5dd15 100644
--- a/src/conversation/gnunet-conversation-gtk_zones.h
+++ b/src/conversation/gnunet-conversation-gtk_zones.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2010-2014 GNUnet e.V.
+ Copyright (C) 2010-2014, 2018 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -33,10 +33,11 @@
/**
* Obtain the currently selected zone.
*
+ * @param name[out] set to the name of the ego
* @return NULL if no ego is selected
*/
struct GNUNET_IDENTITY_Ego *
-GCG_ZONES_get_selected_zone (void);
+GCG_ZONES_get_selected_zone (const char **name);
/**
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 4a4288a9..444d750e 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -933,10 +933,9 @@ GNUNET_GTK_main_loop_start (const char *binary_name,
memset (&ml, 0, sizeof (ml));
ml.main_window_file = main_window_file;
ml.main_task = main_task;
- ret =
- GNUNET_PROGRAM_run (argc, argv, binary_name,
- binary_help, options,
- &run_main_loop, &ml);
+ ret = GNUNET_PROGRAM_run (argc, argv, binary_name,
+ binary_help, options,
+ &run_main_loop, &ml);
if (NULL != ml.cached_poll_array)
g_free (ml.cached_poll_array);
if (NULL != ml.rs)
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index 615f1a98..68029152 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -137,7 +137,8 @@ cleanup_task (void *cls)
{
if (NULL != p->proc)
{
- (void) GNUNET_OS_process_kill (p->proc, SIGTERM);
+ (void) GNUNET_OS_process_kill (p->proc,
+ SIGTERM);
GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (p->proc));
GNUNET_OS_process_destroy (p->proc);
diff --git a/src/namestore/gnunet-namestore-gtk.c
b/src/namestore/gnunet-namestore-gtk.c
index d6f6e53d..b5dca553 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -3294,7 +3294,10 @@ run (void *cls)
if (GNUNET_OK !=
GNUNET_GTK_main_loop_build_window (ml,
NULL))
+ {
+ GNUNET_SCHEDULER_shutdown ();
return;
+ }
GNUNET_GTK_set_icon_search_path ();
GNUNET_GTK_setup_nls ();
@@ -3310,6 +3313,8 @@ run (void *cls)
gtk_label_set_markup (status_label,
label);
g_free (label);
+ GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+ NULL);
return;
}
ts = GTK_TREE_STORE (get_object ("gnunet_namestore_gtk_treestore"));
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c
b/src/peerinfo/gnunet-peerinfo-gtk.c
index 55153212..f6227cc7 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -488,8 +488,12 @@ free_paths (void *cts,
static void
shutdown_task (void *cts)
{
+ if (NULL == ml)
+ {
+ GNUNET_break (0);
+ return;
+ }
GNUNET_GTK_main_loop_quit (ml);
- ml = NULL;
if (NULL != pnc)
{
GNUNET_PEERINFO_notify_cancel (pnc);
@@ -515,7 +519,9 @@ shutdown_task (void *cts)
GNUNET_CORE_monitor_stop (cm);
cm = NULL;
}
- GNUNET_CONTAINER_multipeermap_iterate (peer2info, &free_paths, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (peer2info,
+ &free_paths,
+ NULL);
GNUNET_CONTAINER_multipeermap_destroy (peer2info);
peer2info = NULL;
GNUNET_PEERINFO_GTK_flags_shutdown ();
@@ -536,7 +542,9 @@ get_iter_from_rr (GtkTreeRowReference *rr,
path = gtk_tree_row_reference_get_path (rr);
GNUNET_assert (NULL != path);
- GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ts), iter, path));
+ GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ts),
+ iter,
+ path));
gtk_tree_path_free (path);
}
@@ -1322,7 +1330,8 @@
GNUNET_PEERINFO_GTK_main_window_friends_cellrenderertoggle_toggled_cb (GtkCellRe
* @param user_data unused
*/
void
-GNUNET_PEERINFO_GTK_quit_cb (GObject * object, gpointer user_data)
+GNUNET_PEERINFO_GTK_quit_cb (GObject * object,
+ gpointer user_data)
{
GNUNET_SCHEDULER_shutdown ();
}
@@ -1528,7 +1537,8 @@ run (void *cts)
NULL);
#if HAVE_LIBUNIQUE
- unique_app_watch_window (unique_app, GTK_WINDOW (main_window));
+ unique_app_watch_window (unique_app,
+ GTK_WINDOW (main_window));
#endif
/* make GUI visible */
gtk_widget_show (main_window);
@@ -1550,20 +1560,23 @@ main (int argc, char **argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_option_flag ('s',
- "show-inactive",
- gettext_noop ("show peers even if the are
inactive and we know nothing except their public key"),
- &show_inactive),
+ "show-inactive",
+ gettext_noop ("show peers even if the are
inactive and we know nothing except their public key"),
+ &show_inactive),
GNUNET_GETOPT_OPTION_END
};
#if HAVE_LIBUNIQUE
gtk_init (&argc, &argv);
- unique_app = unique_app_new ("org.gnunet.gnunet-peerinfo-gtk", NULL);
+ unique_app = unique_app_new ("org.gnunet.gnunet-peerinfo-gtk",
+ NULL);
if (unique_app_is_running (unique_app))
{
UniqueResponse response;
- response = unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL);
+ response = unique_app_send_message (unique_app,
+ UNIQUE_ACTIVATE,
+ NULL);
g_object_unref (unique_app);
return (UNIQUE_RESPONSE_OK == response) ? 0 : 1;
}
@@ -1571,8 +1584,10 @@ main (int argc, char **argv)
if (GNUNET_OK !=
GNUNET_GTK_main_loop_start ("gnunet-peerinfo-gtk",
- "GTK GUI for inspecting GNUnet Peers", argc,
- argv, options,
+ "GTK GUI for inspecting GNUnet Peers",
+ argc,
+ argv,
+ options,
"gnunet_peerinfo_gtk_main_window.glade",
&run))
return 1;
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet-gtk] branch master updated: fix conversation FTBFS and other minor stuff,
gnunet <=