[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29930 - in gnunet-gtk: contrib src/fs src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29930 - in gnunet-gtk: contrib src/fs src/namestore |
|
Date: |
Mon, 7 Oct 2013 17:01:23 +0200 |
Author: grothoff
Date: 2013-10-07 17:01:23 +0200 (Mon, 07 Oct 2013)
New Revision: 29930
Modified:
gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/namestore/
gnunet-gtk/src/namestore/Makefile.am
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
finishing #3054
Modified: gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2013-10-07
14:55:10 UTC (rev 29929)
+++ gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2013-10-07
15:01:23 UTC (rev 29930)
@@ -3,35 +3,39 @@
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="gnunet_namestore_gtk_dialog">
+ <property name="width_request">800</property>
+ <property name="height_request">600</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">gnunet-setup</property>
+ <property name="title" translatable="yes">gnunet-namestore-gtk</property>
<property name="window_position">center</property>
<property name="icon_name">preferences-system</property>
<property name="type_hint">normal</property>
- <signal name="destroy" handler="GNUNET_NAMESTORE_GTK_quit_cb"
swapped="no"/>
+ <signal name="destroy" handler="gnunet_namestore_gtk_quit_cb"
swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="gnunet_namestore_gtk_dialog-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkVBox" id="gnunet_namestore_gtk_gns_vbox">
+ <object class="GtkVBox" id="gnunet_namestore_gtk_vbox">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox" id="gnunet_namestore_gtk_gns_top_hbox">
+ <object class="GtkHBox" id="gnunet_namestore_gtk_top_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox"
id="gnunet_namestore_gtk_gns_zone_vbox">
+ <object class="GtkVBox" id="gnunet_namestore_gtk_zone_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox"
id="gnunet_namestore_gtk_gns_zone_label_hbox">
+ <object class="GtkHBox"
id="gnunet_namestore_gtk_zone_label_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="gnunet_namestore_gtk_gns_zone_label">
+ <object class="GtkLabel"
id="gnunet_namestore_gtk_zone_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes"><b>SET TO PUBLIC KEY OF THE ZONE</b></property>
@@ -44,14 +48,14 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_namestore_gtk_gns_public_key_copy_button">
+ <object class="GtkButton"
id="gnunet_namestore_gtk_public_key_copy_button">
<property name="label">gtk-copy</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_namestore_gtk_gns_public_key_copy_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="gnunet_namestore_gtk_public_key_copy_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -68,11 +72,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="gnunet_namestore_gtk_gns_pseu_hbox">
+ <object class="GtkHBox"
id="gnunet_namestore_gtk_pseu_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="gnunet_namestore_gtk_gns_pseu_label">
+ <object class="GtkLabel"
id="gnunet_namestore_gtk_pseu_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Preferred zone name (PSEU):</property>
@@ -85,7 +89,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="gnunet_namestore_gtk_gns_pseu_entry">
+ <object class="GtkEntry"
id="gnunet_namestore_gtk_pseu_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">63</property>
@@ -96,7 +100,7 @@
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <signal name="changed"
handler="gnunet_namestore_gtk_gns_pseu_entry_changed_cb" swapped="no"/>
+ <signal name="changed"
handler="gnunet_namestore_gtk_pseu_entry_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -113,12 +117,12 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox"
id="gnunet_namestore_gtk_gns_zone_selection_hbuttonbox">
+ <object class="GtkHButtonBox"
id="gnunet_namestore_gtk_zone_selection_hbuttonbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">center</property>
<child>
- <object class="GtkRadioButton"
id="gnunet_namestore_gtk_gns_master_zone_selection_radiobutton">
+ <object class="GtkRadioButton"
id="gnunet_namestore_gtk_master_zone_selection_radiobutton">
<property name="label" translatable="yes">_Master
Zone</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -127,7 +131,7 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled"
handler="gnunet_namestore_gtk_gns_master_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
+ <signal name="toggled"
handler="gnunet_namestore_gtk_master_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -137,7 +141,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="gnunet_namestore_gtk_gns_private_zone_selection_radiobutton">
+ <object class="GtkRadioButton"
id="gnunet_namestore_gtk_private_zone_selection_radiobutton">
<property name="label" translatable="yes">_Private
Zone</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -145,8 +149,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property
name="group">gnunet_namestore_gtk_gns_master_zone_selection_radiobutton</property>
- <signal name="toggled"
handler="gnunet_namestore_gtk_gns_private_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
+ <property
name="group">gnunet_namestore_gtk_master_zone_selection_radiobutton</property>
+ <signal name="toggled"
handler="gnunet_namestore_gtk_private_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -156,7 +160,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="gnunet_namestore_gtk_gns_shorten_zone_selection_radiobutton">
+ <object class="GtkRadioButton"
id="gnunet_namestore_gtk_shorten_zone_selection_radiobutton">
<property name="label" translatable="yes">_Shorten
Zone</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -164,8 +168,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property
name="group">gnunet_namestore_gtk_gns_master_zone_selection_radiobutton</property>
- <signal name="toggled"
handler="gnunet_namestore_gtk_gns_shorten_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
+ <property
name="group">gnunet_namestore_gtk_master_zone_selection_radiobutton</property>
+ <signal name="toggled"
handler="gnunet_namestore_gtk_shorten_zone_selection_radiobutton_toggled_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -190,7 +194,7 @@
</packing>
</child>
<child>
- <object class="GtkVSeparator"
id="gnunet_namestore_gtk_gns_qr_vseparator">
+ <object class="GtkVSeparator"
id="gnunet_namestore_gtk_qr_vseparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -201,7 +205,7 @@
</packing>
</child>
<child>
- <object class="GtkImage"
id="gnunet_namestore_gtk_gns_qr_image">
+ <object class="GtkImage" id="gnunet_namestore_gtk_qr_image">
<property name="width_request">64</property>
<property name="height_request">64</property>
<property name="visible">True</property>
@@ -216,14 +220,14 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="gnunet_namestore_gtk_gns_qr_saveas_button">
+ <object class="GtkButton"
id="gnunet_namestore_gtk_qr_saveas_button">
<property name="label">gtk-save-as</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_namestore_gtk_gns_qr_saveas_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="gnunet_namestore_gtk_qr_saveas_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -240,7 +244,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="gnunet_namestore_gtk_gns_status_label">
+ <object class="GtkLabel" id="gnunet_namestore_gtk_status_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes"><b><big>Loading...</big></b></property>
@@ -253,29 +257,29 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow"
id="gnunet_namestore_gtk_gns_main_scrolledwindow">
+ <object class="GtkScrolledWindow"
id="gnunet_namestore_gtk_scrolledwindow">
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <object class="GtkTreeView"
id="gnunet_namestore_gtk_gns_main_treeview">
+ <object class="GtkTreeView"
id="gnunet_namestore_gtk_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">gnunet_namestore_gtk_gns_treestore</property>
+ <property
name="model">gnunet_namestore_gtk_treestore</property>
<property name="search_column">0</property>
- <signal name="button-press-event"
handler="gnunet_namestore_gtk_gns_main_treeview_button_press_event_cb"
swapped="no"/>
- <signal name="key-press-event"
handler="gnunet_namestore_gtk_gns_main_treeview_key_press_event_cb"
swapped="no"/>
- <signal name="popup-menu"
handler="gnunet_namestore_gtk_gns_main_treeview_popup_menu_cb" swapped="no"/>
+ <signal name="button-press-event"
handler="gnunet_namestore_gtk_treeview_button_press_event_cb" swapped="no"/>
+ <signal name="key-press-event"
handler="gnunet_namestore_gtk_treeview_key_press_event_cb" swapped="no"/>
+ <signal name="popup-menu"
handler="gnunet_namestore_gtk_treeview_popup_menu_cb" swapped="no"/>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_gns_name_treeviewcolumn">
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_name_treeviewcolumn">
<property name="title">Name</property>
<property name="clickable">True</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_namestore_gtk_gns_name_cellrenderertext">
- <signal name="edited"
handler="gnunet_namestore_gtk_gns_name_cellrenderertext_edited_cb"
swapped="no"/>
+ <object class="GtkCellRendererText"
id="gnunet_namestore_gtk_name_cellrenderertext">
+ <signal name="edited"
handler="gnunet_namestore_gtk_name_cellrenderertext_edited_cb" swapped="no"/>
</object>
<attributes>
<attribute name="visible">9</attribute>
@@ -287,7 +291,7 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_gns_type_treeviewcolumn">
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_type_treeviewcolumn">
<property name="sizing">autosize</property>
<property name="fixed_width">90</property>
<property name="title">Type</property>
@@ -296,10 +300,10 @@
<property name="sort_indicator">True</property>
<property name="sort_column_id">3</property>
<child>
- <object class="GtkCellRendererCombo"
id="gnunet_namestore_gtk_gns_type_cellrenderercombo">
- <property
name="model">gnunet_namestore_gtk_gns_type_liststore</property>
+ <object class="GtkCellRendererCombo"
id="gnunet_namestore_gtk_type_cellrenderercombo">
+ <property
name="model">gnunet_namestore_gtk_type_liststore</property>
<property name="text_column">1</property>
- <signal name="edited"
handler="gnunet_namestore_gtk_gns_type_cellrenderercombo_edited_cb"
swapped="no"/>
+ <signal name="edited"
handler="gnunet_namestore_gtk_type_cellrenderercombo_edited_cb" swapped="no"/>
</object>
<attributes>
<attribute name="visible">10</attribute>
@@ -310,14 +314,14 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_gns_value_treeviewcolumn">
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_value_treeviewcolumn">
<property name="sizing">autosize</property>
<property name="title">Value</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">7</property>
<child>
- <object class="GtkCellRendererText"
id="gnunet_namestore_gtk_gns_value_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="gnunet_namestore_gtk_value_cellrenderertext"/>
<attributes>
<attribute name="sensitive">11</attribute>
<attribute name="visible">10</attribute>
@@ -328,14 +332,14 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_gns_expiration_treeviewcolumn">
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_expiration_treeviewcolumn">
<property name="title">Expiration</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">4</property>
<child>
- <object class="GtkCellRendererText"
id="gnunet_namestore_gtk_gns_expiration_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="gnunet_namestore_gtk_expiration_cellrenderertext"/>
<attributes>
<attribute name="sensitive">11</attribute>
<attribute name="visible">10</attribute>
@@ -346,13 +350,13 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_gns_ispublic_treeviewcolumn">
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_ispublic_treeviewcolumn">
<property name="sizing">fixed</property>
<property name="fixed_width">50</property>
<property name="title">Public</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererToggle"
id="gnunet_namestore_gtk_gns_ispublic_cellrenderertoggle">
+ <object class="GtkCellRendererToggle"
id="gnunet_namestore_gtk_ispublic_cellrenderertoggle">
<property name="sensitive">False</property>
</object>
<attributes>
@@ -428,6 +432,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -439,21 +444,21 @@
<action-widget
response="-3">gnunet_namestore_gtk_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkMenu" id="gnunet_namestore_gtk_gns_edit_popup_menu">
+ <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem"
id="gnunet_namestore_gtk_gns_popup_edit_button">
+ <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Edit GNS
entry</property>
<property name="label" translatable="yes">Edit</property>
- <signal name="activate"
handler="gnunet_namestore_gtk_gns_popup_edit_button_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
</object>
</child>
</object>
- <object class="GtkTreeStore" id="gnunet_namestore_gtk_gns_treestore">
+ <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
@@ -493,7 +498,7 @@
<column type="guint"/>
</columns>
</object>
- <object class="GtkListStore" id="gnunet_namestore_gtk_gns_type_liststore">
+ <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
<columns>
<!-- column-name type -->
<column type="guint"/>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2013-10-07 14:55:10 UTC (rev 29929)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2013-10-07 15:01:23 UTC (rev 29930)
@@ -674,10 +674,10 @@
ml = cls;
/* setup main context */
- if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (cls, &main_context))
+ if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, &main_context))
return;
- main_context.builder = GNUNET_GTK_main_loop_get_builder (cls);
- main_context.cfg = GNUNET_GTK_main_loop_get_configuration (cls);
+ main_context.builder = GNUNET_GTK_main_loop_get_builder (ml);
+ main_context.cfg = GNUNET_GTK_main_loop_get_configuration (ml);
main_context.search_ns_treestore = GTK_TREE_STORE
(GNUNET_FS_GTK_get_main_window_object
("main_window_search_namespace_treestore"));
main_context.main_window = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window"));
main_context.ns_selector_treeview = GTK_TREE_VIEW
(GNUNET_FS_GTK_get_main_window_object ("namespace_selector_treeview"));
Index: gnunet-gtk/src/namestore
===================================================================
--- gnunet-gtk/src/namestore 2013-10-07 14:55:10 UTC (rev 29929)
+++ gnunet-gtk/src/namestore 2013-10-07 15:01:23 UTC (rev 29930)
Property changes on: gnunet-gtk/src/namestore
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
+gnunet-namestore-gtk
Makefile.in
Makefile
gnunet-setup
Modified: gnunet-gtk/src/namestore/Makefile.am
===================================================================
--- gnunet-gtk/src/namestore/Makefile.am 2013-10-07 14:55:10 UTC (rev
29929)
+++ gnunet-gtk/src/namestore/Makefile.am 2013-10-07 15:01:23 UTC (rev
29930)
@@ -21,6 +21,5 @@
@GNUNET_CFLAGS@ \
@GLADE_CFLAGS@ \
@QR_CFLAGS@
-
-gnunet_setup_LDFLAGS = \
+gnunet_namestore_gtk_LDFLAGS = \
-export-dynamic
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-07 14:55:10 UTC
(rev 29929)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-07 15:01:23 UTC
(rev 29930)
@@ -374,14 +374,9 @@
static struct GNUNET_GTK_MainLoop *ml;
/**
- * Name of the configuration file.
- */
-static const char *cfgName;
-
-/**
* Our configuration.
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Global return value (for success/failure of gnunet-setup).
@@ -389,7 +384,6 @@
static int gret;
-
/**
* Get an object from the main window.
*
@@ -405,7 +399,6 @@
}
-
#if HAVE_QRENCODE_H
#include <qrencode.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -441,7 +434,7 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "QRinput_new2");
return NULL;
}
- entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_gns_pseu_entry"));
+ entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_pseu_entry"));
pseu = gtk_entry_get_text (GTK_ENTRY(entry));
GNUNET_asprintf (&str,
"gnunet://gns/%s/%s\n",
@@ -514,7 +507,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Failed to initialize QR-code
pixbuf"));
return;
}
- image = GTK_IMAGE (get_object ("gnunet_namestore_gtk_gns_qr_image"));
+ image = GTK_IMAGE (get_object ("gnunet_namestore_gtk_qr_image"));
if (NULL == image)
{
GNUNET_break (0);
@@ -532,7 +525,7 @@
*
* @param dialog the dialog
* @param response_id reason for the dialog closing
- * @param user_data the 'GtkBuilder' we used to create the dialog
+ * @param user_data the `GtkBuilder` we used to create the dialog
*/
void
gnunet_namestore_gtk_qr_save_as_dialog_response_cb (GtkDialog *dialog,
@@ -577,7 +570,7 @@
* dialog to get the desired filename and file type.
*/
void
-gnunet_namestore_gtk_gns_qr_saveas_button_clicked_cb (GtkButton *button,
+gnunet_namestore_gtk_qr_saveas_button_clicked_cb (GtkButton *button,
gpointer user_data)
{
GtkBuilder *builder;
@@ -586,7 +579,7 @@
GtkEntry *entry;
char *suggestion;
- entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_gns_pseu_entry"));
+ entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_pseu_entry"));
pseu = gtk_entry_get_text (GTK_ENTRY(entry));
builder =
GNUNET_GTK_get_new_builder ("gnunet_namestore_gtk_qr_save_as_dialog.glade",
@@ -612,10 +605,10 @@
* Check if adding a record of the given type is Ok given the other
* records already present for the given name.
*
- * @param rd_count size of the 'rd' array
+ * @param rd_count size of the @a rd array
* @param rd existing records
* @param n_type new record to be added
- * @return GNUNET_OK if adding this record is OK, GNUNET_NO if not
+ * @return #GNUNET_OK if adding this record is OK, #GNUNET_NO if not
*/
static int
check_record_permitted (unsigned int rd_count,
@@ -665,8 +658,8 @@
/**
* Function called upon completion of an operation.
*
- * @param cls the 'struct OperationContext' of the operation that completed
- * @param success GNUNET_OK if the operation succeeded
+ * @param cls the `struct OperationContext` of the operation that completed
+ * @param success #GNUNET_OK if the operation succeeded
* @param emsg error message if the operation failed
*/
static void
@@ -735,13 +728,13 @@
GNUNET_CONTAINER_multihashmap_iterate (n2r,
&release_ri,
NULL);
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_zone_selection_hbuttonbox")));
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_status_label")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_main_scrolledwindow")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_image")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_saveas_button")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_vseparator")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_pseu_hbox")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_zone_selection_hbuttonbox")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_status_label")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_scrolledwindow")));
+ gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_saveas_button")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_vseparator")));
+ gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_pseu_hbox")));
gtk_tree_store_clear (ts);
}
@@ -804,7 +797,7 @@
* Process a record that was stored in the namestore.
*
* @param cls closure
- * @param rd_count number of entries in 'rd' array
+ * @param rd_count number of entries in @a rd array
* @param rd array of records with data to store
*/
static void
@@ -853,7 +846,7 @@
* Process an encrypted that was stored in the namestore for
* merging.
*
- * @param cls closure
+ * @param cls closure with the `struct MoveOperationContext`
* @param block block to decrypt
*/
static void
@@ -885,7 +878,7 @@
/**
* The edit dialog completed; update the namestore and the
- * view based on the new values in 'edc'.
+ * view based on the new values in @a edc.
*
* @param edc editing context information
* @param ret return code of the dialog
@@ -1080,7 +1073,7 @@
* @param ri record information for this name (can be NULL
* if this is the first record for the name)
* @param off offset of the record being edited in the
- * ri's list; UINT_MAX if this is a new record
+ * @a ri's list; UINT_MAX if this is a new record
*/
static void
launch_edit_dialog (gint n_type,
@@ -1174,7 +1167,7 @@
*
* @param ri existing records
* @param n_type type of the new record
- * @return GNUNET_OK if this is allowed
+ * @return #GNUNET_OK if this is allowed
*/
static int
check_permissions (struct RecordInfo *ri,
@@ -1210,8 +1203,8 @@
* @param user_data main window builder
*/
void
-gnunet_namestore_gtk_gns_popup_edit_button_activate_cb (GtkWidget *widget,
- gpointer user_data)
+gnunet_namestore_gtk_popup_edit_button_activate_cb (GtkWidget *widget,
+ gpointer user_data)
{
GtkTreeSelection *sel;
gint n_type;
@@ -1263,10 +1256,10 @@
* @param user_data unused
*/
void
-gnunet_namestore_gtk_gns_type_cellrenderercombo_edited_cb (GtkCellRendererText
*text,
- gchar *path_string,
- gchar *new_text,
- gpointer user_data)
+gnunet_namestore_gtk_type_cellrenderercombo_edited_cb (GtkCellRendererText
*text,
+ gchar *path_string,
+ gchar *new_text,
+ gpointer user_data)
{
GtkTreeIter it;
guint type;
@@ -1322,10 +1315,10 @@
* @param user_data unused
*/
void
-gnunet_namestore_gtk_gns_name_cellrenderertext_edited_cb (GtkCellRendererText
*renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+gnunet_namestore_gtk_name_cellrenderertext_edited_cb (GtkCellRendererText
*renderer,
+ gchar *path,
+ gchar *new_text,
+ gpointer user_data)
{
GtkTreeIter it;
gboolean not_dummy;
@@ -1447,8 +1440,8 @@
* @return TRUE if a menu was activated
*/
gboolean
-gnunet_namestore_gtk_gns_main_treeview_popup_menu_cb (GtkWidget *widget,
- gpointer user_data)
+gnunet_namestore_gtk_treeview_popup_menu_cb (GtkWidget *widget,
+ gpointer user_data)
{
return create_popup_menu ();
}
@@ -1464,7 +1457,7 @@
* @return TRUE if a menu was activated (event was handled)
*/
gboolean
-gnunet_namestore_gtk_gns_main_treeview_button_press_event_cb (GtkWidget
*widget,
+gnunet_namestore_gtk_treeview_button_press_event_cb (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
@@ -1488,7 +1481,7 @@
* @return TRUE if the key was processed ('del')
*/
gboolean
-gnunet_namestore_gtk_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
+gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
@@ -1614,7 +1607,7 @@
* @param user_data unused
*/
void
-gnunet_namestore_gtk_gns_pseu_entry_changed_cb (GtkEditable *editable,
+gnunet_namestore_gtk_pseu_entry_changed_cb (GtkEditable *editable,
gpointer user_data)
{
const gchar *pseu;
@@ -1713,7 +1706,7 @@
* @param user_data unused
*/
void
-gnunet_namestore_gtk_gns_public_key_copy_button_clicked_cb (GtkButton *button,
+gnunet_namestore_gtk_public_key_copy_button_clicked_cb (GtkButton *button,
gpointer user_data)
{
GtkClipboard *cb;
@@ -1737,20 +1730,20 @@
zone_sync_proc (void *cls)
{
if (0 == strcmp (current_zone_option, "ZONEKEY"))
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_pseu_hbox")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_pseu_hbox")));
#if HAVE_QRENCODE_H
setup_qrcode ();
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_image")));
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_saveas_button")));
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_vseparator")));
+ gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_saveas_button")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_vseparator")));
#else
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_image")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_saveas_button")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_qr_vseparator")));
+ gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_saveas_button")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_qr_vseparator")));
#endif
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_status_label")));
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_main_scrolledwindow")));
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_zone_selection_hbuttonbox")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_status_label")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_scrolledwindow")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_zone_selection_hbuttonbox")));
}
@@ -1924,7 +1917,7 @@
(GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) &&
(NULL == current_pseudonym) )
{
- pseu_entry = GTK_ENTRY((get_object
("gnunet_namestore_gtk_gns_pseu_entry")));
+ pseu_entry = GTK_ENTRY((get_object ("gnunet_namestore_gtk_pseu_entry")));
gtk_entry_set_text (pseu_entry, val);
#if HAVE_QRENCODE_H
setup_qrcode ();
@@ -1998,7 +1991,7 @@
show_error_message (_("Failed to load zone"),
emsg);
GNUNET_free (emsg);
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_zone_selection_hbuttonbox")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_zone_selection_hbuttonbox")));
return;
}
pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
@@ -2006,7 +1999,7 @@
GNUNET_CRYPTO_ecc_key_get_public_for_signature (pkey, &pubkey);
label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
GNUNET_NAMESTORE_z2s (&pubkey));
- gtk_label_set_markup (GTK_LABEL (get_object
("gnunet_namestore_gtk_gns_zone_label")),
+ gtk_label_set_markup (GTK_LABEL (get_object
("gnunet_namestore_gtk_zone_label")),
label);
g_free (label);
/* Append a top level row and leave it empty */
@@ -2071,8 +2064,8 @@
* @param user_data builder, unused
*/
void
-gnunet_namestore_gtk_gns_shorten_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
- gpointer
user_data)
+gnunet_namestore_gtk_shorten_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
+
gpointer user_data)
{
if (gtk_toggle_button_get_active (togglebutton))
load_zone ("gns-short");
@@ -2087,8 +2080,8 @@
* @param user_data builder, unused
*/
void
-gnunet_namestore_gtk_gns_private_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
- gpointer
user_data)
+gnunet_namestore_gtk_private_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
+
gpointer user_data)
{
if (gtk_toggle_button_get_active (togglebutton))
load_zone ("gns-private");
@@ -2103,8 +2096,8 @@
* @param user_data builder, unused
*/
void
-gnunet_namestore_gtk_gns_master_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
- gpointer
user_data)
+gnunet_namestore_gtk_master_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
+
gpointer user_data)
{
if (gtk_toggle_button_get_active (togglebutton))
load_zone ("gns-master");
@@ -2118,7 +2111,8 @@
* @param tc scheduler context
*/
static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct OperationContext *oc;
struct MoveOperationContext *moc;
@@ -2131,8 +2125,8 @@
GNUNET_GTK_main_loop_quit (ml);
- gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_status_label")));
- gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_gns_main_scrolledwindow")));
+ gtk_widget_show (GTK_WIDGET (get_object
("gnunet_namestore_gtk_status_label")));
+ gtk_widget_hide (GTK_WIDGET (get_object
("gnunet_namestore_gtk_scrolledwindow")));
if (NULL != zmon)
{
GNUNET_NAMESTORE_zone_monitor_stop (zmon);
@@ -2220,26 +2214,26 @@
GtkLabel *status_label;
ml = cls;
+ cfg = GNUNET_GTK_main_loop_get_configuration (ml);
if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
return;
- cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
- main_window = GTK_WIDGET (get_object ("gnunet_namestore_dialog"));
+ main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog"));
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&cleanup_task, NULL);
namestore = GNUNET_NAMESTORE_connect (cfg);
if (NULL == namestore)
{
- status_label = GTK_LABEL (get_object
("gnunet_namestore_gtk_gns_status_label"));
+ status_label = GTK_LABEL (get_object
("gnunet_namestore_gtk_status_label"));
label = g_markup_printf_escaped (_("<b><big>Failed to connect to
namestore</b></big>"));
gtk_label_set_markup (status_label, label);
g_free (label);
return;
}
identity = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
- ts = GTK_TREE_STORE (get_object ("gnunet_namestore_gtk_gns_treestore"));
- tv = GTK_TREE_VIEW (get_object ("gnunet_namestore_gtk_gns_main_treeview"));
+ ts = GTK_TREE_STORE (get_object ("gnunet_namestore_gtk_treestore"));
+ tv = GTK_TREE_VIEW (get_object ("gnunet_namestore_gtk_treeview"));
tm = GTK_TREE_MODEL (ts);
n2r = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
load_zone ("gns-master");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29930 - in gnunet-gtk: contrib src/fs src/namestore,
gnunet <=