[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet-gtk] branch master updated: fix more build issues, remove gnunet
|
From: |
gnunet |
|
Subject: |
[gnunet-gtk] branch master updated: fix more build issues, remove gnunet-peerinfo-gtk |
|
Date: |
Wed, 06 Dec 2023 17:57:31 +0100 |
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 8dcb78a1 fix more build issues, remove gnunet-peerinfo-gtk
8dcb78a1 is described below
commit 8dcb78a1a63d22e8bf43639d8e8c30c02b78a95f
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Thu Dec 7 01:57:23 2023 +0900
fix more build issues, remove gnunet-peerinfo-gtk
---
configure.ac | 14 -
contrib/Makefile.am | 2 -
contrib/gnunet_peerinfo_gtk_about_window.glade.in | 360 --------------------
contrib/gnunet_peerinfo_gtk_main_window.glade | 369 ---------------------
src/Makefile.am | 2 +-
.../gnunet-conversation-gtk_contacts.c | 4 +-
src/conversation/gnunet-conversation-gtk_egos.c | 2 +-
src/conversation/gnunet-conversation-gtk_import.c | 48 ++-
src/conversation/gnunet-conversation-gtk_phone.c | 6 +-
src/namestore/gnunet-namestore-gtk.c | 179 ++++++----
src/namestore/plugin_gtk_namestore_phone.c | 4 +-
src/namestore/plugin_gtk_namestore_pkey.c | 6 +-
src/peerinfo/Makefile.am | 2 +-
13 files changed, 153 insertions(+), 845 deletions(-)
diff --git a/configure.ac b/configure.ac
index ab77c475..a4749a90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,14 +144,6 @@ AS_IF([test "x$enable_setup_app" != "xno"], [
])
AC_SUBST(GNUNET_SETUP_APP)
-GNUNET_PEERINFO_APP=""
-AC_ARG_ENABLE([peerinfo-app],
- AS_HELP_STRING([--disable-peerinfo-app],[Do not build gnunet-peerinfo-gtk
application]))
-AS_IF([test "x$enable_peerinfo_app" != "xno"], [
- GNUNET_PEERINFO_APP="peerinfo"
-])
-AC_SUBST(GNUNET_PEERINFO_APP)
-
# test for libextractor
extractor=0
@@ -482,17 +474,14 @@ AC_SUBST(GN_PLUGIN_LDFLAGS)
AC_SUBST(GNUNET_GNS_GTK_NAME, "GNUnet-GNS-GTK", [name of the program])
AC_SUBST(GNUNET_FS_GTK_NAME, "GNUnet-FS-GTK", [name of the program])
-AC_SUBST(GNUNET_PEERINFO_GTK_NAME, "GNUnet-Peerinfo-GTK", [name of the
program])
AC_SUBST(GNUNET_STATISTICS_GTK_NAME, "GNUnet-Statistics-GTK", [name of the
program])
AC_SUBST(GNUNET_SETUP_GTK_NAME, "GNUnet-Setup", [name of the program])
AC_SUBST(GNUNET_FS_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
-AC_SUBST(GNUNET_PEERINFO_GTK_VERSION3, $PACKAGE_VERSION, [version of the
program])
AC_SUBST(GNUNET_STATISTICS_GTK_VERSION3, $PACKAGE_VERSION, [version of the
program])
AC_SUBST(GNUNET_SETUP_GTK_VERSION3, $PACKAGE_VERSION, [version of the program])
AC_SUBST(GNUNET_FS_GTK_YEARFROM, [2010], [year of the first release])
-AC_SUBST(GNUNET_PEERINFO_GTK_YEARFROM, [2010], [year of the first release])
AC_SUBST(GNUNET_STATISTICS_GTK_YEARFROM, [2010], [year of the first release])
AC_SUBST(GNUNET_SETUP_GTK_YEARFROM, [2010], [year of the first release])
@@ -501,7 +490,6 @@ AS_IF([test -n "$SOURCE_DATE_EPOCH"],
[thisyear=$(date +%Y)])
AC_SUBST(GNUNET_FS_GTK_YEARTO, ${thisyear}, [year of the most current release])
-AC_SUBST(GNUNET_PEERINFO_GTK_YEARTO, ${thisyear}, [year of the most current
release])
AC_SUBST(GNUNET_STATISTICS_GTK_YEARTO, ${thisyear}, [year of the most current
release])
AC_SUBST(GNUNET_SETUP_GTK_YEARTO, ${thisyear}, [year of the most current
release])
@@ -515,7 +503,6 @@ src/include/Makefile
src/lib/Makefile
src/fs/Makefile
src/fs/gnunet-fs-gtk.conf
-src/peerinfo/Makefile
src/namestore/Makefile
src/setup/Makefile
src/statistics/Makefile
@@ -528,7 +515,6 @@ gnunet-setup.desktop
gnunet-gtk.desktop
contrib/gnunet_fs_gtk_about_window.glade
contrib/gnunet_identity_gtk_about_window.glade
-contrib/gnunet_peerinfo_gtk_about_window.glade
contrib/gnunet_namestore_gtk_about_window.glade
contrib/gnunet_statistics_gtk_about_window.glade
contrib/gnunet_setup_about_window.glade
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 307e6adc..21848043 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -58,8 +58,6 @@ pkgdata_DATA = \
gnunet_identity_gtk_about_window.glade \
gnunet_identity_gtk_advertise_dialog.glade \
gnunet_identity_gtk_main_window.glade \
- gnunet_peerinfo_gtk_about_window.glade \
- gnunet_peerinfo_gtk_main_window.glade \
gnunet_statistics_gtk_about_window.glade \
gnunet_statistics_gtk_main_window.glade \
gnunet_setup_calendar_dialog.glade \
diff --git a/contrib/gnunet_peerinfo_gtk_about_window.glade.in
b/contrib/gnunet_peerinfo_gtk_about_window.glade.in
deleted file mode 100644
index e7cd503a..00000000
--- a/contrib/gnunet_peerinfo_gtk_about_window.glade.in
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkTextBuffer" id="credits_art_contents">
- <property name="text">Jakub 'jimmac' Steiner <jimmac@ximian.org>
-Christian Muellner <chris@flop.de>
-Alex Jones <alexrjones@ntlworld.com>
-Nicklas Larsson <whybill@gmail.com></property>
- </object>
- <object class="GtkTextBuffer" id="credits_authors_contents">
- <property name="text">Juergen Appel <jappel@linux01.gwdg.de>
-Krista Grothoff <krista@grothoff.org>
-James Blackwell <jblack@linuxguru.net>
-Ludovic Courtes <ludo@chbouib.org>
-Nils Durner <durner@gnunet.org>
-Renaldo Ferreira <rf@cs.purdue.edu>
-Christian Grothoff <christian@grothoff.org>
-Eric Haumant
-Tzvetan Horozov <horozov@motorola.com>
-Gerd Knorr <kraxel@bytesex.org>
-Werner Koch <libgcrypt@g10code.com>
-Uli Luckas <luckas@musoft.de>
-Blake Matheny
-Glenn McGrath
-Hendrik Pagenhardt <Hendrik.Pagenhardt@gmx.net>
-Ioana Patrascu <ioanapatrascu@yahoo.com>
-Marko Raeihae
-Paul Ruth <ruth@cs.purdue.edu>
-Risto Saarelma
-Antti Salonen
-Tiberius Stef <tstef@cs.purdue.edu>
-Tuomas Toivonen
-Tomi Tukiainen
-Kevin Vandersloot <kfv101@psu.edu>
-Simo Viitanen
-Larry Waldo
-Igor Wronsky <iwronsky@users.sourceforge.net>
-<january@hushmail.com></property>
- </object>
- <object class="GtkTextBuffer" id="credits_docs_contents">
- <property name="text">Christian Grothoff <christian@grothoff.org>
-Anders Carlsson <andersca@gnu.org>
-Nils Durner <durner@gnunet.org>
-Nicklas Larsson <whybill@gmail.com>
-Milan Bouchet-Valat <nalimilan@club.fr>
-Igor Wronsky <iwronsky@users.sourceforge.net></property>
- </object>
- <object class="GtkTextBuffer" id="credits_trans_contents">
- <property name="text">Di Ma
-Jens Palsberg <palsberg@cs.ucla.edu>
-Christian Grothoff <christian@grothoff.org>
-Nils Durner <durner@gnunet.org>
-Mathieu <mollo@bghflt.org>
-Eric Haumant
-milan@skoid.org
-Hiroshi Yamauchi <yamauchi@cs.purdue.edu>
-Adam Welc <welc@cs.purdue.edu>
-Bogdan Carbunar <carbunar@cs.purdue.edu>
-Steven Michael Murphy <murf@e-tools.com>
-Phan Vinh Thinh <teppi82@gmail.com>
-Daniel Nylander <po@danielnylander.se></property>
- </object>
- <object class="GtkTextBuffer" id="license_contents">
- <property name="text" translatable="yes">License should be loaded here at
runtime from the license file (no need to copy the whole GPL in
here...).</property>
- </object>
- <object class="GtkWindow" id="about_window">
- <property name="can_focus">False</property>
- <property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <signal name="realize" handler="GNUNET_GTK_about_window_realized"
swapped="no"/>
- <signal name="delete-event"
handler="GNUNET_GTK_about_window_got_delete_event" swapped="no"/>
- <child>
- <object class="GtkVBox" id="about_main_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <child>
- <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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_name_version_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">@GNUNET_PEERINFO_GTK_NAME@
@GNUNET_PEERINFO_GTK_VERSION3@</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="size" value="200"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_copyright_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">(C)
@GNUNET_PEERINFO_GTK_YEARFROM@-@GNUNET_PEERINFO_GTK_YEARTO@ The GNUnet
Project</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_link_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"><a href="https://gnunet.org/">GNUnet:
GNU's Framework for Secure P2P Networking</a></property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="about_credits_notebook">
- <property name="can_focus">True</property>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_authors_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView"
id="about_credits_authors_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_authors_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_authors_tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Developed
by</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_docs_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView" id="about_credits_docs_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_docs_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_docs_tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Documented
by</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_trans_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView"
id="about_credits_trans_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_trans_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_trans_tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Translated
by</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_art_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView" id="about_credits_art_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_art_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_art_tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Artwork by</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="about_license_scroller">
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">out</property>
- <child>
- <object class="GtkTextView" id="about_license_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">license_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="about_buttons_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="about_credits_button">
- <property name="label" translatable="yes">Credits</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_credits_button_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="about_license_button">
- <property name="label" translatable="yes">License</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_license_button_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="about_close_button">
- <property name="label">gtk-close</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_close_button_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade
b/contrib/gnunet_peerinfo_gtk_main_window.glade
deleted file mode 100644
index 114a356e..00000000
--- a/contrib/gnunet_peerinfo_gtk_main_window.glade
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
-
-Copyright (C)
-
-This file is part of gnunet-peerinfo-gtk.
-
-gnunet-peerinfo-gtk is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-gnunet-peerinfo-gtk is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with gnunet-peerinfo-gtk. If not, see <http://www.gnu.org/licenses/>.
-
--->
-<interface>
- <requires lib="gtk+" version="3.0"/>
- <!-- interface-license-type gplv3 -->
- <!-- interface-name gnunet-peerinfo-gtk -->
- <object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store">
- <columns>
- <!-- column-name peer_identity -->
- <column type="gchararray"/>
- <!-- column-name country_name -->
- <column type="gchararray"/>
- <!-- column-name country_flag -->
- <column type="GdkPixbuf"/>
- <!-- column-name bandwidth_in -->
- <column type="guint"/>
- <!-- column-name bandwidth_out -->
- <column type="guint"/>
- <!-- column-name ats_connectivity_led -->
- <column type="GdkPixbuf"/>
- <!-- column-name ats_selected_status -->
- <column type="gboolean"/>
- <!-- column-name core_connectivity_led -->
- <column type="GdkPixbuf"/>
- <!-- column-name core_connected_status -->
- <column type="guint"/>
- <!-- column-name is_friend -->
- <column type="gboolean"/>
- <!-- column-name peerinfo -->
- <column type="gpointer"/>
- <!-- column-name plugin_name -->
- <column type="gchararray"/>
- <!-- column-name address_as_string -->
- <column type="gchararray"/>
- <!-- column-name neighbour_connectivity_led -->
- <column type="GdkPixbuf"/>
- <!-- column-name neighbour_connected_status -->
- <column type="gboolean"/>
- <!-- column-name neighbour_connectivity_timeout_as_string -->
- <column type="gchararray"/>
- <!-- column-name transport_neighbour_state_as_string -->
- <column type="gchararray"/>
- <!-- column-name transport_neighbour_state_timeout_as_string -->
- <column type="gchararray"/>
- <!-- column-name plugin_connectivity_led -->
- <column type="GdkPixbuf"/>
- <!-- column-name plugin_connectivity_status -->
- <column type="gboolean"/>
- <!-- column-name plugin_connectivity_timeout_as_string -->
- <column type="gchararray"/>
- <!-- column-name show_friend -->
- <column type="gboolean"/>
- <!-- column-name peerinfo_address_expiration -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkImage" id="connected_image_ats">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">ATS</property>
- <property name="icon_name">network-transmit</property>
- </object>
- <object class="GtkImage" id="connected_image_core">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">CORE</property>
- <property name="icon_name">dialog-password</property>
- </object>
- <object class="GtkImage" id="connected_image_neighbours">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">TRANSPORT</property>
- <property name="icon_name">object-flip-horizontal</property>
- </object>
- <object class="GtkImage" id="connected_image_plugin">
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">PLUGIN</property>
- <property name="icon_name">network-transmit-receive</property>
- </object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">help-about</property>
- </object>
- <object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">gnunet-peerinfo-gtk</property>
- <property name="window_position">center</property>
- <property name="default_width">700</property>
- <property name="default_height">500</property>
- <property name="icon_name">gnunet-gtk</property>
- <signal name="delete-event" handler="GNUNET_PEERINFO_GTK_quit_cb"
after="yes" swapped="no"/>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkBox" id="GNUNET_PEERINFO_GTK_main_window_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkMenuBar" id="GNUNET_PEERINFO_GTK_main_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem"
id="GNUNET_PEERINFO_GTK_main_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu"
id="GNUNET_PEERINFO_GTK_main_menu_help_abou">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_PEERINFO_GTK_main_menu_help_about">
- <property name="label">_About</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Display information about this version of
gnunet-peerinfo-gtk</property>
- <property
name="accel_path"><gnunet-peerinfo-gtk>/Help/About</property>
- <property name="use_underline">True</property>
- <property name="image">image1</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="GNUNET_PEERINFO_GTK_main_menu_help_about_activate_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="GNUNET_PEERINFO_GTK_main_window_scroll">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hadjustment">adjustment3</property>
- <property name="vadjustment">adjustment4</property>
- <child>
- <object class="GtkTreeView"
id="GNUNET_PEERINFO_GTK_main_window_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hadjustment">adjustment3</property>
- <property name="vadjustment">adjustment4</property>
- <property
name="model">GNUNET_PEERINFO_GTK_tree_store</property>
- <property name="reorderable">True</property>
- <property name="search_column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_name_column">
- <property name="spacing">5</property>
- <property name="sizing">autosize</property>
- <property name="title">Peer</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">0</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_name_renderer">
- <property name="sensitive">False</property>
- <property name="width_chars">4</property>
- </object>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_friends_treeviewcolumn">
- <property name="title" translatable="yes">Friend</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">9</property>
- <child>
- <object class="GtkCellRendererToggle"
id="GNUNET_PEERINFO_GTK_main_window_friends_cellrenderertoggle">
- <signal name="toggled"
handler="GNUNET_PEERINFO_GTK_main_window_friends_cellrenderertoggle_toggled_cb"
swapped="no"/>
- </object>
- <attributes>
- <attribute name="visible">21</attribute>
- <attribute name="active">9</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn">
- <property name="visible">False</property>
- <property name="widget">connected_image_plugin</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">19</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_plugin_led_cellrendererpixbuf"/>
- <attributes>
- <attribute name="pixbuf">18</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_ats_connectivity_treeviewcolumn">
- <property name="widget">connected_image_ats</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_ats_led_cellrendererpixbuf"/>
- <attributes>
- <attribute name="visible">6</attribute>
- <attribute name="pixbuf">5</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_transport_connectivity_treeviewcolumn">
- <property
name="widget">connected_image_neighbours</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">14</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_transport_led_cellrendererpixbuf"/>
- <attributes>
- <attribute name="pixbuf">13</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_core_connectivity_treeviewcolumn">
- <property name="spacing">2</property>
- <property name="sizing">autosize</property>
- <property name="widget">connected_image_core</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">8</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_core_led_cellrendererpixbuf"/>
- <attributes>
- <attribute name="pixbuf">7</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_country_column">
- <property name="sizing">autosize</property>
- <property name="title">Country</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">1</property>
- <child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_country_renderer"/>
- <attributes>
- <attribute name="pixbuf">2</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_address_treeviewcolumn">
- <property name="sizing">autosize</property>
- <property name="title">Address</property>
- <property name="expand">True</property>
- <property name="clickable">True</property>
- <property name="sort_column_id">12</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_address_cellrenderertext"/>
- <attributes>
- <attribute name="text">12</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_in_column">
- <property name="title">In</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_order">descending</property>
- <property name="sort_column_id">3</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_in_cellrenderertext"/>
- <attributes>
- <attribute name="text">3</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_treeviewcolumn">
- <property name="title">Out</property>
- <property name="clickable">True</property>
- <property name="sort_order">descending</property>
- <property name="sort_column_id">4</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_cellrenderertext"/>
- <attributes>
- <attribute name="text">4</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_plugin_name_treeviewcolumn">
- <property name="title" translatable="yes">Plugin</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">11</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_plugin_name_cellrenderertext"/>
- <attributes>
- <attribute name="text">11</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b928394..0a9d5175 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
# This Makefile.am is in the public domain
-SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_SETUP_APP)
$(GNUNET_PEERINFO_APP) $(GNUNET_CONVERSATION_APP) statistics
+SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_SETUP_APP)
$(GNUNET_CONVERSATION_APP) statistics
if HAVE_GNUTLS
SUBDIRS += namestore
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c
b/src/conversation/gnunet-conversation-gtk_contacts.c
index c823373d..5c49aab5 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -156,7 +156,7 @@
gnunet_conversation_gtk_contact_list_treeview_row_activated_cb (
*/
static void
display_record (void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+ const struct GNUNET_CRYPTO_PrivateKey *zone_key,
const char *rname,
unsigned int rd_len,
const struct GNUNET_GNSRECORD_Data *rd)
@@ -311,7 +311,7 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb
(GtkComboBox *widget,
gpointer user_data)
{
struct GNUNET_IDENTITY_Ego *ego;
- const struct GNUNET_IDENTITY_PrivateKey *temp_zone_pkey;
+ const struct GNUNET_CRYPTO_PrivateKey *temp_zone_pkey;
const char *tld;
if (NULL != zone_mon)
diff --git a/src/conversation/gnunet-conversation-gtk_egos.c
b/src/conversation/gnunet-conversation-gtk_egos.c
index 430eda40..3a761dcd 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -171,7 +171,7 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb
(GtkButton *button,
{
struct GNUNET_IDENTITY_Ego *ego;
const gchar *label;
- struct GNUNET_IDENTITY_PublicKey pub;
+ struct GNUNET_CRYPTO_PublicKey pub;
const char *zkey;
char *uri;
GtkClipboard *cb;
diff --git a/src/conversation/gnunet-conversation-gtk_import.c
b/src/conversation/gnunet-conversation-gtk_import.c
index 18ab0aeb..5b559ec0 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -71,7 +71,7 @@ static char *phone_label;
/**
* Current private key for the phone entry's zone.
*/
-static struct GNUNET_IDENTITY_PrivateKey zone_pkey;
+static struct GNUNET_CRYPTO_PrivateKey zone_pkey;
/**
* Our current phone record.
@@ -121,15 +121,17 @@ void
GSC_add_contact (const gchar *name, const gchar *address)
{
struct GNUNET_GNSRECORD_Data rd;
- struct GNUNET_IDENTITY_PublicKey rvalue;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ struct GNUNET_CRYPTO_PublicKey rvalue;
const void *value;
struct GNUNET_IDENTITY_Ego *ego;
size_t value_size;
- const struct GNUNET_IDENTITY_PrivateKey *zkey;
+ const struct GNUNET_CRYPTO_PrivateKey *zkey;
uint32_t type;
char cname[256];
const char *tld;
-
+ unsigned int res;
+
if (GNUNET_OK != GNUNET_DNSPARSER_check_name (address))
{
GCG_log (_ ("Domain name `%s' invalid\n"), address);
@@ -151,7 +153,7 @@ GSC_add_contact (const gchar *name, const gchar *address)
{
type = GNUNET_GNSRECORD_TYPE_PKEY;
value = &rvalue;
- value_size = GNUNET_IDENTITY_public_key_get_length (&rvalue);
+ value_size = GNUNET_CRYPTO_public_key_get_length (&rvalue);
}
else
{
@@ -177,11 +179,15 @@ GSC_add_contact (const gchar *name, const gchar *address)
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
ego = GCG_ZONES_get_selected_zone (&tld);
zkey = GNUNET_IDENTITY_ego_get_private_key (ego);
+ ri.a_label = name;
+ ri.a_rd_count = 1;
+ ri.a_rd = &rd;
+
add_contact_qe = GNUNET_NAMESTORE_records_store (ns,
zkey,
- name,
1,
- &rd,
+ &ri,
+ &res,
&add_contact_continuation,
NULL);
}
@@ -220,21 +226,26 @@ add_phone_continuation (void *cls, enum GNUNET_ErrorCode
ec)
static void
add_phone_handle_existing_records (
void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone,
+ const struct GNUNET_CRYPTO_PrivateKey *zone,
const char *label,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
struct GNUNET_GNSRECORD_Data rd_new[rd_count + 1];
-
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
+
add_phone_qe = NULL;
memcpy (rd_new, rd, sizeof (struct GNUNET_GNSRECORD_Data) * rd_count);
rd_new[rd_count] = my_rd;
+ ri.a_label = label;
+ ri.a_rd_count = rd_count + 1;
+ ri.a_rd = rd_new;
add_phone_qe = GNUNET_NAMESTORE_records_store (ns,
zone,
- label,
- rd_count + 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&add_phone_continuation,
NULL);
}
@@ -378,7 +389,7 @@ remove_phone_continuation (void *cls, enum GNUNET_ErrorCode
ec)
static void
remove_phone_handle_existing_records (
void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone,
+ const struct GNUNET_CRYPTO_PrivateKey *zone,
const char *label,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
@@ -386,6 +397,8 @@ remove_phone_handle_existing_records (
struct GNUNET_GNSRECORD_Data rd_left[rd_count];
unsigned int i;
unsigned int j;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
remove_phone_qe = NULL;
j = 0;
@@ -395,11 +408,14 @@ remove_phone_handle_existing_records (
continue;
rd_left[j++] = rd[i];
}
+ ri.a_label = label;
+ ri.a_rd_count = j;
+ ri.a_rd = rd_left;
remove_phone_qe = GNUNET_NAMESTORE_records_store (ns,
zone,
- label,
- j,
- rd_left,
+ 1,
+ &ri,
+ &res,
&remove_phone_continuation,
NULL);
}
diff --git a/src/conversation/gnunet-conversation-gtk_phone.c
b/src/conversation/gnunet-conversation-gtk_phone.c
index 552acc55..d1bbcc72 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -199,7 +199,7 @@ struct IncomingCall
/**
* Public key identifying the caller.
*/
- struct GNUNET_IDENTITY_PublicKey caller_id;
+ struct GNUNET_CRYPTO_PublicKey caller_id;
/**
* Caller ID as human-readable string.
@@ -849,7 +849,7 @@ set_incoming_call_state (struct IncomingCall *ic, enum
InCallState state)
*/
static void
handle_reverse_lookup_result (void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone,
+ const struct GNUNET_CRYPTO_PrivateKey *zone,
const char *label,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
@@ -887,7 +887,7 @@ static void
phone_event_handler (void *cls,
enum GNUNET_CONVERSATION_PhoneEventCode code,
struct GNUNET_CONVERSATION_Caller *caller,
- const struct GNUNET_IDENTITY_PublicKey *caller_id)
+ const struct GNUNET_CRYPTO_PublicKey *caller_id)
{
GtkTreeIter iter;
gboolean valid;
diff --git a/src/namestore/gnunet-namestore-gtk.c
b/src/namestore/gnunet-namestore-gtk.c
index f7df0a10..d577e1e6 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -266,11 +266,9 @@ struct MoveOperationContext
/**
* Private key of target zone.
*/
- struct GNUNET_IDENTITY_PrivateKey pk;
+ struct GNUNET_CRYPTO_PrivateKey pk;
/**
-
-
* Data to free.
*/
void *data;
@@ -415,12 +413,12 @@ static GtkTreeView *tv;
/**
* Private key of the zone we are currently editing.
*/
-static const struct GNUNET_IDENTITY_PrivateKey *pkey;
+static const struct GNUNET_CRYPTO_PrivateKey *pkey;
/**
* Public key of the zone we are currently editing.
*/
-static struct GNUNET_IDENTITY_PublicKey pubkey;
+static struct GNUNET_CRYPTO_PublicKey pubkey;
/**
* Pseudonym of the current zone we are editing.
@@ -894,6 +892,8 @@ merge_with_existing_records (void *cls,
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = moc->edc;
struct GNUNET_GNSRECORD_Data rd_new[rd_count + 1];
struct OperationContext *oc;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
GNUNET_CONTAINER_DLL_remove (moc_head, moc_tail, moc);
if (GNUNET_OK != check_record_permitted (rd_count, rd, edc->record_type))
@@ -913,11 +913,14 @@ merge_with_existing_records (void *cls,
/* FIXME: sanity-check merge... */
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = edc->name;
+ ri.a_rd_count = rd_count + 1;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
&moc->pk,
- edc->name,
- rd_count + 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
GNUNET_free (moc->data);
@@ -938,7 +941,7 @@ merge_with_existing_records (void *cls,
*/
static void
handle_records_for_merge (void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone,
+ const struct GNUNET_CRYPTO_PrivateKey *zone,
const char *label,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
@@ -1001,13 +1004,15 @@ static void
edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
GtkResponseType ret)
{
- struct RecordInfo *ri = edc->ri;
- unsigned int rd_count = (NULL == ri) ? 0 : ri->rd_count;
+ struct RecordInfo *ric = edc->ri;
+ unsigned int rd_count = (NULL == ric) ? 0 : ric->rd_count;
struct GNUNET_GNSRECORD_Data rd_old[rd_count];
struct GNUNET_GNSRECORD_Data rd;
void *data;
size_t data_size;
struct OperationContext *oc;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
if (NULL != edc->plugin)
{
@@ -1019,10 +1024,10 @@ edit_dialog_continuation (struct
GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
GNUNET_free (edc->liblow);
edc->liblow = NULL;
}
- if ((NULL != ri) &&
- (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (ri->data_size,
- ri->data,
- ri->rd_count,
+ if ((NULL != ric) &&
+ (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (ric->data_size,
+ ric->data,
+ ric->rd_count,
rd_old)))
{
GNUNET_break (0);
@@ -1063,18 +1068,21 @@ edit_dialog_continuation (struct
GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
/* remove item from tree view and namestore */
struct GNUNET_GNSRECORD_Data rd_new[rd_count - 1];
- GNUNET_assert (NULL != ri);
+ GNUNET_assert (NULL != ric);
memcpy (rd_new,
rd_old,
(rd_count - 1) * sizeof (struct GNUNET_GNSRECORD_Data));
rd_new[edc->off] = rd_old[rd_count - 1];
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = edc->name;
+ ri.a_rd_count = rd_count - 1;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- edc->name,
- rd_count - 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
@@ -1092,18 +1100,21 @@ edit_dialog_continuation (struct
GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
{
struct GNUNET_GNSRECORD_Data rd_new[rd_count];
- GNUNET_assert (NULL != ri);
+ GNUNET_assert (NULL != ric);
memcpy (rd_new,
rd_old,
rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
rd_new[edc->off] = rd;
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = edc->name;
+ ri.a_rd_count = rd_count;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- edc->name,
- rd_count,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
@@ -1117,18 +1128,21 @@ edit_dialog_continuation (struct
GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
rd_new[rd_count] = rd;
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = edc->name;
+ ri.a_rd_count = rd_count + 1;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- edc->name,
- rd_count + 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
}
else
{
- const struct GNUNET_IDENTITY_PrivateKey *pk;
+ const struct GNUNET_CRYPTO_PrivateKey *pk;
struct MoveOperationContext *moc;
struct GNUNET_HashCode query;
@@ -1158,18 +1172,21 @@ edit_dialog_continuation (struct
GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
/* remove item from tree view and namestore */
struct GNUNET_GNSRECORD_Data rd_new[rd_count - 1];
- GNUNET_assert (NULL != ri);
+ GNUNET_assert (NULL != ric);
memcpy (rd_new,
rd_old,
(rd_count - 1) * sizeof (struct GNUNET_GNSRECORD_Data));
rd_new[edc->off] = rd_old[rd_count - 1];
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = edc->name;
+ ri.a_rd_count = rd_count - 1;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- edc->name,
- rd_count - 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
@@ -2133,8 +2150,10 @@ gnunet_namestore_gtk_treeview_key_press_event_cb
(GtkWidget *widget,
GtkTreeIter parent;
char *name;
struct GNUNET_HashCode name_hash;
- struct RecordInfo *ri;
+ struct RecordInfo *ric;
struct OperationContext *oc;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
/* Check for delete key */
if ( (GDK_KEY_PRESS != event_key->type) ||
@@ -2158,13 +2177,13 @@ gnunet_namestore_gtk_treeview_key_press_event_cb
(GtkWidget *widget,
return TRUE; /* do not delete the dummy line */
}
GNUNET_CRYPTO_hash (name, strlen (name), &name_hash);
- ri = GNUNET_CONTAINER_multihashmap_get (n2r, &name_hash);
- GNUNET_assert (NULL != ri);
+ ric = GNUNET_CONTAINER_multihashmap_get (n2r, &name_hash);
+ GNUNET_assert (NULL != ric);
- if ((gtk_tree_model_iter_parent (tm, &parent, &iter)) && (ri->rd_count > 0))
+ if ((gtk_tree_model_iter_parent (tm, &parent, &iter)) && (ric->rd_count > 0))
{
- struct GNUNET_GNSRECORD_Data rd_old[ri->rd_count];
- struct GNUNET_GNSRECORD_Data rd_new[ri->rd_count - 1];
+ struct GNUNET_GNSRECORD_Data rd_old[ric->rd_count];
+ struct GNUNET_GNSRECORD_Data rd_new[ric->rd_count - 1];
struct GNUNET_GNSRECORD_Data rd;
unsigned int off;
int n_type;
@@ -2179,9 +2198,9 @@ gnunet_namestore_gtk_treeview_key_press_event_cb
(GtkWidget *widget,
"Removing single record for name `%s'\n",
name);
GNUNET_break (GNUNET_OK ==
- GNUNET_GNSRECORD_records_deserialize (ri->data_size,
- ri->data,
- ri->rd_count,
+ GNUNET_GNSRECORD_records_deserialize (ric->data_size,
+ ric->data,
+ ric->rd_count,
rd_old));
/* clang-format off */
gtk_tree_model_get (tm, &iter,
@@ -2215,21 +2234,24 @@ gnunet_namestore_gtk_treeview_key_press_event_cb
(GtkWidget *widget,
g_free (name);
return TRUE;
}
- for (off = 0; off < ri->rd_count; off++)
+ for (off = 0; off < ric->rd_count; off++)
if (GNUNET_YES == GNUNET_GNSRECORD_records_cmp (&rd, &rd_old[off]))
break;
- GNUNET_assert (off != ri->rd_count);
+ GNUNET_assert (off != ric->rd_count);
memcpy (rd_new,
rd_old,
- (ri->rd_count - 1) * sizeof (struct GNUNET_GNSRECORD_Data));
- rd_new[off] = rd_old[ri->rd_count - 1];
+ (ric->rd_count - 1) * sizeof (struct GNUNET_GNSRECORD_Data));
+ rd_new[off] = rd_old[ric->rd_count - 1];
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = name;
+ ri.a_rd_count = ric->rd_count - 1;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- name,
- ri->rd_count - 1,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
g_free (n_value);
@@ -2238,11 +2260,14 @@ gnunet_namestore_gtk_treeview_key_press_event_cb
(GtkWidget *widget,
{
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = name;
+ ri.a_rd_count = 0;
+ ri.a_rd = NULL;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- name,
- 0,
- NULL,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
@@ -2366,7 +2391,7 @@ free_ri (struct RecordInfo *ri)
*/
static void
zone_iteration_proc (void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+ const struct GNUNET_CRYPTO_PrivateKey *zone_key,
const char *name,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
@@ -2389,7 +2414,8 @@ zone_iteration_proc (void *cls,
GtkTreePath *sel_path;
(void) cls;
- if (0 != memcmp (zone_key, pkey, sizeof (struct GNUNET_IDENTITY_PrivateKey)))
+ if (0 != GNUNET_memcmp (zone_key,
+ pkey))
{
GNUNET_break (0);
return;
@@ -2703,7 +2729,7 @@ fresh_label (const char *label)
*/
static void
iop_create_cont (void *cls,
- const struct GNUNET_IDENTITY_PrivateKey *priv,
+ const struct GNUNET_CRYPTO_PrivateKey *priv,
enum GNUNET_ErrorCode ec)
{
GtkEntry *entry;
@@ -2845,17 +2871,19 @@ gnunet_namestore_gtk_quit_cb (GObject *object, gpointer
user_data)
static void
update_nick_record (const char *new_name)
{
- struct RecordInfo *ri;
+ struct RecordInfo *ric;
struct GNUNET_HashCode hc;
unsigned int rd_count;
struct OperationContext *oc;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
GNUNET_CRYPTO_hash ("+", 1, &hc);
- ri = GNUNET_CONTAINER_multihashmap_get (n2r, &hc);
- if (NULL == ri)
+ ric = GNUNET_CONTAINER_multihashmap_get (n2r, &hc);
+ if (NULL == ric)
rd_count = 0;
else
- rd_count = ri->rd_count;
+ rd_count = ric->rd_count;
{
struct GNUNET_GNSRECORD_Data rd_old[rd_count];
@@ -2864,10 +2892,10 @@ update_nick_record (const char *new_name)
unsigned int total;
total = rd_count;
- if (NULL != ri)
+ if (NULL != ric)
GNUNET_break (GNUNET_OK ==
- GNUNET_GNSRECORD_records_deserialize (ri->data_size,
- ri->data,
+ GNUNET_GNSRECORD_records_deserialize (ric->data_size,
+ ric->data,
rd_count,
rd_old));
memcpy (rd_new, rd_old, sizeof (struct GNUNET_GNSRECORD_Data) * rd_count);
@@ -2892,11 +2920,14 @@ update_nick_record (const char *new_name)
}
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = GNUNET_GNS_EMPTY_LABEL_AT;
+ ri.a_rd_count = total;
+ ri.a_rd = rd_new;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- GNUNET_GNS_EMPTY_LABEL_AT,
- total,
- rd_new,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
@@ -3122,7 +3153,7 @@ gnunet_namestore_gtk_zone_add_button_clicked_cb
(GtkButton *button,
iop = GNUNET_IDENTITY_create (identity,
label,
NULL,
- GNUNET_IDENTITY_TYPE_ECDSA,
+ GNUNET_PUBLIC_KEY_TYPE_ECDSA,
&iop_create_cont,
NULL);
gtk_entry_set_text (entry, "");
@@ -3138,24 +3169,30 @@ gnunet_namestore_gtk_zone_add_button_clicked_cb
(GtkButton *button,
* @return #GNUNET_OK (continue to iterate)
*/
static int
-delete_records (void *cls, const struct GNUNET_HashCode *key, void *value)
+delete_records (void *cls,
+ const struct GNUNET_HashCode *key, void *value)
{
- struct RecordInfo *ri = value;
+ struct RecordInfo *ric = value;
struct OperationContext *oc;
+ struct GNUNET_NAMESTORE_RecordInfo ri;
+ unsigned int res;
- if (0 != ri->rd_count)
+ if (0 != ric->rd_count)
{
oc = GNUNET_new (struct OperationContext);
GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
+ ri.a_label = ric->name;
+ ri.a_rd_count = 0;
+ ri.a_rd = NULL;
oc->qe = GNUNET_NAMESTORE_records_store (namestore,
pkey,
- ri->name,
- 0,
- NULL,
+ 1,
+ &ri,
+ &res,
&operation_done_cont,
oc);
}
- free_ri (ri);
+ free_ri (ric);
return GNUNET_OK;
}
diff --git a/src/namestore/plugin_gtk_namestore_phone.c
b/src/namestore/plugin_gtk_namestore_phone.c
index 843f4a15..9d7fb601 100644
--- a/src/namestore/plugin_gtk_namestore_phone.c
+++ b/src/namestore/plugin_gtk_namestore_phone.c
@@ -124,7 +124,7 @@ phone_validate (void *cls, GtkBuilder *builder)
{
GtkEditable *entry;
const gchar *preedit;
- struct GNUNET_IDENTITY_PublicKey pub;
+ struct GNUNET_CRYPTO_PublicKey pub;
entry = GTK_EDITABLE (
gtk_builder_get_object (builder, "edit_dialog_phone_peer_entry"));
@@ -135,7 +135,7 @@ phone_validate (void *cls, GtkBuilder *builder)
strlen (preedit),
&pub.ecdsa_key)))
return GNUNET_SYSERR;
- pub.type = GNUNET_IDENTITY_TYPE_ECDSA;
+ pub.type = GNUNET_PUBLIC_KEY_TYPE_ECDSA;
return GNUNET_OK;
}
diff --git a/src/namestore/plugin_gtk_namestore_pkey.c
b/src/namestore/plugin_gtk_namestore_pkey.c
index 3e5d0321..c61786e0 100644
--- a/src/namestore/plugin_gtk_namestore_pkey.c
+++ b/src/namestore/plugin_gtk_namestore_pkey.c
@@ -1,4 +1,4 @@
-/*
+/**
* This file is part of GNUnet
* Copyright (C) 2009-2013 GNUnet e.V.
*
@@ -99,7 +99,7 @@ pkey_validate (void *cls, GtkBuilder *builder)
{
GtkEditable *entry;
const gchar *preedit;
- struct GNUNET_IDENTITY_PublicKey pub;
+ struct GNUNET_CRYPTO_PublicKey pub;
entry =
GTK_EDITABLE (gtk_builder_get_object (builder, "edit_dialog_pkey_entry")),
@@ -110,7 +110,7 @@ pkey_validate (void *cls, GtkBuilder *builder)
strlen (preedit),
&pub.ecdsa_key)))
return GNUNET_SYSERR;
- pub.type = GNUNET_IDENTITY_TYPE_ECDSA;
+ pub.type = GNUNET_PUBLIC_KEY_TYPE_ECDSA;
return GNUNET_OK;
}
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index b7e1bac6..2c642665 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -19,7 +19,7 @@ gnunet_peerinfo_gtk_LDADD = \
$(top_builddir)/src/lib/libgnunetgtk.la \
@GTK_LIBS@ \
@GLADE_LIBS@ @GNUNET_LIBS@ @unique_LIBS@ \
- -lgnunetutil -lgnunetpeerinfo -lgnunettransport -lgnunetats -lgnunetcore
-lgnunetfriends -lgnunethello \
+ -lgnunetutil -lgnunettransport -lgnunetcore -lgnunethello \
$(INTLLIBS)
gnunet_peerinfo_gtk_LDFLAGS = \
-export-dynamic
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet-gtk] branch master updated: fix more build issues, remove gnunet-peerinfo-gtk,
gnunet <=