[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16585 - in gnunet-gtk: . src/fs src/lib src/peerinfo src/s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r16585 - in gnunet-gtk: . src/fs src/lib src/peerinfo src/setup |
|
Date: |
Tue, 16 Aug 2011 00:37:19 +0200 |
Author: grothoff
Date: 2011-08-16 00:37:19 +0200 (Tue, 16 Aug 2011)
New Revision: 16585
Added:
gnunet-gtk/.indent.pro
gnunet-gtk/pre-commit
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk-about.c
gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/lib/about.c
gnunet-gtk/src/lib/eventloop.c
gnunet-gtk/src/lib/glade.c
gnunet-gtk/src/lib/nls.c
gnunet-gtk/src/lib/os_installation.c
gnunet-gtk/src/lib/trayicon.c
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
gnunet-gtk/src/peerinfo/peerinfo.c
gnunet-gtk/src/setup/gnunet-setup-datacache-config.c
gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c
gnunet-gtk/src/setup/gnunet-setup-datastore-config.c
gnunet-gtk/src/setup/gnunet-setup-datastore-plugins.c
gnunet-gtk/src/setup/gnunet-setup-hostlist-editing.c
gnunet-gtk/src/setup/gnunet-setup-options.c
gnunet-gtk/src/setup/gnunet-setup-transport-http.c
gnunet-gtk/src/setup/gnunet-setup-transport-https.c
gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c
gnunet-gtk/src/setup/gnunet-setup-transport-tcp.c
gnunet-gtk/src/setup/gnunet-setup-transport-test.c
gnunet-gtk/src/setup/gnunet-setup-transport-udp.c
gnunet-gtk/src/setup/gnunet-setup-transport.c
gnunet-gtk/src/setup/gnunet-setup.c
Log:
indent
Added: gnunet-gtk/.indent.pro
===================================================================
--- gnunet-gtk/.indent.pro (rev 0)
+++ gnunet-gtk/.indent.pro 2011-08-15 22:37:19 UTC (rev 16585)
@@ -0,0 +1,632 @@
+//GNU (default) style:
+//
+//-nbad -bap -nbc -bbo -bl -bli2 -bls -ncdb -nce -cp1 -cs -di2
+//-ndj -nfc1 -nfca -hnl -i2 -ip5 -lp -pcs -nprs -psl -saf -sai
+//-saw -nsc -nsob
+//
+// -------
+// int foo;
+// char *bar;
+// bar = strdup ("whe-e-e");
+// -------
+// int foo;
+// char *bar;
+//
+// bar = strdup ("whe-e-e");
+// -------
+// Broken in indent-2.2.10
+--blank-lines-after-declarations
+//--no-blank-lines-after-declarations
+//
+// -------
+// int foo (...) {
+// ...
+// }
+// void bar (...) {
+// ...
+// }
+// -------
+// int foo (...) {
+// ...
+// }
+//
+// void bar (...) {
+// ...
+// }
+// -------
+--blank-lines-after-procedures
+//
+// -------
+// /*
+// blah
+// */
+// -------
+// /*
+// * blah
+// */
+// -------
+// WARNING: tends to turn commented-out code chunks into star-walled comment
blocks
+--start-left-side-of-comments
+//
+// -------
+// if (foo) { bar }
+// -------
+// if (foo)
+// {
+// bar
+// }
+// -------
+--braces-after-if-line
+//
+// -------
+// if (foo)
+// {
+// bar
+// } else {
+// baz
+// }
+// -------
+// if (foo)
+// {
+// bar
+// }
+// else
+// {
+// baz
+// }
+// -------
+--dont-cuddle-else
+//
+// -------
+// do
+// {
+// foo
+// }
+// while (bar)
+// -------
+// do
+// {
+// foo
+// } while (bar)
+// -------
+--dont-cuddle-do-while
+//
+// -------
+// switch (foo)
+// {
+// case bar:
+// baz
+// }
+// -------
+// switch (foo)
+// {
+// case bar:
+// baz
+// }
+// -------
+--case-indentation0
+//
+// -------
+// switch (foo)
+// {
+// case bar:
+// {
+// baz
+// }
+// }
+// -------
+// switch (foo)
+// {
+// case bar:
+// {
+// baz
+// }
+// }
+// -------
+// Yes, it looks wrong. However, braces inside cases should not be used like
this anyway.
+--case-brace-indentation0
+//
+// -------
+// for (i = 0; foobar(i); i++);
+// -------
+// for (i = 0; foobar(i); i++) ;
+// -------
+--space-special-semicolon
+//
+// -------
+// foo(bar)
+// -------
+// foo (bar)
+// -------
+--space-after-procedure-calls
+//
+// -------
+// (int *)foo;
+// (my_custom_type_that_was_not_passed_with_T_argument_see_below *)bar;
+// -------
+// (int *) foo;
+// (my_custom_type_that_was_not_passed_with_T_argument_see_below *)bar;
+// -------
+--space-after-cast
+//
+// -------
+// sizeof(foobar)
+// -------
+// sizeof (foobar)
+// -------
+-bs
+//
+// -------
+// for(foo;bar;baz)
+// -------
+// for (foo;bar;baz)
+// -------
+--space-after-for
+//
+// -------
+// if(foo)
+// -------
+// if (foo)
+// -------
+--space-after-if
+//
+// -------
+// while(foo)
+// -------
+// while (foo)
+// -------
+--space-after-while
+//
+// -------
+// if ( foo ( a > b ) | ( bar ( baz ) ) )
+// -------
+// if (foo (a > b) | (bar (baz)))
+// -------
+--no-space-after-parentheses
+//
+// -------
+// int a;
+// char b;
+// -------
+// int a;
+// char b;
+// -------
+--declaration-indentation0
+//
+// -------
+// int a,
+// b,
+// c;
+// -------
+// int a, b, c;
+// -------
+--no-blank-lines-after-commas
+//
+// -------
+// int foo (int bar, char *baz, long wheee, intptr_t zool);
+// -------
+// int foo (
+// int bar,
+// char *baz,
+// long wheee,
+// intptr_t zool);
+// -------
+--break-function-decl-args
+//
+// -------
+// int foo (
+// int bar,
+// char *baz,
+// long wheee,
+// intptr_t zool
+// );
+// -------
+// int foo (
+// int bar,
+// char *baz,
+// long wheee,
+// intptr_t zool);
+// -------
+--dont-break-function-decl-args-end
+//
+// -------
+// int foo (bar);
+// -------
+// int
+// foo (bar);
+// -------
+--procnames-start-lines
+//
+// -------
+// struct foo { int a; };
+// -------
+// struct foo
+// {
+// int a;
+// };
+// -------
+--braces-after-struct-decl-line
+//
+// -------
+// int foo (bar) {
+// baz
+// }
+// -------
+// int foo (bar)
+// {
+// baz
+// }
+// -------
+--braces-after-func-def-line
+//
+// -------
+// if (foo)
+// {
+// while (bar)
+// {
+// baz;
+// }
+// }
+// -------
+// if (foo)
+// {
+// while (bar)
+// {
+// baz;
+// }
+// }
+// -------
+--indent-level2
+//
+// -------
+// if (foo)
+// {
+// bar;
+// }
+// -------
+// if (foo)
+// {
+// bar;
+// }
+// -------
+--brace-indent0
+//
+// -------
+// boom = foo (bar) - baz +
+// whee (zool);
+// rules = power (mono, mwahahahahahahahaahahahahahahahahahahhahahahahaha,
+// stereo);
+// -------
+// boom = foo (bar) - baz +
+// whee (zool);
+// rules = power (mono, mwahahahahahahahaahahahahahahahahahahhahahahahaha,
+// stereo);
+// -------
+--continuation-indentation4
+//
+// -------
+// rules = power (mono, mwahahahahahahahaahahahahahahahahahahhahahahahaha,
+// stereo);
+// -------
+// rules = power (mono, mwahahahahahahahaahahahahahahahahahahhahahahahaha,
+// stereo);
+// -------
+--continue-at-parentheses
+//--dont-line-up-parentheses
+//
+// -------
+// while ((((i < 2 &&
+// k > 0) || p == 0) &&
+// q == 1) ||
+// n = 0)
+// -------
+// while ((((i < 2 &&
+// k > 0) || p == 0) &&
+// q == 1) ||
+// n = 0)
+// -------
+--paren-indentation2
+//
+// -------
+// char *
+// create_world (x, y, scale)
+// int x;
+// int y;
+// float scale;
+// {
+// ...
+// }
+// -------
+// char *
+// create_world (x, y, scale)
+// int x;
+// int y;
+// float scale;
+// {
+// ...
+// }
+// -------
+--parameter-indentation2
+//
+// -------
+// if (longlonglonglonglonglonglong
+// <tab character>short)
+// -------
+// if (longlonglonglonglonglonglong
+// short)
+// -------
+--no-tabs
+//
+// -------
+// #if WINDOWS
+// #if ZOOL
+// #define WHEE GNUNET_NO
+// #else
+// #define WHEE GNUNET_YES
+// #endif
+// #endif
+// -------
+// #if WINDOWS
+// # if ZOOL
+// # define WHEE GNUNET_NO
+// # else
+// # define WHEE GNUNET_YES
+// # endif
+// #endif
+// -------
+--preprocessor-indentation0
+//
+// -------
+// int foo (bar)
+// {
+// if (c)
+// goto end;
+// if (a > 0)
+// {
+// begin:
+// a = 0;
+// if (b != 0)
+// goto begin;
+// }
+// end:
+// return 0;
+// }
+// -------
+// int foo (bar)
+// {
+// if (c)
+// goto end;
+// if (a > 0)
+// {
+// begin:
+// a = 0;
+// if (b != 0)
+// goto begin;
+// }
+// end:
+// return 0;
+// }
+// -------
+--indent-label0
+//
+// -------
+// line-longer-than-80-chars /* some comment, not counted */
+// -------
+// 80-chars-long-line /* some comment, not counted */
+// rest-of-the-line
+// -------
+--line-length80
+//
+// -------
+// /* comment-line-longer-than-80-chars */
+// -------
+// /* 80-chars-long-comment-line
+// rest-of-the-line */
+// -------
+--comment-line-length80
+//
+// -------
+// if (mask
+// && ((mask[0] == '\0')
+// || (mask[1] == '\0'
+// && ((mask[0] == '0') || (mask[0] == '*')))))
+// -------
+// if (mask &&
+// ((mask[0] == '\0') ||
+// (mask[1] == '\0' &&
+// ((mask[0] == '0') || (mask[0] == '*')))))
+// -------
+--break-after-boolean-operator
+//
+// -------
+// if (mask
+// && ((mask[0] == '\0')
+// || (mask[1] == '\0' && ((mask[0] == '0') || (mask[0] == '*')))))
+// -------
+// if (mask /* this newline is preserved, override it with --ignore-newlines
*/
+// && ((mask[0] == '\0')
+// || (mask[1] == '\0' &&
+// ((mask[0] == '0') || (mask[0] == '*')))))
+// -------
+// For now just keep ignoring. After everything settles down, we might want to
start putting custom newlines where it is appropriate
+// --honour-newlines
+--ignore-newlines
+//
+//
+//
+// Also add a list of typedefed types here, like this:
+// -T <typedefedtype1>
+// -T <typedefedtype2>
+// for this:
+// typedef int typedefedtype1;
+// typedef char *typedefedtype2;
+// The following is obtained by running a Python script i wrote on src subdir:
+-T GNUNET_MysqlDataProcessor
+-T GNUNET_DHT_MessageReceivedHandler
+-T DHTLOG_MESSAGE_TYPES
+-T GNUNET_MysqlDataProcessor
+-T GNUNET_DV_MessageReceivedHandler
+-T p2p_dv_MESSAGE_NeighborInfo
+-T p2p_dv_MESSAGE_Data
+-T p2p_dv_MESSAGE_Disconnect
+-T GNUNET_FS_QueueStart
+-T GNUNET_FS_QueueStop
+-T SuspendSignalFunction
+-T GNUNET_FS_TEST_UriContinuation
+-T GNUNET_FS_TreeBlockProcessor
+-T GNUNET_FS_TreeProgressCallback
+-T GSF_ConnectedPeerIterator
+-T GSF_GetMessageCallback
+-T GSF_PeerReserveCallback
+-T GSF_PendingRequestReplyHandler
+-T GSF_PendingRequestIterator
+-T GSF_LocalLookupContinuation
+-T GNUNET_ARM_Callback
+-T GNUNET_TRANSPORT_ATS_AllocationNotification
+-T GNUNET_ATS_AddressSuggestionCallback
+-T GNUNET_BLOCK_GetKeyFunction
+-T GNUNET_CHAT_JoinCallback
+-T GNUNET_CHAT_MessageCallback
+-T GNUNET_CHAT_MemberListCallback
+-T GNUNET_CHAT_MessageConfirmation
+-T GNUNET_CHAT_RoomIterator
+-T GNUNET_CLIENT_MessageHandler
+-T GNUNET_CLIENT_ShutdownTask
+-T GNUNET_FileNameCallback
+-T GNUNET_CONFIGURATION_Iterator
+-T GNUNET_CONFIGURATION_Section_Iterator
+-T GNUNET_CONNECTION_AccessCheck
+-T GNUNET_CONNECTION_Receiver
+-T GNUNET_CONNECTION_TransmitReadyNotify
+-T GNUNET_HashCodeIterator
+-T GNUNET_CONTAINER_HashMapIterator
+-T GNUNET_CONTAINER_HeapCostType
+-T GNUNET_CONTAINER_HeapIterator
+-T GNUNET_CORE_ConnectEventHandler
+-T GNUNET_CORE_PeerStatusEventHandler
+-T GNUNET_CORE_DisconnectEventHandler
+-T GNUNET_CORE_MessageCallback
+-T GNUNET_CORE_StartupCallback
+-T GNUNET_CORE_ControlContinuation
+-T GNUNET_CORE_PeerConfigurationInfoCallback
+-T GNUNET_CRYPTO_HashCompletedCallback
+-T GNUNET_DATACACHE_Iterator
+-T GNUNET_DATACACHE_DeleteNotifyCallback
+-T DiskUtilizationChange
+-T PluginDatumProcessor
+-T PluginGetRandom
+-T GNUNET_DATASTORE_ContinuationWithStatus
+-T GNUNET_DATASTORE_DatumProcessor
+-T GNUNET_DHT_GetIterator
+-T GNUNET_DHT_FindPeerProcessor
+-T GNUNET_DHT_ReplyProcessor
+-T GNUNET_DISK_DirectoryIteratorCallback
+-T GNUNET_FRAGMENT_MessageProcessor
+-T GNUNET_DEFRAGMENT_AckProcessor
+-T GNUNET_FS_KeywordIterator
+-T GNUNET_FS_ProgressCallback
+-T GNUNET_FS_FileInformationProcessor
+-T GNUNET_FS_DataReader
+-T GNUNET_FS_FileProcessor
+-T GNUNET_FS_DirectoryScanner
+-T GNUNET_FS_PublishContinuation
+-T GNUNET_FS_IndexedFileProcessor
+-T GNUNET_FS_NamespaceInfoProcessor
+-T GNUNET_FS_IdentifierProcessor
+-T GNUNET_FS_DirectoryEntryProcessor
+-T GNUNET_HELLO_GenerateAddressListCallback
+-T GNUNET_HELLO_AddressIterator
+-T GNUNET_MESH_MessageCallback
+-T GNUNET_MESH_TunnelEndHandler
+-T GNUNET_MESH_ApplicationType
+-T GNUNET_MESH_TunnelDisconnectHandler
+-T GNUNET_MESH_TunnelConnectHandler
+-T GNUNET_MESH_MessageCallback
+-T GNUNET_MESH_TunnelEndHandler
+-T GNUNET_MESH_ApplicationType
+-T GNUNET_MESH_TunnelDisconnectHandler
+-T GNUNET_MESH_TunnelConnectHandler
+-T GNUNET_NAT_AddressCallback
+-T GNUNET_NAT_ReversalCallback
+-T GNUNET_NAT_TestCallback
+-T GNUNET_NSE_Callback
+-T GNUNET_OS_NetworkInterfaceProcessor
+-T GNUNET_OS_LineProcessor
+-T GNUNET_PEERINFO_Processor
+-T GNUNET_PEER_Id
+-T GNUNET_PLUGIN_Callback
+-T GNUNET_PROGRAM_Main
+-T GNUNET_PSEUDONYM_Iterator
+-T GNUNET_RESOLVER_AddressCallback
+-T GNUNET_RESOLVER_HostnameCallback
+-T GNUNET_SCHEDULER_TaskIdentifier
+-T GNUNET_SCHEDULER_Task
+-T GNUNET_SCHEDULER_select
+-T GNUNET_SERVER_MessageCallback
+-T GNUNET_SERVER_DisconnectCallback
+-T GNUNET_SERVER_MessageTokenizerCallback
+-T GNUNET_SERVICE_Main
+-T GNUNET_SIGNAL_Handler
+-T GNUNET_STATISTICS_Iterator
+-T GNUNET_STATISTICS_Callback
+-T GNUNET_TESTING_NotifyHostkeyCreated
+-T GNUNET_TESTING_NotifyDaemonRunning
+-T GNUNET_TESTING_NotifyCompletion
+-T GNUNET_TESTING_NotifyConnections
+-T GNUNET_TESTING_NotifyConnection
+-T GNUNET_TESTING_NotifyTopology
+-T GNUNET_TESTING_STATISTICS_Iterator
+-T GNUNET_TRANSPORT_SessionEnd
+-T GNUNET_TRANSPORT_AddressNotification
+-T GNUNET_TRANSPORT_TransmitContinuation
+-T GNUNET_TRANSPORT_TransmitFunction
+-T GNUNET_TRANSPORT_DisconnectFunction
+-T GNUNET_TRANSPORT_AddressStringCallback
+-T GNUNET_TRANSPORT_AddressPrettyPrinter
+-T GNUNET_TRANSPORT_CheckAddress
+-T GNUNET_TRANSPORT_AddressToString
+-T GNUNET_TRANSPORT_ReceiveCallback
+-T GNUNET_TRANSPORT_NotifyConnect
+-T GNUNET_TRANSPORT_NotifyDisconnect
+-T GNUNET_TRANSPORT_AddressLookUpCallback
+-T GNUNET_TRANSPORT_HelloUpdateCallback
+-T GNUNET_TRANSPORT_BlacklistCallback
+-T sa_family_t
+-T SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION
+-T PLIBC_SEARCH__compar_fn_t
+-T _win_comparison_fn_t
+-T PLIBC_SEARCH_ACTION
+-T PLIBC_SEARCH_VISIT
+-T PLIBC_SEARCH__action_fn_t
+-T PLIBC_SEARCH__free_fn_t
+-T MESH_TunnelNumber
+-T TransmissionContinuation
+-T GNUNET_TESTING_ConnectionProcessor
+-T SetupContinuation
+-T glp_prob
+-T glp_iocp
+-T glp_smcp
+-T GNUNET_TRANSPORT_ATS_AddressNotification
+-T GNUNET_TRANSPORT_ATS_ResultCallback
+-T GST_BlacklistTestContinuation
+-T GST_HelloCallback
+-T GST_NeighbourSendContinuation
+-T GST_NeighbourIterator
+-T GST_ValidationAddressCallback
+-T u32
+-T u16
+-T u8
+-T __le32
+-T EmailAddress
+-T SMTPMessage
+-T GNUNET_TRANSPORT_TESTING_connect_cb
+-T ieee80211_mgt_beacon_t
+-T ieee80211_mgt_auth_t
+-T u64
+-T u32
+-T u16
+-T u8
+-T uLong
+-T uLong
+-T KBlock_secret_key
+-T MyNSGetExecutablePathProto
Added: gnunet-gtk/pre-commit
===================================================================
--- gnunet-gtk/pre-commit (rev 0)
+++ gnunet-gtk/pre-commit 2011-08-15 22:37:19 UTC (rev 16585)
@@ -0,0 +1,8 @@
+#!/bin/sh
+find src/ -name "*.c" -exec indent {} \;
+find src/ -name "*.c" -exec indent {} \;
+if test -x "`which 'dos2unix'`"
+then
+ find src/ -name "*.c" -exec dos2unix {} \;
+ find src/ -name "*.c" -exec dos2unix {} \;
+fi
Property changes on: gnunet-gtk/pre-commit
___________________________________________________________________
Added: svn:executable
+ *
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-about.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-about.c 2011-08-15 22:36:56 UTC (rev
16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-about.c 2011-08-15 22:37:19 UTC (rev
16585)
@@ -35,7 +35,7 @@
GNUNET_GTK_main_menu_help_about_activate_cb (GtkWidget * dummy, gpointer data)
{
GNUNET_GTK_display_about ("gnunet_fs_gtk_about_dialog.glade",
- "GNUNET_GKT_about_dialog");
+ "GNUNET_GKT_about_dialog");
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -32,8 +32,7 @@
* Spin button is changed, update its colour.
*/
void
-GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget *w,
- gpointer data)
+GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget * w, gpointer
data)
{
GtkSpinButton *spin;
gint val;
@@ -42,31 +41,31 @@
spin = GTK_SPIN_BUTTON (w);
if (spin == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
val = gtk_spin_button_get_value_as_int (spin);
if (val == 0)
+ {
+ if ((TRUE == gdk_color_parse ("red", &bcolor)) &&
+ (TRUE ==
+ gdk_colormap_alloc_color (gdk_colormap_get_system (), &bcolor, FALSE,
+ TRUE)) &&
+ (TRUE == gdk_color_parse ("black", &fcolor)) &&
+ (TRUE ==
+ gdk_colormap_alloc_color (gdk_colormap_get_system (), &fcolor, FALSE,
+ TRUE)))
{
- if ((TRUE == gdk_color_parse ("red",
- &bcolor)) &&
- (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (),
- &bcolor, FALSE, TRUE)) &&
- (TRUE == gdk_color_parse ("black",
- &fcolor)) &&
- (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (),
- &fcolor, FALSE, TRUE)))
- {
- gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor);
- gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor);
- }
+ gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor);
+ gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor);
}
+ }
else
- {
- gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
- gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL);
- }
+ {
+ gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
+ gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL);
+ }
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-08-15 22:36:56 UTC (rev
16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.c 2011-08-15 22:37:19 UTC (rev
16585)
@@ -40,28 +40,21 @@
* @param data actual meta-data found
* @param data_len number of bytes in data
* @return 0 to continue (always)
- */
+ */
int
-GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls,
- const char *plugin_name,
- enum EXTRACTOR_MetaType type,
- enum EXTRACTOR_MetaFormat format,
- const char *data_mime_type,
- const char *data,
- size_t data_len)
+GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
+ enum EXTRACTOR_MetaType type,
+ enum EXTRACTOR_MetaFormat format,
+ const char *data_mime_type,
+ const char *data, size_t data_len)
{
GtkListStore *ls = GTK_LIST_STORE (cls);
- if ( (format == EXTRACTOR_METAFORMAT_UTF8) ||
- (format == EXTRACTOR_METAFORMAT_C_STRING) )
- gtk_list_store_insert_with_values (ls,
- NULL,
- G_MAXINT,
- 0, type,
- 1, format,
- 2, EXTRACTOR_metatype_to_string (type),
- 3, data,
- -1);
+ if ((format == EXTRACTOR_METAFORMAT_UTF8) ||
+ (format == EXTRACTOR_METAFORMAT_C_STRING))
+ gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
+ 2, EXTRACTOR_metatype_to_string (type),
+ 3, data, -1);
return 0;
}
@@ -70,36 +63,37 @@
* Convert the year from the spin button to an expiration
* time (on midnight, January 1st of that year).
*/
-struct GNUNET_TIME_Absolute
-GNUNET_FS_GTK_get_expiration_time (GtkSpinButton *spin)
+struct GNUNET_TIME_Absolute
+GNUNET_FS_GTK_get_expiration_time (GtkSpinButton * spin)
{
struct GNUNET_TIME_Absolute ret;
int year;
year = gtk_spin_button_get_value_as_int (spin);
GNUNET_assert (year >= 0);
- ret = GNUNET_FS_year_to_time ( (unsigned int) year);
+ ret = GNUNET_FS_year_to_time ((unsigned int) year);
GNUNET_break (GNUNET_TIME_absolute_get ().abs_value < ret.abs_value);
return ret;
}
void
-GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder *builder)
+GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder * builder)
{
GtkAdjustment *aj;
unsigned int year;
year = GNUNET_FS_get_current_year ();
- aj = GTK_ADJUSTMENT (gtk_builder_get_object (builder,
- "expiration_year_adjustment"));
+ aj = GTK_ADJUSTMENT (gtk_builder_get_object
+ (builder, "expiration_year_adjustment"));
gtk_adjustment_set_value (aj, year + 2);
gtk_adjustment_set_lower (aj, year + 1);
}
GdkPixbuf *
-GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct
GNUNET_CONTAINER_MetaData *meta)
+GNUNET_FS_GTK_get_thumbnail_from_meta_data (const struct
+ GNUNET_CONTAINER_MetaData *meta)
{
GdkPixbuf *pixbuf;
GdkPixbufLoader *loader;
@@ -128,55 +122,43 @@
*/
void
GNUNET_FS_GTK_mmap_and_scan (const char *filename,
- GNUNET_FS_DirectoryEntryProcessor dep,
- void *dep_cls)
+ GNUNET_FS_DirectoryEntryProcessor dep,
+ void *dep_cls)
{
struct GNUNET_DISK_FileHandle *fh;
struct GNUNET_DISK_MapHandle *mh;
uint64_t fsize;
- void * ddata;
+ void *ddata;
- if (GNUNET_OK !=
- GNUNET_DISK_file_size (filename,
- &fsize,
- GNUNET_YES))
- {
- GNUNET_break (0);
- return;
- }
- fh = GNUNET_DISK_file_open (filename,
- GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_NONE);
+ if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fsize, GNUNET_YES))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
if (fh == NULL)
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
- return;
- }
- ddata = GNUNET_DISK_file_map (fh,
- &mh,
- GNUNET_DISK_MAP_TYPE_READ,
- (size_t) fsize);
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
+ return;
+ }
+ ddata =
+ GNUNET_DISK_file_map (fh, &mh, GNUNET_DISK_MAP_TYPE_READ, (size_t)
fsize);
if (ddata == NULL)
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mmap", filename);
- GNUNET_break (GNUNET_OK ==
- GNUNET_DISK_file_close (fh));
- return;
- }
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mmap", filename);
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
+ return;
+ }
if (GNUNET_SYSERR ==
- GNUNET_FS_directory_list_contents ((size_t) fsize,
- ddata,
- 0,
- dep, dep_cls))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Selected file `%s' is not a GNUnet directory!\n"),
- filename);
- }
- GNUNET_break (GNUNET_OK ==
- GNUNET_DISK_file_unmap (mh));
- GNUNET_break (GNUNET_OK ==
- GNUNET_DISK_file_close (fh));
+ GNUNET_FS_directory_list_contents ((size_t) fsize, ddata, 0, dep,
+ dep_cls))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Selected file `%s' is not a GNUnet directory!\n"),
filename);
+ }
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_unmap (mh));
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-08-15 22:36:56 UTC (rev
16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-download.c 2011-08-15 22:37:19 UTC (rev
16585)
@@ -40,58 +40,65 @@
struct DownloadEntry *de;
GtkWidget *cb;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_download_as_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade");
if (builder == NULL)
- {
- if (dc->rr != NULL)
- gtk_tree_row_reference_free (dc->rr);
- GNUNET_free_non_null (dc->mime);
- GNUNET_free_non_null (dc->filename);
- GNUNET_FS_uri_destroy (dc->uri);
- GNUNET_free (dc);
- return;
- }
- cb = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_save_as_recursive_check_button"));
+ {
+ if (dc->rr != NULL)
+ gtk_tree_row_reference_free (dc->rr);
+ GNUNET_free_non_null (dc->mime);
+ GNUNET_free_non_null (dc->filename);
+ GNUNET_FS_uri_destroy (dc->uri);
+ GNUNET_free (dc);
+ return;
+ }
+ cb = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_save_as_recursive_check_button"));
if (GNUNET_FS_meta_data_test_for_directory (dc->meta))
gtk_widget_set_sensitive (cb, TRUE);
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_save_as_dialog"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_save_as_dialog"));
if (dc->filename != NULL)
+ {
+ char buf[1024];
+
+ if (NULL != getcwd (buf, sizeof (buf)))
{
- char buf[1024];
- if (NULL != getcwd (buf, sizeof(buf)))
- {
- if (strlen (buf) + strlen (dc->filename) + 2 < sizeof(buf))
- {
- strcat (buf, DIR_SEPARATOR_STR);
- strcat (buf, dc->filename);
- }
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad),
- buf);
- }
+ if (strlen (buf) + strlen (dc->filename) + 2 < sizeof (buf))
+ {
+ strcat (buf, DIR_SEPARATOR_STR);
+ strcat (buf, dc->filename);
+ }
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf);
}
+ }
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- if (dc->rr != NULL)
- gtk_tree_row_reference_free (dc->rr);
- GNUNET_free_non_null (dc->mime);
- GNUNET_free_non_null (dc->filename);
- GNUNET_FS_uri_destroy (dc->uri);
- GNUNET_free (dc);
- return;
- }
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ if (dc->rr != NULL)
+ gtk_tree_row_reference_free (dc->rr);
+ GNUNET_free_non_null (dc->mime);
+ GNUNET_free_non_null (dc->filename);
+ GNUNET_FS_uri_destroy (dc->uri);
+ GNUNET_free (dc);
+ return;
+ }
GNUNET_free_non_null (dc->filename);
- dc->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(ad));
- dc->is_recursive = (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(cb))) ? GNUNET_YES : GNUNET_NO;
+ dc->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+ dc->is_recursive =
+ (TRUE ==
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
+ GNUNET_NO;
fs = GNUNET_FS_GTK_get_fs_handle ();
opt = GNUNET_FS_DOWNLOAD_OPTION_NONE;
if (dc->is_recursive)
opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
- anonymity = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
+ anonymity =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
@@ -99,38 +106,29 @@
de->uri = dc->uri;
de->meta = dc->meta;
if (dc->rr != NULL)
- {
- de->rr = dc->rr;
- de->ts = GTK_TREE_STORE (gtk_tree_row_reference_get_model (dc->rr));
- }
+ {
+ de->rr = dc->rr;
+ de->ts = GTK_TREE_STORE (gtk_tree_row_reference_get_model (dc->rr));
+ }
if (dc->sr != NULL)
- {
- GNUNET_break (NULL !=
- GNUNET_FS_download_start_from_search (fs,
- dc->sr,
- dc->filename,
- NULL /* tempname */,
- 0 /* offset */,
- len,
- anonymity,
- opt,
- de));
- }
+ {
+ GNUNET_break (NULL !=
+ GNUNET_FS_download_start_from_search (fs, dc->sr,
+ dc->filename,
+ NULL /* tempname */ ,
+ 0 /* offset */ ,
+ len, anonymity, opt,
+ de));
+ }
else
- {
- GNUNET_break (NULL !=
- GNUNET_FS_download_start (fs,
- dc->uri,
- NULL /* meta */,
- dc->filename,
- NULL /* tempname */,
- 0 /* offset */,
- len,
- anonymity,
- opt,
- de,
- NULL /* parent download ctx */));
- }
+ {
+ GNUNET_break (NULL !=
+ GNUNET_FS_download_start (fs, dc->uri, NULL /* meta */ ,
+ dc->filename, NULL /* tempname */ ,
+ 0 /* offset */ ,
+ len, anonymity, opt, de,
+ NULL /* parent download ctx */ ));
+ }
GNUNET_free (dc);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -55,16 +55,16 @@
GtkTreeModel *tm;
GtkTreeIter iter;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_list_store_remove (GTK_LIST_STORE (tm),
- &iter);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
}
void
@@ -75,10 +75,11 @@
GtkListStore *ls;
GtkTreeIter iter;
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_keyword_list_store"));
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_entry"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_keyword_list_store"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_file_information_keyword_entry"));
keyword = gtk_entry_get_text (entry);
if (strlen (keyword) > 0)
gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, -1);
@@ -93,78 +94,92 @@
GtkEntry *entry;
GtkWidget *button;
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_add_button"));
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_entry"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_add_button"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_file_information_keyword_entry"));
keyword = gtk_entry_get_text (entry);
- gtk_widget_set_sensitive (button,
- (strlen (keyword) > 0) ? TRUE : FALSE);
+ gtk_widget_set_sensitive (button, (strlen (keyword) > 0) ? TRUE : FALSE);
}
static void
-metadata_selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+metadata_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkWidget *button;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_delete_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_delete_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
}
static void
-keyword_selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+keyword_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkWidget *button;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_del_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_del_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_normalize_button"));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_normalize_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
}
void
GNUNET_GTK_edit_file_information_metadata_value_entry_changed_cb ()
-{
+{
GtkTreeView *tv;
GtkTreeSelection *sel;
const char *value;
GtkEntry *entry;
GtkWidget *button;
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_value_entry"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_value_entry"));
value = gtk_entry_get_text (entry);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_add_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_add_button"));
gtk_widget_set_sensitive (button,
- (strlen (value) > 0)
- ? gtk_tree_selection_get_selected (sel, NULL, NULL)
- : FALSE);
+ (strlen (value) >
+ 0) ? gtk_tree_selection_get_selected (sel, NULL,
+ NULL) :
+ FALSE);
}
@@ -175,39 +190,39 @@
}
-void
-GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button_file_set_cb
(GtkFileChooserButton *widget,
-
gpointer user_data)
+void
GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button_file_set_cb
(GtkFileChooserButton * widget, gpointer user_data)
{
gchar *fn;
GtkImage *image;
fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
- image = GTK_IMAGE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_preview_image"));
+ image =
+ GTK_IMAGE (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_preview_image"));
gtk_image_set_from_file (image, fn);
preview_changed = GNUNET_YES;
}
void
-GNUNET_GTK_edit_file_information_metadata_delete_button_clicked_cb()
+GNUNET_GTK_edit_file_information_metadata_delete_button_clicked_cb ()
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkTreeModel *tm;
GtkTreeIter iter;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_list_store_remove (GTK_LIST_STORE (tm),
- &iter);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
}
@@ -227,70 +242,63 @@
size_t slen;
char *pos;
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_value_entry"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_value_entry"));
value = gtk_entry_get_text (entry);
if ((value == NULL) || (strlen (value) == 0))
- {
- GNUNET_break (0);
- return;
- }
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
tm = gtk_tree_view_get_model (tv);
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 1, &type, -1);
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ if ((type == EXTRACTOR_METATYPE_FILENAME) &&
+ (value[strlen (value) - 1] != '/') && (is_directory))
+ {
+ GNUNET_asprintf (&avalue, "%s/", value);
+ /* if user typed '\' instead of '/', change it! */
+ slen = strlen (avalue);
+ while ((slen > 1) && (avalue[slen - 2] == '\\'))
{
- GNUNET_break (0);
- return;
+ avalue[slen - 2] = '/';
+ avalue[slen - 1] = '\0';
+ slen--;
}
- gtk_tree_model_get (tm,
- &iter,
- 1, &type, -1);
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- if ( (type == EXTRACTOR_METATYPE_FILENAME) &&
- (value[strlen(value)-1] != '/') &&
- (is_directory) )
- {
- GNUNET_asprintf (&avalue,
- "%s/",
- value);
- /* if user typed '\' instead of '/', change it! */
- slen = strlen (avalue);
- while ( (slen > 1) &&
- (avalue[slen-2] == '\\') )
- {
- avalue[slen-2] = '/';
- avalue[slen-1] = '\0';
- slen--;
- }
- while (NULL != (pos = strstr (avalue, "\\")))
- *pos = '/';
- /* remove '../' everywhere */
- while (NULL != (pos = strstr (avalue, "../")))
- {
- pos[0] = '_';
- pos[1] = '_';
- pos[2] = '_';
- }
- ivalue = avalue;
+ while (NULL != (pos = strstr (avalue, "\\")))
+ *pos = '/';
+ /* remove '../' everywhere */
+ while (NULL != (pos = strstr (avalue, "../")))
+ {
+ pos[0] = '_';
+ pos[1] = '_';
+ pos[2] = '_';
}
+ ivalue = avalue;
+ }
else
- {
- ivalue = value;
- avalue = NULL;
- }
+ {
+ ivalue = value;
+ avalue = NULL;
+ }
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT,
- 0, type,
- 1, (guint) EXTRACTOR_METAFORMAT_UTF8,
- 2, EXTRACTOR_metatype_to_string (type),
- 3, ivalue,
- -1);
- GNUNET_free_non_null (avalue);
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, type, 1,
+ (guint) EXTRACTOR_METAFORMAT_UTF8, 2,
+ EXTRACTOR_metatype_to_string (type), 3,
+ ivalue, -1);
+ GNUNET_free_non_null (avalue);
gtk_entry_set_text (GTK_ENTRY (entry), "");
}
@@ -304,19 +312,14 @@
* @return GNUNET_OK to continue to iterate
*/
static int
-add_keyword (void *cls,
- const char *keyword,
- int is_mandatory)
+add_keyword (void *cls, const char *keyword, int is_mandatory)
{
GtkListStore *ls;
GtkTreeIter iter;
-
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_keyword_list_store"));
- gtk_list_store_insert_with_values (ls, &iter,
- G_MAXINT,
- 0, keyword,
- -1);
+
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_keyword_list_store"));
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, -1);
return GNUNET_OK;
}
@@ -337,40 +340,33 @@
* @param data actual meta-data found
* @param data_len number of bytes in data
* @return 0 to continue extracting
- */
+ */
static int
-add_meta_item (void *cls,
- const char *plugin_name,
- enum EXTRACTOR_MetaType type,
- enum EXTRACTOR_MetaFormat format,
- const char *data_mime_type,
- const char *data,
- size_t data_len)
+add_meta_item (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType
type,
+ enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
+ const char *data, size_t data_len)
{
GtkListStore *ls;
GtkTreeIter iter;
-
+
switch (format)
- {
- case EXTRACTOR_METAFORMAT_UTF8:
- case EXTRACTOR_METAFORMAT_C_STRING:
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- gtk_list_store_insert_with_values (ls, &iter,
- G_MAXINT,
- 0, (guint) type,
- 1, (guint) format,
- 2, EXTRACTOR_metatype_to_string (type),
- 3, data,
- -1);
- break;
- case EXTRACTOR_METAFORMAT_UNKNOWN:
- break;
- case EXTRACTOR_METAFORMAT_BINARY:
- break;
- default:
- GNUNET_break (0);
- }
+ {
+ case EXTRACTOR_METAFORMAT_UTF8:
+ case EXTRACTOR_METAFORMAT_C_STRING:
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, (guint) type, 1,
+ (guint) format, 2,
+ EXTRACTOR_metatype_to_string (type), 3,
+ data, -1);
+ break;
+ case EXTRACTOR_METAFORMAT_UNKNOWN:
+ break;
+ case EXTRACTOR_METAFORMAT_BINARY:
+ break;
+ default:
+ GNUNET_break (0);
+ }
return 0;
}
@@ -388,15 +384,13 @@
* @param client_info pointer to client context set upon creation (can be
modified)
* @return GNUNET_SYSERR (aborts after first call)
*/
-static int
-file_information_extract (void *cls,
- struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
- struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
- int *do_index,
- void **client_info)
+static int
+file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
+ uint64_t length,
+ struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
{
GtkImage *img;
GdkPixbuf *pixbuf;
@@ -407,38 +401,45 @@
if (NULL != *uri)
GNUNET_FS_uri_ksk_get_keywords (*uri, &add_keyword, NULL);
if (NULL != meta)
+ {
+ GNUNET_CONTAINER_meta_data_iterate (meta, &add_meta_item, NULL);
+ pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
+ if (pixbuf != NULL)
{
- GNUNET_CONTAINER_meta_data_iterate (meta,
- &add_meta_item,
- NULL);
- pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
- if (pixbuf != NULL)
- {
- img = GTK_IMAGE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_preview_image"));
- gtk_image_set_from_pixbuf (img,
- pixbuf);
- }
+ img =
+ GTK_IMAGE (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_metadata_preview_image"));
+ gtk_image_set_from_pixbuf (img, pixbuf);
}
- tp = bo->expiration_time.abs_value / 1000; /* ms to seconds */
+ }
+ tp = bo->expiration_time.abs_value / 1000; /* ms to seconds */
t = gmtime (&tp);
if (t == NULL)
year = 0;
else
year = t->tm_year + 1900;
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_expiration_year_spin_button")),
- year);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_anonymity_spin_button")),
- bo->anonymity_level);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_priority_spin_button")),
- bo->content_priority);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder,
-
"GNUNET_GTK_edit_file_information_index_check_button")),
- *do_index);
- return GNUNET_SYSERR; /* only visit top-level item */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_expiration_year_spin_button")),
+ year);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_anonymity_spin_button")),
+ bo->anonymity_level);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_priority_spin_button")),
+ bo->content_priority);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_index_check_button")),
+ *do_index);
+ return GNUNET_SYSERR; /* only visit top-level item */
}
@@ -458,70 +459,62 @@
* @param data actual meta-data found
* @param data_len number of bytes in data
* @return 0 to continue extracting
- */
+ */
static int
-preserve_meta_items (void *cls,
- const char *plugin_name,
- enum EXTRACTOR_MetaType type,
- enum EXTRACTOR_MetaFormat format,
- const char *data_mime_type,
- const char *data,
- size_t data_len)
+preserve_meta_items (void *cls, const char *plugin_name,
+ enum EXTRACTOR_MetaType type,
+ enum EXTRACTOR_MetaFormat format,
+ const char *data_mime_type, const char *data,
+ size_t data_len)
{
struct GNUNET_CONTAINER_MetaData *md = cls;
GtkTreeModel *tm;
GtkTreeIter iter;
gchar *value;
- guint ntype;
+ guint ntype;
guint nformat;
int keep;
-
+
keep = GNUNET_NO;
switch (format)
+ {
+ case EXTRACTOR_METAFORMAT_UTF8:
+ case EXTRACTOR_METAFORMAT_C_STRING:
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
{
- case EXTRACTOR_METAFORMAT_UTF8:
- case EXTRACTOR_METAFORMAT_C_STRING:
- tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
- {
- do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &ntype,
- 1, &nformat,
- 3, &value,
- -1);
- if ( (ntype == type) &&
- (nformat == format) &&
- (0 == strcmp (value, data)) )
- {
- gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
- keep = GNUNET_YES;
- g_free (value);
- break;
- }
- g_free (value);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
- }
- break;
- case EXTRACTOR_METAFORMAT_UNKNOWN:
- break;
- case EXTRACTOR_METAFORMAT_BINARY:
- if (preview_changed == GNUNET_NO)
- keep = GNUNET_YES;
- break;
- default:
- GNUNET_break (0);
- break;
+ do
+ {
+ gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
+ if ((ntype == type) && (nformat == format) &&
+ (0 == strcmp (value, data)))
+ {
+ gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
+ keep = GNUNET_YES;
+ g_free (value);
+ break;
+ }
+ g_free (value);
+ }
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
+ break;
+ case EXTRACTOR_METAFORMAT_UNKNOWN:
+ break;
+ case EXTRACTOR_METAFORMAT_BINARY:
+ if (preview_changed == GNUNET_NO)
+ keep = GNUNET_YES;
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
if (GNUNET_YES == keep)
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_meta_data_insert (md,
- plugin_name, type, format,
- data_mime_type, data,
data_len));
+ GNUNET_CONTAINER_meta_data_insert (md, plugin_name, type,
+ format, data_mime_type,
+ data, data_len));
return 0;
}
@@ -539,15 +532,13 @@
* @param client_info pointer to client context set upon creation (can be
modified)
* @return GNUNET_SYSERR (aborts after first call)
*/
-static int
-file_information_update (void *cls,
- struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
- struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
- int *do_index,
- void **client_info)
+static int
+file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
+ uint64_t length,
+ struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
{
char **short_fn = cls;
struct GNUNET_CONTAINER_MetaData *nm;
@@ -556,7 +547,7 @@
struct GNUNET_FS_Uri *nxt;
struct GNUNET_FS_Uri *mrg;
gchar *value;
- guint ntype;
+ guint ntype;
guint nformat;
GtkSpinButton *sb;
gchar *fn;
@@ -565,15 +556,25 @@
const char *mime;
GFile *f;
GFileInfo *finfo;
-
- bo->anonymity_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_anonymity_spin_button")));
- bo->content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_priority_spin_button")));
- *do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_index_check_button")));
- sb =GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_expiration_year_spin_button"));
+
+ bo->anonymity_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_anonymity_spin_button")));
+ bo->content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_priority_spin_button")));
+ *do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_index_check_button")));
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_expiration_year_spin_button"));
bo->expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
/* update URI */
if (NULL != (*uri))
@@ -581,95 +582,83 @@
*uri = NULL;
nxt = NULL;
mrg = NULL;
-
- tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
-
"GNUNET_GTK_keyword_list_store"));
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (builder, "GNUNET_GTK_keyword_list_store"));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &value,
- -1);
- nxt = GNUNET_FS_uri_ksk_create_from_args (1, (const char**) &value);
- mrg = GNUNET_FS_uri_ksk_merge (nxt, *uri);
- GNUNET_FS_uri_destroy (nxt);
- if (NULL != *uri)
- GNUNET_FS_uri_destroy (*uri);
- *uri = mrg;
- g_free (value);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 0, &value, -1);
+ nxt = GNUNET_FS_uri_ksk_create_from_args (1, (const char **) &value);
+ mrg = GNUNET_FS_uri_ksk_merge (nxt, *uri);
+ GNUNET_FS_uri_destroy (nxt);
+ if (NULL != *uri)
+ GNUNET_FS_uri_destroy (*uri);
+ *uri = mrg;
+ g_free (value);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
/* update meta */
nm = GNUNET_CONTAINER_meta_data_create ();
- GNUNET_CONTAINER_meta_data_iterate (meta,
- &preserve_meta_items,
- nm);
+ GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, nm);
GNUNET_CONTAINER_meta_data_clear (meta);
- tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &ntype,
- 1, &nformat,
- 3, &value,
- -1);
- GNUNET_CONTAINER_meta_data_insert (nm,
- "<user>",
- ntype,
- nformat,
- "text/plain",
- value,
- strlen (value)+1);
- g_free (value);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
+ GNUNET_CONTAINER_meta_data_insert (nm, "<user>", ntype, nformat,
+ "text/plain", value,
+ strlen (value) + 1);
+ g_free (value);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
GNUNET_CONTAINER_meta_data_merge (meta, nm);
if (preview_changed == GNUNET_YES)
+ {
+ fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button")));
+ f = g_file_new_for_path (fn);
+ finfo =
+ g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0, NULL,
+ NULL);
+ if (FALSE == g_file_load_contents (f, NULL, &data, &data_size, NULL, NULL))
{
- fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button")));
- f = g_file_new_for_path (fn);
- finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0,
NULL, NULL);
- if (FALSE == g_file_load_contents (f, NULL, &data, &data_size, NULL,
NULL))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Could not load preview `%s' into memory\n"),
- fn);
- }
- else
- {
- mime = g_file_info_get_attribute_string (finfo,
-
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<user>",
- EXTRACTOR_METATYPE_THUMBNAIL,
- EXTRACTOR_METAFORMAT_BINARY,
- mime,
- data,
- data_size);
- }
- g_object_unref (finfo);
- g_object_unref (f);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Could not load preview `%s' into memory\n"), fn);
}
+ else
+ {
+ mime =
+ g_file_info_get_attribute_string (finfo,
+
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+ GNUNET_CONTAINER_meta_data_insert (meta, "<user>",
+ EXTRACTOR_METATYPE_THUMBNAIL,
+ EXTRACTOR_METAFORMAT_BINARY, mime,
+ data, data_size);
+ }
+ g_object_unref (finfo);
+ g_object_unref (f);
+ }
GNUNET_CONTAINER_meta_data_destroy (nm);
-
+
/* update short_fn */
GNUNET_free_non_null (*short_fn);
- *short_fn = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_FILENAME,
- -1);
+ *short_fn =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+
EXTRACTOR_METATYPE_FILENAME,
+ -1);
/* FIXME: update expiration time? (not yet in dialog!) */
- return GNUNET_SYSERR; /* only visit top-level item */
+ return GNUNET_SYSERR; /* only visit top-level item */
}
@@ -677,11 +666,9 @@
* Open the dialog to edit file information data.
*/
void
-GNUNET_FS_GTK_edit_publish_dialog (int *do_index,
- char **short_fn,
- guint *anonymity_level,
- guint *priority,
- struct GNUNET_FS_FileInformation *fip)
+GNUNET_FS_GTK_edit_publish_dialog (int *do_index, char **short_fn,
+ guint * anonymity_level, guint * priority,
+ struct GNUNET_FS_FileInformation *fip)
{
GtkWidget *ad;
GtkListStore *ls;
@@ -692,77 +679,92 @@
GtkTreeSelection *sel;
GNUNET_assert (builder == NULL);
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_edit_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_edit_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
preview_changed = GNUNET_NO;
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
if (GNUNET_FS_file_information_is_directory (fip))
- {
- /* indexing does not apply to directories */
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_index_check_button")));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_index_label")));
-
- }
+ {
+ /* indexing does not apply to directories */
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_index_check_button")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_index_label")));
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_metatype_list_store"));
+ }
+
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_edit_file_information_dialog"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_metatype_list_store"));
max_type = EXTRACTOR_metatype_get_max ();
- type = 1;
+ type = 1;
while (type < max_type - 1)
- {
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT,
- 0, EXTRACTOR_metatype_to_string (type),
- 1, type,
- 2, EXTRACTOR_metatype_to_description
(type),
- -1);
- type++;
- }
+ {
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0,
+ EXTRACTOR_metatype_to_string (type), 1,
+ type, 2,
+ EXTRACTOR_metatype_to_description
(type),
+ -1);
+ type++;
+ }
- GNUNET_FS_file_information_inspect (fip,
- &file_information_extract,
- NULL);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
+ GNUNET_FS_file_information_inspect (fip, &file_information_extract, NULL);
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_metadata_type_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
-
G_CALLBACK(GNUNET_GTK_edit_file_information_metadata_value_entry_changed_cb),
NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK
+
(GNUNET_GTK_edit_file_information_metadata_value_entry_changed_cb),
+ NULL);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_edit_file_information_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(metadata_selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (metadata_selection_changed_cb), NULL);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(keyword_selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (keyword_selection_changed_cb), NULL);
gtk_window_set_title (GTK_WINDOW (ad), *short_fn);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- builder = NULL;
- return;
- }
- GNUNET_FS_file_information_inspect (fip,
- &file_information_update,
- short_fn);
- *anonymity_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_anonymity_spin_button")));
- *priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_priority_spin_button")));
- *do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_edit_file_information_index_check_button")));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ builder = NULL;
+ return;
+ }
+ GNUNET_FS_file_information_inspect (fip, &file_information_update, short_fn);
+ *anonymity_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_anonymity_spin_button")));
+ *priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_priority_spin_button")));
+ *do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_file_information_index_check_button")));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
builder = NULL;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -66,19 +66,19 @@
/**
* Tab storing this entry.
- */
+ */
struct PublishTab *tab;
/**
* Where in the tab is this entry?
- */
+ */
GtkTreeRowReference *rr;
/**
* URI of the file (set after completion).
- */
+ */
struct GNUNET_FS_Uri *uri;
-
+
int is_top;
};
@@ -87,12 +87,12 @@
{
/**
* Where in the tab is this result?
- */
+ */
GtkTreeRowReference *rr;
/**
* Tab storing this result.
- */
+ */
struct SearchTab *tab;
/**
@@ -115,59 +115,51 @@
static struct DownloadEntry *
-change_download_colour (struct DownloadEntry *de,
- const char *colour)
+change_download_colour (struct DownloadEntry *de, const char *colour)
{
GtkTreeIter iter;
GtkTreePath *path;
-
+
path = gtk_tree_row_reference_get_path (de->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return de;
- }
+ if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return de;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (de->ts, &iter,
- 8, colour,
- -1);
+ gtk_tree_store_set (de->ts, &iter, 8, colour, -1);
return de;
}
static struct PublishEntry *
-change_publish_colour (struct PublishEntry *pe,
- const char *colour)
+change_publish_colour (struct PublishEntry *pe, const char *colour)
{
GtkTreeIter iter;
GtkTreePath *path;
if (pe == NULL)
- {
- GNUNET_break (0);
- return NULL;
- }
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
path = gtk_tree_row_reference_get_path (pe->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return pe;
- }
+ if (TRUE !=
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return pe;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (pe->tab->ts, &iter,
- 2, colour,
- -1);
+ gtk_tree_store_set (pe->tab->ts, &iter, 2, colour, -1);
return pe;
}
-static void
-stop_download (struct DownloadEntry *de,
- int is_suspend)
+static void
+stop_download (struct DownloadEntry *de, int is_suspend)
{
change_download_colour (de, "white");
gtk_tree_row_reference_free (de->rr);
@@ -187,7 +179,7 @@
/**
* Row reference of parent (the directory).
- */
+ */
GtkTreeRowReference *prr;
int check_duplicates;
@@ -210,13 +202,11 @@
* embedded with the directory itself).
* @param data data available for the file (length bytes)
*/
-static void
-add_directory_entry (void *cls,
- const char *filename,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- size_t length,
- const void *data)
+static void
+add_directory_entry (void *cls, const char *filename,
+ const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ size_t length, const void *data)
{
struct AddDirectoryEntryContext *ade = cls;
GtkTreeIter iter;
@@ -226,168 +216,144 @@
struct GNUNET_FS_Uri *xuri;
if (uri == NULL)
+ {
+ /* directory meta data itself */
+ /* FIXME: consider merging it in... */
+ return;
+ }
+ if (ade->check_duplicates == GNUNET_YES)
+ {
+ path = gtk_tree_row_reference_get_path (ade->prr);
+ tm = gtk_tree_row_reference_get_model (ade->prr);
+ if (TRUE != gtk_tree_model_get_iter (tm, &piter, path))
{
- /* directory meta data itself */
- /* FIXME: consider merging it in... */
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
return;
}
- if (ade->check_duplicates == GNUNET_YES)
+ gtk_tree_path_free (path);
+ if (TRUE == gtk_tree_model_iter_children (tm, &iter, &piter))
{
- path = gtk_tree_row_reference_get_path (ade->prr);
- tm = gtk_tree_row_reference_get_model (ade->prr);
- if (TRUE != gtk_tree_model_get_iter (tm,
- &piter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return;
- }
- gtk_tree_path_free (path);
- if (TRUE == gtk_tree_model_iter_children (tm,
- &iter,
- &piter))
- {
- do
- {
- gtk_tree_model_get (tm,
- &iter,
- 1, &xuri,
- -1);
- if (GNUNET_YES ==
- GNUNET_FS_uri_test_equal (xuri, uri))
- return; /* already present */
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
- }
+ do
+ {
+ gtk_tree_model_get (tm, &iter, 1, &xuri, -1);
+ if (GNUNET_YES == GNUNET_FS_uri_test_equal (xuri, uri))
+ return; /* already present */
+ }
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
- GNUNET_GTK_add_search_result (ade->de->tab,
- &iter,
- ade->prr,
- uri,
- meta,
- NULL,
- 0);
+ }
+ GNUNET_GTK_add_search_result (ade->de->tab, &iter, ade->prr, uri, meta, NULL,
+ 0);
}
static struct DownloadEntry *
-mark_download_progress (struct DownloadEntry *de,
- uint64_t size,
- uint64_t completed,
- const void *block_data,
- uint64_t offset,
- uint64_t block_size,
- unsigned int depth)
+mark_download_progress (struct DownloadEntry *de, uint64_t size,
+ uint64_t completed, const void *block_data,
+ uint64_t offset, uint64_t block_size,
+ unsigned int depth)
{
struct AddDirectoryEntryContext ade;
GtkTreeIter iter;
GtkTreePath *path;
-
+
path = gtk_tree_row_reference_get_path (de->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return de;
- }
+ if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return de;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (de->ts, &iter,
- 4, (guint) ((size > 0) ? (100 * completed / size) : 100)
/* progress */,
- -1);
- if ( (depth == 0) &&
- (block_size > 0) &&
- (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) )
+ gtk_tree_store_set (de->ts, &iter, 4,
+ (guint) ((size >
+ 0) ? (100 * completed /
+ size) : 100) /* progress */ ,
+ -1);
+ if ((depth == 0) && (block_size > 0) &&
+ (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)))
+ {
+ ade.de = de;
+ ade.prr = de->rr;
+ ade.check_duplicates = GNUNET_NO;
+ if (GNUNET_SYSERR ==
+ GNUNET_FS_directory_list_contents ((size_t) block_size, block_data,
+ offset, &add_directory_entry, &ade))
{
- ade.de = de;
- ade.prr = de->rr;
- ade.check_duplicates = GNUNET_NO;
- if (GNUNET_SYSERR ==
- GNUNET_FS_directory_list_contents ((size_t) block_size,
- block_data,
- offset,
- &add_directory_entry,
- &ade))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Metadata wrongly claims that this is a GNUnet
directory!\n"));
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Metadata wrongly claims that this is a GNUnet
directory!\n"));
}
+ }
return de;
}
static struct DownloadEntry *
-mark_download_error (struct DownloadEntry *de,
- const char *emsg)
+mark_download_error (struct DownloadEntry *de, const char *emsg)
{
GtkTreeIter iter;
GtkTreePath *path;
- de = change_download_colour (de,
- "red");
- de->is_done = GNUNET_YES;
+ de = change_download_colour (de, "red");
+ de->is_done = GNUNET_YES;
path = gtk_tree_row_reference_get_path (de->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->tab->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return de;
- }
+ if (TRUE !=
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (de->tab->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return de;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (de->tab->ts, &iter,
- 4, 0,
- 7, emsg,
- -1);
+ gtk_tree_store_set (de->tab->ts, &iter, 4, 0, 7, emsg, -1);
return de;
}
static struct DownloadEntry *
-mark_download_completed (struct DownloadEntry *de,
- uint64_t size,
- const char *filename)
+mark_download_completed (struct DownloadEntry *de, uint64_t size,
+ const char *filename)
{
struct AddDirectoryEntryContext ade;
-
+
de->is_done = GNUNET_YES;
(void) mark_download_progress (de, size, size, NULL, 0, 0, 0);
- if ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
- (filename != NULL) )
- {
- ade.de = de;
- ade.prr = de->rr;
- ade.check_duplicates = GNUNET_NO;
- GNUNET_FS_GTK_mmap_and_scan (filename,
- &add_directory_entry,
- &ade);
- }
+ if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
+ (filename != NULL))
+ {
+ ade.de = de;
+ ade.prr = de->rr;
+ ade.check_duplicates = GNUNET_NO;
+ GNUNET_FS_GTK_mmap_and_scan (filename, &add_directory_entry, &ade);
+ }
(void) change_download_colour (de, "green");
return de;
}
static struct PublishEntry *
-mark_publish_progress (struct PublishEntry *pe,
- uint64_t size,
- uint64_t completed)
+mark_publish_progress (struct PublishEntry *pe, uint64_t size,
+ uint64_t completed)
{
GtkTreeIter iter;
GtkTreePath *path;
-
+
path = gtk_tree_row_reference_get_path (pe->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return pe;
- }
+ if (TRUE !=
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return pe;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (pe->tab->ts, &iter,
- 3, (guint) ((size > 0) ? (100 * completed / size) : 100)
/* progress */,
- -1);
+ gtk_tree_store_set (pe->tab->ts, &iter, 3,
+ (guint) ((size >
+ 0) ? (100 * completed /
+ size) : 100) /* progress */ ,
+ -1);
return pe;
}
@@ -403,10 +369,8 @@
* to refer to the new model.
*/
static void
-move_children (GtkTreeModel *src_model,
- GtkTreeIter *src_iter,
- GtkTreeModel *dst_model,
- GtkTreeIter *dst_iter)
+move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
+ GtkTreeModel * dst_model, GtkTreeIter * dst_iter)
{
GtkTreeIter src_child;
GtkTreeIter dst_child;
@@ -424,76 +388,49 @@
gchar *mimetype;
guint applicability_rank;
guint availability_certainty;
- gint availability_rank;
+ gint availability_rank;
- if (TRUE == gtk_tree_model_iter_children (src_model,
- &src_child,
- src_iter))
+ if (TRUE == gtk_tree_model_iter_children (src_model, &src_child, src_iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (src_model,
- &src_child,
- 0, &meta,
- 1, &uri,
- 2, &filesize,
- 3, &preview,
- 4, &percent_progress,
- 5, &percent_availability,
- 6, &filename,
- 7, &uri_as_string,
- 8, &status_colour,
- 9, &search_result,
- 10, &mimetype,
- 11, &applicability_rank,
- 12, &availability_certainty,
- 13, &availability_rank,
- -1);
- gtk_tree_store_insert_with_values (GTK_TREE_STORE (dst_model),
- &dst_child,
- dst_iter,
- G_MAXINT,
- 0, meta,
- 1, uri,
- 2, filesize,
- 3, preview,
- 4, percent_progress,
- 5, percent_availability,
- 6, filename,
- 7, uri_as_string,
- 8, status_colour,
- 9, search_result,
- 10, mimetype,
- 11, applicability_rank,
- 12, availability_certainty,
- 13, availability_rank,
- -1);
- g_free (filename);
- g_free (uri_as_string);
- g_free (status_colour);
- g_free (mimetype);
- if (preview != NULL)
- g_object_unref (preview);
- gtk_tree_row_reference_free (search_result->rr);
- path = gtk_tree_model_get_path (dst_model,
- &dst_child);
- search_result->rr = gtk_tree_row_reference_new (dst_model,
- path);
- gtk_tree_path_free (path);
- if (search_result->download != NULL)
- {
- search_result->download->ts = GTK_TREE_STORE (dst_model);
- gtk_tree_row_reference_free (search_result->download->rr);
- search_result->download->rr = gtk_tree_row_reference_copy
(search_result->rr);
- }
- move_children (src_model,
- &src_child,
- dst_model,
- &dst_child);
- }
- while (TRUE == gtk_tree_model_iter_next (src_model,
- &src_child));
+ gtk_tree_model_get (src_model, &src_child, 0, &meta, 1, &uri, 2,
+ &filesize, 3, &preview, 4, &percent_progress, 5,
+ &percent_availability, 6, &filename, 7,
+ &uri_as_string, 8, &status_colour, 9, &search_result,
+ 10, &mimetype, 11, &applicability_rank, 12,
+ &availability_certainty, 13, &availability_rank, -1);
+ gtk_tree_store_insert_with_values (GTK_TREE_STORE (dst_model),
&dst_child,
+ dst_iter, G_MAXINT, 0, meta, 1, uri,
2,
+ filesize, 3, preview, 4,
+ percent_progress, 5,
+ percent_availability, 6, filename, 7,
+ uri_as_string, 8, status_colour, 9,
+ search_result, 10, mimetype, 11,
+ applicability_rank, 12,
+ availability_certainty, 13,
+ availability_rank, -1);
+ g_free (filename);
+ g_free (uri_as_string);
+ g_free (status_colour);
+ g_free (mimetype);
+ if (preview != NULL)
+ g_object_unref (preview);
+ gtk_tree_row_reference_free (search_result->rr);
+ path = gtk_tree_model_get_path (dst_model, &dst_child);
+ search_result->rr = gtk_tree_row_reference_new (dst_model, path);
+ gtk_tree_path_free (path);
+ if (search_result->download != NULL)
+ {
+ search_result->download->ts = GTK_TREE_STORE (dst_model);
+ gtk_tree_row_reference_free (search_result->download->rr);
+ search_result->download->rr =
+ gtk_tree_row_reference_copy (search_result->rr);
+ }
+ move_children (src_model, &src_child, dst_model, &dst_child);
}
+ while (TRUE == gtk_tree_model_iter_next (src_model, &src_child));
+ }
}
@@ -503,17 +440,13 @@
* model's fields (since they have been moved).
*/
static void
-delete_stale_subtree (GtkTreeModel *model,
- GtkTreeIter *iter)
+delete_stale_subtree (GtkTreeModel * model, GtkTreeIter * iter)
{
GtkTreeIter child;
- while (TRUE == gtk_tree_model_iter_children (model,
- &child,
- iter))
+ while (TRUE == gtk_tree_model_iter_children (model, &child, iter))
delete_stale_subtree (model, &child);
- gtk_tree_store_remove (GTK_TREE_STORE (model),
- iter);
+ gtk_tree_store_remove (GTK_TREE_STORE (model), iter);
}
@@ -522,10 +455,8 @@
* search parent by moving it to the URI tab.
*/
static struct DownloadEntry *
-download_lost_parent (struct DownloadEntry *de,
- uint64_t size,
- uint64_t completed,
- int is_active)
+download_lost_parent (struct DownloadEntry *de, uint64_t size,
+ uint64_t completed, int is_active)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -536,42 +467,30 @@
rr_old = de->rr;
de->sr = NULL;
- tab = GNUNET_GTK_add_to_uri_tab (&iter,
- NULL,
- de->meta,
- de->uri);
+ tab = GNUNET_GTK_add_to_uri_tab (&iter, NULL, de->meta, de->uri);
de->ts = tab->ts;
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts),
- &iter);
- de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts),
- path);
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts), &iter);
+ de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts), path);
gtk_tree_path_free (path);
- mark_download_progress (de, size, completed,
- NULL, 0, 0, 0);
+ mark_download_progress (de, size, completed, NULL, 0, 0, 0);
tm_old = gtk_tree_row_reference_get_model (rr_old);
- path = gtk_tree_row_reference_get_path (rr_old);
+ path = gtk_tree_row_reference_get_path (rr_old);
gtk_tree_row_reference_free (rr_old);
- gtk_tree_model_get_iter (tm_old,
- &iter_old,
- path);
+ gtk_tree_model_get_iter (tm_old, &iter_old, path);
gtk_tree_path_free (path);
- move_children (tm_old,
- &iter_old,
- GTK_TREE_MODEL (de->ts),
- &iter);
- delete_stale_subtree (tm_old,
- &iter_old);
+ move_children (tm_old, &iter_old, GTK_TREE_MODEL (de->ts), &iter);
+ delete_stale_subtree (tm_old, &iter_old);
if (size > completed)
- {
- if (is_active)
- change_download_colour (de, "yellow");
- else
- change_download_colour (de, "blue");
- }
+ {
+ if (is_active)
+ change_download_colour (de, "yellow");
+ else
+ change_download_colour (de, "blue");
+ }
else
- {
- change_download_colour (de, "green");
- }
+ {
+ change_download_colour (de, "green");
+ }
return de;
}
@@ -589,63 +508,55 @@
* @param completed current progress
*/
static struct DownloadEntry *
-setup_download (struct DownloadEntry *de,
- struct DownloadEntry *pde,
- struct SearchResult *sr,
- struct GNUNET_FS_DownloadContext *dc,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- uint64_t size,
- uint64_t completed)
+setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
+ struct SearchResult *sr, struct GNUNET_FS_DownloadContext *dc,
+ const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta, uint64_t size,
+ uint64_t completed)
{
GtkTreeIter iter;
GtkTreePath *path;
if (de == NULL)
- {
- de = GNUNET_malloc (sizeof (struct DownloadEntry));
- GNUNET_assert (sr->download == NULL);
- sr->download = de;
- de->sr = sr;
- de->dc = dc;
- de->uri = GNUNET_FS_uri_dup (uri);
- }
+ {
+ de = GNUNET_malloc (sizeof (struct DownloadEntry));
+ GNUNET_assert (sr->download == NULL);
+ sr->download = de;
+ de->sr = sr;
+ de->dc = dc;
+ de->uri = GNUNET_FS_uri_dup (uri);
+ }
de->pde = pde;
- if ( (meta != NULL) &&
- (de->meta == NULL) )
+ if ((meta != NULL) && (de->meta == NULL))
de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
if (sr != NULL)
- {
- de->rr = gtk_tree_row_reference_copy (sr->rr);
- de->ts = sr->tab->ts;
- de->tab = sr->tab;
- }
+ {
+ de->rr = gtk_tree_row_reference_copy (sr->rr);
+ de->ts = sr->tab->ts;
+ de->tab = sr->tab;
+ }
else if (de->rr == NULL)
- {
- de->tab = GNUNET_GTK_add_to_uri_tab (&iter,
- NULL,
- meta,
- uri);
- de->ts = de->tab->ts;
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts),
- &iter);
- de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts),
- path);
- gtk_tree_path_free (path);
- }
+ {
+ de->tab = GNUNET_GTK_add_to_uri_tab (&iter, NULL, meta, uri);
+ de->ts = de->tab->ts;
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts), &iter);
+ de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts), path);
+ gtk_tree_path_free (path);
+ }
path = gtk_tree_row_reference_get_path (de->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts),
- &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return de;
- }
+ if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return de;
+ }
gtk_tree_path_free (path);
- gtk_tree_store_set (de->ts, &iter,
- 4, (guint) ((size > 0) ? (100 * completed / size) : 100)
/* progress */,
- 8, "blue" /* status colour: pending */,
- -1);
+ gtk_tree_store_set (de->ts, &iter, 4,
+ (guint) ((size >
+ 0) ? (100 * completed /
+ size) : 100) /* progress */ ,
+ 8, "blue" /* status colour: pending */ ,
+ -1);
return de;
}
@@ -655,10 +566,8 @@
* "save as" window.
*/
static void
-start_download (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- gpointer user_data)
+start_download (GtkTreeView * tree_view, GtkTreePath * path,
+ GtkTreeViewColumn * column, gpointer user_data)
{
struct SearchTab *tab = user_data;
GtkTreeModel *tm;
@@ -672,16 +581,11 @@
GNUNET_assert (tab != NULL);
tm = gtk_tree_view_get_model (tree_view);
if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_model_get (tm, &iter,
- 0, &meta,
- 1, &uri,
- 9, &sr,
- 10, &mime,
- -1);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1);
dlc = GNUNET_malloc (sizeof (struct DownloadContext));
dlc->uri = GNUNET_FS_uri_dup (uri);
dlc->mime = (NULL != mime) ? GNUNET_strdup (mime) : NULL;
@@ -710,23 +614,22 @@
* Download was selected in the current search context menu.
*/
static void
-start_download_ctx_menu (gpointer user_data,
- guint unused,
- GtkWidget *widget)
+start_download_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
{
GtkTreePath *path;
GtkTreeView *tv;
if (current_context_row_reference == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
path = gtk_tree_row_reference_get_path (current_context_row_reference);
gtk_tree_row_reference_free (current_context_row_reference);
current_context_row_reference = NULL;
- tv = GTK_TREE_VIEW (gtk_builder_get_object
(current_context_search_tab->builder,
- "_search_result_frame"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (current_context_search_tab->builder,
+ "_search_result_frame"));
start_download (tv, path, NULL, current_context_search_tab);
gtk_tree_path_free (path);
current_context_search_tab = NULL;
@@ -737,15 +640,12 @@
* Download was selected in the current search context menu.
*/
static void
-abort_download_ctx_menu (gpointer user_data,
- guint unused,
- GtkWidget *widget)
+abort_download_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
{
struct DownloadEntry *de = user_data;
GNUNET_assert (de->dc != NULL);
- GNUNET_FS_download_stop (de->dc,
- GNUNET_YES);
+ GNUNET_FS_download_stop (de->dc, GNUNET_YES);
current_context_search_tab = NULL;
}
@@ -754,9 +654,8 @@
* Copy current URI to clipboard.
*/
static void
-copy_uri_to_clipboard_ctx_menu (gpointer user_data,
- guint unused,
- GtkWidget *widget)
+copy_uri_to_clipboard_ctx_menu (gpointer user_data, guint unused,
+ GtkWidget * widget)
{
GtkTreePath *path;
GtkTreeView *tv;
@@ -767,36 +666,34 @@
GtkClipboard *cb;
if (current_context_row_reference == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
path = gtk_tree_row_reference_get_path (current_context_row_reference);
gtk_tree_row_reference_free (current_context_row_reference);
current_context_row_reference = NULL;
- tv = GTK_TREE_VIEW (gtk_builder_get_object
(current_context_search_tab->builder,
- "_search_result_frame"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (current_context_search_tab->builder,
+ "_search_result_frame"));
tm = gtk_tree_view_get_model (tv);
if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- return;
- }
- gtk_tree_model_get (tm, &iter,
- 1, &uri, -1);
+ {
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 1, &uri, -1);
gtk_tree_path_free (path);
current_context_search_tab = NULL;
if (uri == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
uris = GNUNET_FS_uri_to_string (uri);
cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- gtk_clipboard_set_text (cb,
- uris,
- -1);
+ gtk_clipboard_set_text (cb, uris, -1);
gtk_clipboard_store (cb);
GNUNET_free (uris);
}
@@ -806,10 +703,8 @@
* We got a right-click on the search result list. Display the context
* menu.
*/
-static int
-search_list_on_menu(GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+static int
+search_list_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
{
GdkEventButton *event_button;
struct SearchTab *tab = user_data;
@@ -820,91 +715,79 @@
GtkTreeModel *tm;
GtkTreeIter iter;
struct SearchResult *sr;
-
+
tv = GTK_TREE_VIEW (widget);
if (event->type == GDK_BUTTON_PRESS)
+ {
+ event_button = (GdkEventButton *) event;
+ if (event_button->button == 3)
{
- event_button = (GdkEventButton *) event;
- if (event_button->button == 3)
- {
- current_context_search_tab = tab;
- if (current_context_row_reference != NULL)
- {
- gtk_tree_row_reference_free (current_context_row_reference);
- current_context_row_reference = NULL;
- }
- path = NULL;
- if (FALSE == gtk_tree_view_get_path_at_pos (tv,
- event_button->x,
- event_button->y,
- &path, NULL, NULL, NULL))
- {
- /* nothing selected */
- current_context_search_tab = NULL;
- return FALSE;
- }
- tm = gtk_tree_view_get_model (tv);
- gtk_tree_model_get_iter (tm, &iter, path);
- gtk_tree_model_get (tm, &iter,
- 9, &sr,
- -1);
- current_context_row_reference = gtk_tree_row_reference_new (tm,
- path);
- gtk_tree_path_free (path);
+ current_context_search_tab = tab;
+ if (current_context_row_reference != NULL)
+ {
+ gtk_tree_row_reference_free (current_context_row_reference);
+ current_context_row_reference = NULL;
+ }
+ path = NULL;
+ if (FALSE ==
+ gtk_tree_view_get_path_at_pos (tv, event_button->x, event_button->y,
+ &path, NULL, NULL, NULL))
+ {
+ /* nothing selected */
+ current_context_search_tab = NULL;
+ return FALSE;
+ }
+ tm = gtk_tree_view_get_model (tv);
+ gtk_tree_model_get_iter (tm, &iter, path);
+ gtk_tree_model_get (tm, &iter, 9, &sr, -1);
+ current_context_row_reference = gtk_tree_row_reference_new (tm, path);
+ gtk_tree_path_free (path);
- /*
- FIXME: have additional options, depending on status:
- - view full meta data (in new window)
- - copy URI to clipboard
- - start recursive download
- - abort active download (!)
- => need to know download status before creating menu!
- */
- menu = GTK_MENU (gtk_menu_new ());
- if (sr->download == NULL)
- {
- child = gtk_menu_item_new_with_label (_("_Download"));
- g_signal_connect (child,
- "activate",
- G_CALLBACK (start_download_ctx_menu),
- NULL);
- gtk_label_set_use_underline (GTK_LABEL
- (gtk_bin_get_child (GTK_BIN
(child))),
- TRUE);
- gtk_widget_show (child);
- }
- else
- {
- child = gtk_menu_item_new_with_label (_("_Abort download"));
- g_signal_connect (child,
- "activate",
- G_CALLBACK (abort_download_ctx_menu),
- sr->download);
- gtk_label_set_use_underline (GTK_LABEL
- (gtk_bin_get_child (GTK_BIN
(child))),
- TRUE);
- gtk_widget_show (child);
+ /*
+ * FIXME: have additional options, depending on status:
+ * - view full meta data (in new window)
+ * - copy URI to clipboard
+ * - start recursive download
+ * - abort active download (!)
+ * => need to know download status before creating menu!
+ */
+ menu = GTK_MENU (gtk_menu_new ());
+ if (sr->download == NULL)
+ {
+ child = gtk_menu_item_new_with_label (_("_Download"));
+ g_signal_connect (child, "activate",
+ G_CALLBACK (start_download_ctx_menu), NULL);
+ gtk_label_set_use_underline (GTK_LABEL
+ (gtk_bin_get_child (GTK_BIN (child))),
+ TRUE);
+ gtk_widget_show (child);
+ }
+ else
+ {
+ child = gtk_menu_item_new_with_label (_("_Abort download"));
+ g_signal_connect (child, "activate",
+ G_CALLBACK (abort_download_ctx_menu), sr->download);
+ gtk_label_set_use_underline (GTK_LABEL
+ (gtk_bin_get_child (GTK_BIN (child))),
+ TRUE);
+ gtk_widget_show (child);
- }
+ }
- child = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
- g_signal_connect (child,
- "activate",
- G_CALLBACK (copy_uri_to_clipboard_ctx_menu),
- NULL);
- gtk_label_set_use_underline (GTK_LABEL
- (gtk_bin_get_child (GTK_BIN (child))),
- TRUE);
- gtk_widget_show (child);
+ child = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
+ g_signal_connect (child, "activate",
+ G_CALLBACK (copy_uri_to_clipboard_ctx_menu), NULL);
+ gtk_label_set_use_underline (GTK_LABEL
+ (gtk_bin_get_child (GTK_BIN (child))),
TRUE);
+ gtk_widget_show (child);
-
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
- gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
- event_button->button,
- event_button->time);
- }
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
+ gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event_button->button,
+ event_button->time);
}
+ }
return FALSE;
}
@@ -914,8 +797,7 @@
* areas.
*/
static void
-update_meta_data_views (GtkTreeView *tv,
- gpointer user_data)
+update_meta_data_views (GtkTreeView * tv, gpointer user_data)
{
struct SearchTab *tab = user_data;
GtkImage *image;
@@ -927,36 +809,33 @@
GdkPixbuf *pixbuf;
GNUNET_assert (tab->query_txt != NULL);
- image = GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_preview_image"));
- ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_meta_data_list_store"));
+ image =
+ GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_preview_image"));
+ ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_meta_data_list_store"));
sel = gtk_tree_view_get_selection (tv);
gtk_list_store_clear (ms);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &model,
- &iter))
- {
- gtk_image_clear (image);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &model, &iter))
+ {
+ gtk_image_clear (image);
+ return;
+ }
meta = NULL;
pixbuf = NULL;
- gtk_tree_model_get (model,
- &iter,
- 0, &meta,
- 3, &pixbuf,
- -1);
+ gtk_tree_model_get (model, &iter, 0, &meta, 3, &pixbuf, -1);
if (pixbuf != NULL)
- {
- gtk_image_set_from_pixbuf (image, pixbuf);
- g_object_unref (G_OBJECT (pixbuf));
- }
+ {
+ gtk_image_set_from_pixbuf (image, pixbuf);
+ g_object_unref (G_OBJECT (pixbuf));
+ }
if (meta != NULL)
- {
- GNUNET_CONTAINER_meta_data_iterate (meta,
-
&GNUNET_FS_GTK_add_meta_data_to_list_store,
- ms);
- }
+ {
+ GNUNET_CONTAINER_meta_data_iterate (meta,
+
&GNUNET_FS_GTK_add_meta_data_to_list_store,
+ ms);
+ }
}
@@ -967,22 +846,16 @@
update_search_label (struct SearchTab *tab)
{
char *name;
-
+
while (tab->parent != NULL)
tab = tab->parent->tab;
if (tab->num_results > 0)
- GNUNET_asprintf (&name,
- "%.*s%s (%u)",
- 20,
- tab->query_txt,
- strlen (tab->query_txt) > 20 ? "..." : "",
- tab->num_results);
+ GNUNET_asprintf (&name, "%.*s%s (%u)", 20, tab->query_txt,
+ strlen (tab->query_txt) > 20 ? "..." : "",
+ tab->num_results);
else
- GNUNET_asprintf (&name,
- "%.*s%s",
- 20,
- tab->query_txt,
- strlen (tab->query_txt) > 20 ? "..." : "");
+ GNUNET_asprintf (&name, "%.*s%s", 20, tab->query_txt,
+ strlen (tab->query_txt) > 20 ? "..." : "");
gtk_label_set_text (tab->label, name);
GNUNET_free (name);
}
@@ -997,15 +870,17 @@
GtkNotebook *notebook;
int index;
int i;
-
+
if (tab->parent != NULL)
- {
- /* not a top-level search, do not close tab here! */
- GNUNET_free (tab);
- return;
- }
+ {
+ /* not a top-level search, do not close tab here! */
+ GNUNET_free (tab);
+ return;
+ }
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
index = -1;
for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
if (tab->frame == gtk_notebook_get_nth_page (notebook, i))
@@ -1013,9 +888,7 @@
gtk_notebook_remove_page (notebook, index);
g_object_unref (tab->builder);
GNUNET_free (tab->query_txt);
- GNUNET_CONTAINER_DLL_remove (search_tab_head,
- search_tab_tail,
- tab);
+ GNUNET_CONTAINER_DLL_remove (search_tab_head, search_tab_tail, tab);
GNUNET_free (tab);
}
@@ -1025,11 +898,10 @@
*/
static struct PublishEntry *
handle_publish_completed (struct PublishEntry *ent,
- const struct GNUNET_FS_Uri *uri)
+ const struct GNUNET_FS_Uri *uri)
{
ent->uri = GNUNET_FS_uri_dup (uri);
- return change_publish_colour (ent,
- "green");
+ return change_publish_colour (ent, "green");
}
@@ -1038,12 +910,10 @@
* Handle error.
*/
static struct PublishEntry *
-handle_publish_error (struct PublishEntry *ent,
- const char *emsg)
+handle_publish_error (struct PublishEntry *ent, const char *emsg)
{
GNUNET_break (0);
- return change_publish_colour (ent,
- "red");
+ return change_publish_colour (ent, "red");
}
@@ -1059,30 +929,30 @@
int i;
if (ent == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
gtk_tree_row_reference_free (ent->rr);
if (GNUNET_YES != ent->is_top)
- {
- GNUNET_free (ent);
- return;
- }
+ {
+ GNUNET_free (ent);
+ return;
+ }
tab = ent->tab;
if (ent->uri != NULL)
GNUNET_FS_uri_destroy (ent->uri);
GNUNET_free (ent);
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
index = -1;
for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
if (tab->frame == gtk_notebook_get_nth_page (notebook, i))
index = i;
gtk_notebook_remove_page (notebook, index);
g_object_unref (tab->builder);
- GNUNET_CONTAINER_DLL_remove (publish_tab_head,
- publish_tab_tail,
- tab);
+ GNUNET_CONTAINER_DLL_remove (publish_tab_head, publish_tab_tail, tab);
GNUNET_free (tab);
}
@@ -1091,15 +961,15 @@
* Tell FS to stop a search.
*/
static void
-stop_search (GtkButton *button,
- gpointer user_data)
+stop_search (GtkButton * button, gpointer user_data)
{
struct SearchTab *tab = user_data;
+
if (tab->sc != NULL)
- {
- GNUNET_FS_search_stop (tab->sc);
- tab->sc = NULL;
- }
+ {
+ GNUNET_FS_search_stop (tab->sc);
+ tab->sc = NULL;
+ }
}
@@ -1111,8 +981,7 @@
* the tab should be closed.
*/
static void
-clear_downloads (GtkButton *button,
- gpointer user_data)
+clear_downloads (GtkButton * button, gpointer user_data)
{
struct SearchTab *tab = user_data;
struct SearchResult *sr;
@@ -1123,15 +992,11 @@
if (TRUE != gtk_tree_model_get_iter_first (tm, &iter))
return;
do
- {
- gtk_tree_model_get (tm, &iter,
- 9, &sr,
- -1);
- if ( (sr->download != NULL) &&
- (sr->download->is_done == GNUNET_YES) )
- GNUNET_FS_download_stop (sr->download->dc,
- GNUNET_YES);
- }
+ {
+ gtk_tree_model_get (tm, &iter, 9, &sr, -1);
+ if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))
+ GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
+ }
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
@@ -1141,16 +1006,16 @@
* Tell FS to pause a search.
*/
static void
-pause_search (GtkButton *button,
- gpointer user_data)
+pause_search (GtkButton * button, gpointer user_data)
{
struct SearchTab *tab = user_data;
+
if (tab->sc != NULL)
- {
- GNUNET_FS_search_pause (tab->sc);
- gtk_widget_show (tab->play_button);
- gtk_widget_hide (tab->pause_button);
- }
+ {
+ GNUNET_FS_search_pause (tab->sc);
+ gtk_widget_show (tab->play_button);
+ gtk_widget_hide (tab->pause_button);
+ }
}
@@ -1158,16 +1023,16 @@
* Tell FS to resume a search.
*/
static void
-continue_search (GtkButton *button,
- gpointer user_data)
+continue_search (GtkButton * button, gpointer user_data)
{
struct SearchTab *tab = user_data;
+
if (tab->sc != NULL)
- {
- GNUNET_FS_search_continue (tab->sc);
- gtk_widget_show (tab->pause_button);
- gtk_widget_hide (tab->play_button);
- }
+ {
+ GNUNET_FS_search_continue (tab->sc);
+ gtk_widget_show (tab->pause_button);
+ gtk_widget_hide (tab->play_button);
+ }
}
@@ -1180,7 +1045,7 @@
*/
static struct SearchTab *
setup_search (struct GNUNET_FS_SearchContext *sc,
- const struct GNUNET_FS_Uri *query)
+ const struct GNUNET_FS_Uri *query)
{
struct SearchTab *tab;
GtkTreeView *tv;
@@ -1189,86 +1054,87 @@
gint pages;
tab = GNUNET_malloc (sizeof (struct SearchTab));
- GNUNET_CONTAINER_DLL_insert (search_tab_head,
- search_tab_tail,
- tab);
+ GNUNET_CONTAINER_DLL_insert (search_tab_head, search_tab_tail, tab);
tab->sc = sc;
if (query == NULL)
- {
- tab->query_txt = GNUNET_strdup ("*");
- }
+ {
+ tab->query_txt = GNUNET_strdup ("*");
+ }
else
- {
- if (GNUNET_FS_uri_test_ksk (query))
- tab->query_txt = GNUNET_FS_uri_ksk_to_string_fancy (query);
- else
- tab->query_txt = GNUNET_FS_uri_to_string (query);
- }
+ {
+ if (GNUNET_FS_uri_test_ksk (query))
+ tab->query_txt = GNUNET_FS_uri_ksk_to_string_fancy (query);
+ else
+ tab->query_txt = GNUNET_FS_uri_to_string (query);
+ }
tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_tab.glade");
- tab->ts = GTK_TREE_STORE (gtk_builder_get_object (tab->builder,
-
"GNUNET_GTK_file_sharing_result_tree_store"));
+ tab->ts =
+ GTK_TREE_STORE (gtk_builder_get_object
+ (tab->builder,
+ "GNUNET_GTK_file_sharing_result_tree_store"));
/* load frame */
- sf = GTK_WINDOW (gtk_builder_get_object (tab->builder,
- "_search_result_frame_window"));
+ sf = GTK_WINDOW (gtk_builder_get_object
+ (tab->builder, "_search_result_frame_window"));
tab->frame = gtk_bin_get_child (GTK_BIN (sf));
gtk_widget_ref (tab->frame);
gtk_container_remove (GTK_CONTAINER (sf), tab->frame);
gtk_widget_destroy (GTK_WIDGET (sf));
/* load tab_label */
- sf = GTK_WINDOW (gtk_builder_get_object (tab->builder,
- "_search_result_label_window"));
+ sf = GTK_WINDOW (gtk_builder_get_object
+ (tab->builder, "_search_result_label_window"));
tab->tab_label = gtk_bin_get_child (GTK_BIN (sf));
gtk_widget_ref (tab->tab_label);
gtk_container_remove (GTK_CONTAINER (sf), tab->tab_label);
gtk_widget_destroy (GTK_WIDGET (sf));
-
+
/* get refs to widgets */
- tab->label = GTK_LABEL (gtk_builder_get_object (tab->builder,
-
"_search_result_label_window_label"));
-
- tab->close_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
-
"_search_result_label_close_button"));
- g_signal_connect(G_OBJECT(tab->close_button), "clicked",
- G_CALLBACK(stop_search), tab);
- tab->clear_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
-
"_search_result_label_clear_button"));
- g_signal_connect(G_OBJECT(tab->clear_button), "clicked",
- G_CALLBACK(clear_downloads), tab);
- tab->play_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
-
"_search_result_label_play_button"));
- g_signal_connect(G_OBJECT(tab->play_button), "clicked",
- G_CALLBACK(continue_search), tab);
- tab->pause_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
-
"_search_result_label_pause_button"));
- g_signal_connect(G_OBJECT(tab->pause_button), "clicked",
- G_CALLBACK(pause_search), tab);
+ tab->label =
+ GTK_LABEL (gtk_builder_get_object
+ (tab->builder, "_search_result_label_window_label"));
+
+ tab->close_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (tab->builder, "_search_result_label_close_button"));
+ g_signal_connect (G_OBJECT (tab->close_button), "clicked",
+ G_CALLBACK (stop_search), tab);
+ tab->clear_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (tab->builder, "_search_result_label_clear_button"));
+ g_signal_connect (G_OBJECT (tab->clear_button), "clicked",
+ G_CALLBACK (clear_downloads), tab);
+ tab->play_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (tab->builder, "_search_result_label_play_button"));
+ g_signal_connect (G_OBJECT (tab->play_button), "clicked",
+ G_CALLBACK (continue_search), tab);
+ tab->pause_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (tab->builder, "_search_result_label_pause_button"));
+ g_signal_connect (G_OBJECT (tab->pause_button), "clicked",
+ G_CALLBACK (pause_search), tab);
/* patch text */
update_search_label (tab);
/* add signal handlers */
- tv = GTK_TREE_VIEW (gtk_builder_get_object (tab->builder,
- "_search_result_frame"));
- g_signal_connect(G_OBJECT(tv), "row-activated",
- G_CALLBACK(start_download), tab);
- g_signal_connect(G_OBJECT(tv), "cursor-changed",
- G_CALLBACK(update_meta_data_views), tab);
- g_signal_connect (G_OBJECT(tv),
- "button_press_event",
- G_CALLBACK(search_list_on_menu),
- tab);
-
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (tab->builder, "_search_result_frame"));
+ g_signal_connect (G_OBJECT (tv), "row-activated", G_CALLBACK
(start_download),
+ tab);
+ g_signal_connect (G_OBJECT (tv), "cursor-changed",
+ G_CALLBACK (update_meta_data_views), tab);
+ g_signal_connect (G_OBJECT (tv), "button_press_event",
+ G_CALLBACK (search_list_on_menu), tab);
+
/* make visible */
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
pages = gtk_notebook_get_n_pages (notebook);
- gtk_notebook_insert_page (notebook,
- tab->frame,
- tab->tab_label,
- pages - 1);
- gtk_notebook_set_current_page (notebook,
- pages - 1);
- gtk_widget_show (GTK_WIDGET (notebook));
+ gtk_notebook_insert_page (notebook, tab->frame, tab->tab_label, pages - 1);
+ gtk_notebook_set_current_page (notebook, pages - 1);
+ gtk_widget_show (GTK_WIDGET (notebook));
return tab;
}
@@ -1282,7 +1148,7 @@
*/
static struct SearchTab *
setup_inner_search (struct GNUNET_FS_SearchContext *sc,
- struct SearchResult *parent)
+ struct SearchResult *parent)
{
struct SearchTab *ret;
@@ -1316,13 +1182,12 @@
* @return entry for the search result
*/
struct SearchResult *
-GNUNET_GTK_add_search_result (struct SearchTab *tab,
- GtkTreeIter *iter,
- GtkTreeRowReference *parent_rr,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_SearchResult *result,
- uint32_t applicability_rank)
+GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
+ GtkTreeRowReference * parent_rr,
+ const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_SearchResult *result,
+ uint32_t applicability_rank)
{
struct SearchResult *sr;
GtkTreePath *tp;
@@ -1334,45 +1199,46 @@
GtkTreeIter *pitr;
GtkTreeIter pmem;
GtkTreePath *path;
- GtkTreeModel *tm;
+ GtkTreeModel *tm;
GtkTreeStore *ts;
uint64_t fsize;
- if ( (uri != NULL) &&
- (!GNUNET_FS_uri_test_loc (uri)) &&
- (!GNUNET_FS_uri_test_chk (uri)) )
- {
- fsize = 0;
- mime = GNUNET_strdup ("GNUnet namespace");
- status_colour = "lightgreen";
- }
+ if ((uri != NULL) && (!GNUNET_FS_uri_test_loc (uri)) &&
+ (!GNUNET_FS_uri_test_chk (uri)))
+ {
+ fsize = 0;
+ mime = GNUNET_strdup ("GNUnet namespace");
+ status_colour = "lightgreen";
+ }
else if (uri != NULL)
- {
- fsize = GNUNET_FS_uri_chk_get_file_size (uri);
- mime = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_MIMETYPE,
-
EXTRACTOR_METATYPE_FORMAT,
- -1);
- status_colour = "white";
- }
+ {
+ fsize = GNUNET_FS_uri_chk_get_file_size (uri);
+ mime =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+
EXTRACTOR_METATYPE_MIMETYPE,
+
EXTRACTOR_METATYPE_FORMAT,
+ -1);
+ status_colour = "white";
+ }
else
- {
- fsize = 0;
- status_colour = "gray";
- mime = NULL;
- }
- desc = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_PACKAGE_NAME,
-
EXTRACTOR_METATYPE_TITLE,
-
EXTRACTOR_METATYPE_BOOK_TITLE,
-
EXTRACTOR_METATYPE_FILENAME,
-
EXTRACTOR_METATYPE_DESCRIPTION,
-
EXTRACTOR_METATYPE_SUMMARY,
-
EXTRACTOR_METATYPE_ALBUM,
-
EXTRACTOR_METATYPE_COMMENT,
-
EXTRACTOR_METATYPE_SUBJECT,
-
EXTRACTOR_METATYPE_KEYWORDS,
- -1);
+ {
+ fsize = 0;
+ status_colour = "gray";
+ mime = NULL;
+ }
+ desc =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+
EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_TITLE,
+
EXTRACTOR_METATYPE_BOOK_TITLE,
+
EXTRACTOR_METATYPE_FILENAME,
+
EXTRACTOR_METATYPE_DESCRIPTION,
+
EXTRACTOR_METATYPE_SUMMARY,
+ EXTRACTOR_METATYPE_ALBUM,
+
EXTRACTOR_METATYPE_COMMENT,
+
EXTRACTOR_METATYPE_SUBJECT,
+
EXTRACTOR_METATYPE_KEYWORDS,
+ -1);
if (desc == NULL)
desc = GNUNET_strdup (_("no description supplied"));
if (uri == NULL)
@@ -1385,85 +1251,76 @@
sr->result = result;
sr->tab = tab;
if (parent_rr != NULL)
+ {
+ /* get piter from parent */
+ path = gtk_tree_row_reference_get_path (parent_rr);
+ tm = gtk_tree_row_reference_get_model (parent_rr);
+ if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (tm), &pmem, path))
{
- /* get piter from parent */
- path = gtk_tree_row_reference_get_path (parent_rr);
- tm = gtk_tree_row_reference_get_model (parent_rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (tm),
- &pmem, path))
- {
- GNUNET_break (0);
- gtk_tree_path_free (path);
- /* desperate measure: make top-level entry */
- pitr = NULL;
- }
- else
- {
- pitr = &pmem;
- }
- ts = GTK_TREE_STORE (tm);
- }
- else
- {
- /* top-level result */
+ GNUNET_break (0);
+ gtk_tree_path_free (path);
+ /* desperate measure: make top-level entry */
pitr = NULL;
- ts = tab->ts;
}
- gtk_tree_store_insert_with_values (ts,
- iter,
- pitr,
- G_MAXINT,
- 0, GNUNET_CONTAINER_meta_data_duplicate
(meta),
- 1, (uri == NULL) ? NULL :
GNUNET_FS_uri_dup (uri),
- 2, (uri == NULL) ? 0 : fsize,
- 3, pixbuf /* preview */,
- 4, 0 /* percent progress */,
- 5, 0 /* percent availability */,
- 6, desc /* filename/description */,
- 7, uris,
- 8, status_colour,
- 9, sr,
- 10, mime,
- 11, applicability_rank,
- 12, 0 /* avail-cert */,
- 13, 0 /* avail-rank */,
- -1);
- if (tab != NULL)
+ else
{
- while (tab->parent != NULL)
- tab = tab->parent->tab;
- tab->num_results++;
+ pitr = &pmem;
}
+ ts = GTK_TREE_STORE (tm);
+ }
+ else
+ {
+ /* top-level result */
+ pitr = NULL;
+ ts = tab->ts;
+ }
+ gtk_tree_store_insert_with_values (ts, iter, pitr, G_MAXINT, 0,
+ GNUNET_CONTAINER_meta_data_duplicate
+ (meta), 1,
+ (uri ==
+ NULL) ? NULL : GNUNET_FS_uri_dup (uri),
2,
+ (uri == NULL) ? 0 : fsize, 3,
+ pixbuf /* preview */ ,
+ 4, 0 /* percent progress */ ,
+ 5, 0 /* percent availability */ ,
+ 6, desc /* filename/description */ ,
+ 7, uris, 8, status_colour, 9, sr, 10,
mime,
+ 11, applicability_rank, 12,
+ 0 /* avail-cert */ ,
+ 13, 0 /* avail-rank */ ,
+ -1);
+ if (tab != NULL)
+ {
+ while (tab->parent != NULL)
+ tab = tab->parent->tab;
+ tab->num_results++;
+ }
if (pixbuf != NULL)
g_object_unref (pixbuf);
GNUNET_free (uris);
GNUNET_free (desc);
GNUNET_free_non_null (mime);
- tp = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
- iter);
- sr->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
- tp);
+ tp = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), iter);
+ sr->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts), tp);
gtk_tree_path_free (tp);
return sr;
}
static struct SearchResult *
-process_search_result (void *cls,
- struct SearchResult *parent,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_SearchResult *result,
- uint32_t applicability_rank)
+process_search_result (void *cls, struct SearchResult *parent,
+ const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_SearchResult *result,
+ uint32_t applicability_rank)
{
- struct SearchTab *tab = cls;
+ struct SearchTab *tab = cls;
struct SearchResult *sr;
GtkTreeIter iter;
- sr = GNUNET_GTK_add_search_result (tab, &iter,
- (parent != NULL) ? parent->rr : NULL,
- uri,
- meta, result, applicability_rank);
+ sr = GNUNET_GTK_add_search_result (tab, &iter,
+ (parent != NULL) ? parent->rr : NULL, uri,
+ meta, result, applicability_rank);
update_search_label (tab);
return sr;
}
@@ -1480,10 +1337,9 @@
* @return NULL on error, otherwise tree store matching iter
*/
struct SearchTab *
-GNUNET_GTK_add_to_uri_tab (GtkTreeIter *iter,
- struct SearchResult **srp,
- const struct GNUNET_CONTAINER_MetaData *meta,
- const struct GNUNET_FS_Uri *uri)
+GNUNET_GTK_add_to_uri_tab (GtkTreeIter * iter, struct SearchResult **srp,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ const struct GNUNET_FS_Uri *uri)
{
struct SearchTab *utab;
struct SearchResult *sr;
@@ -1492,37 +1348,32 @@
utab = search_tab_head;
while (utab != NULL)
- {
- if (utab->sc == NULL)
- break;
- utab = utab->next;
- }
+ {
+ if (utab->sc == NULL)
+ break;
+ utab = utab->next;
+ }
if (utab == NULL)
- {
- utab = setup_search (NULL, NULL);
- gtk_widget_set_visible (utab->close_button,
- FALSE);
- gtk_widget_set_visible (utab->pause_button,
- FALSE);
- }
+ {
+ utab = setup_search (NULL, NULL);
+ gtk_widget_set_visible (utab->close_button, FALSE);
+ gtk_widget_set_visible (utab->pause_button, FALSE);
+ }
else
- {
- /* make 'utab' the current page */
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
- for (page=0;page<gtk_notebook_get_n_pages (notebook);page++)
- if (utab->frame ==
- gtk_notebook_get_nth_page (notebook,
- page))
- {
- gtk_notebook_set_current_page (notebook,
- page);
- break;
- }
- }
- sr = GNUNET_GTK_add_search_result (utab, iter,
- NULL, uri, meta,
- NULL, 0);
-
+ {
+ /* make 'utab' the current page */
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
+ for (page = 0; page < gtk_notebook_get_n_pages (notebook); page++)
+ if (utab->frame == gtk_notebook_get_nth_page (notebook, page))
+ {
+ gtk_notebook_set_current_page (notebook, page);
+ break;
+ }
+ }
+ sr = GNUNET_GTK_add_search_result (utab, iter, NULL, uri, meta, NULL, 0);
+
if (NULL != srp)
*srp = sr;
return utab;
@@ -1530,8 +1381,7 @@
static struct SearchTab *
-handle_search_error (struct SearchTab *sr,
- const char *emsg)
+handle_search_error (struct SearchTab *sr, const char *emsg)
{
/* FIXME: implement error handler */
GNUNET_break (0);
@@ -1541,10 +1391,10 @@
static struct SearchResult *
update_search_result (struct SearchResult *sr,
- const struct GNUNET_CONTAINER_MetaData *meta,
- int32_t availability_rank,
- uint32_t availability_certainty,
- uint32_t applicability_rank)
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ int32_t availability_rank,
+ uint32_t availability_certainty,
+ uint32_t applicability_rank)
{
GtkTreeIter iter;
struct GNUNET_CONTAINER_MetaData *ometa;
@@ -1561,67 +1411,64 @@
if (sr == NULL)
return NULL;
- desc = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_PACKAGE_NAME,
-
EXTRACTOR_METATYPE_TITLE,
-
EXTRACTOR_METATYPE_BOOK_TITLE,
-
EXTRACTOR_METATYPE_FILENAME,
-
EXTRACTOR_METATYPE_DESCRIPTION,
-
EXTRACTOR_METATYPE_SUMMARY,
-
EXTRACTOR_METATYPE_ALBUM,
-
EXTRACTOR_METATYPE_COMMENT,
-
EXTRACTOR_METATYPE_SUBJECT,
-
EXTRACTOR_METATYPE_KEYWORDS,
- -1);
+ desc =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+
EXTRACTOR_METATYPE_PACKAGE_NAME,
+ EXTRACTOR_METATYPE_TITLE,
+
EXTRACTOR_METATYPE_BOOK_TITLE,
+
EXTRACTOR_METATYPE_FILENAME,
+
EXTRACTOR_METATYPE_DESCRIPTION,
+
EXTRACTOR_METATYPE_SUMMARY,
+ EXTRACTOR_METATYPE_ALBUM,
+
EXTRACTOR_METATYPE_COMMENT,
+
EXTRACTOR_METATYPE_SUBJECT,
+
EXTRACTOR_METATYPE_KEYWORDS,
+ -1);
if (desc == NULL)
desc = GNUNET_strdup (_("no description supplied"));
- mime = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-
EXTRACTOR_METATYPE_MIMETYPE,
-
EXTRACTOR_METATYPE_FORMAT,
- -1);
+ mime =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+
EXTRACTOR_METATYPE_MIMETYPE,
+ EXTRACTOR_METATYPE_FORMAT,
+ -1);
pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
tp = gtk_tree_row_reference_get_path (sr->rr);
tm = gtk_tree_row_reference_get_model (sr->rr);
- ts = GTK_TREE_STORE (tm);
+ ts = GTK_TREE_STORE (tm);
gtk_tree_model_get_iter (tm, &iter, tp);
gtk_tree_path_free (tp);
- gtk_tree_model_get (tm,
- &iter,
- 0, &ometa,
- -1);
+ gtk_tree_model_get (tm, &iter, 0, &ometa, -1);
if (meta != NULL)
GNUNET_CONTAINER_meta_data_destroy (ometa);
if (availability_certainty > 0)
- percent_avail = (availability_certainty + availability_rank) * 50 /
availability_certainty;
+ percent_avail =
+ (availability_certainty +
+ availability_rank) * 50 / availability_certainty;
else
percent_avail = 0;
- gtk_tree_store_set (ts,
- &iter,
- 0, GNUNET_CONTAINER_meta_data_duplicate (meta),
- 3, pixbuf /* preview */,
- 5, (guint) percent_avail /* percent availability */,
- 6, desc /* filename/description */,
- 10, mime,
- 11, (guint) applicability_rank,
- 12, (guint) availability_certainty,
- 13, (gint) availability_rank,
- -1);
+ gtk_tree_store_set (ts, &iter, 0, GNUNET_CONTAINER_meta_data_duplicate
(meta),
+ 3, pixbuf /* preview */ ,
+ 5, (guint) percent_avail /* percent availability */ ,
+ 6, desc /* filename/description */ ,
+ 10, mime, 11, (guint) applicability_rank, 12,
+ (guint) availability_certainty, 13,
+ (gint) availability_rank, -1);
if (pixbuf != NULL)
g_object_unref (pixbuf);
GNUNET_free (desc);
GNUNET_free_non_null (mime);
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
page = gtk_notebook_get_current_page (notebook);
- if (gtk_notebook_get_nth_page (notebook,
- page) == sr->tab->frame)
- {
- tv = GTK_TREE_VIEW (gtk_builder_get_object (sr->tab->builder,
- "_search_result_frame"));
+ if (gtk_notebook_get_nth_page (notebook, page) == sr->tab->frame)
+ {
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (sr->tab->builder, "_search_result_frame"));
- update_meta_data_views (tv,
- sr->tab);
- }
+ update_meta_data_views (tv, sr->tab);
+ }
return sr;
}
@@ -1636,26 +1483,21 @@
struct GNUNET_CONTAINER_MetaData *meta;
if (sr == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
tp = gtk_tree_row_reference_get_path (sr->rr);
tm = gtk_tree_row_reference_get_model (sr->rr);
gtk_tree_model_get_iter (tm, &iter, tp);
gtk_tree_path_free (tp);
- gtk_tree_model_get (tm,
- &iter,
- 0, &meta,
- 1, &uri,
- -1);
+ gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, -1);
if (uri != NULL)
GNUNET_FS_uri_destroy (uri);
if (meta != NULL)
GNUNET_CONTAINER_meta_data_destroy (meta);
gtk_tree_row_reference_free (sr->rr);
- gtk_tree_store_remove (GTK_TREE_STORE (tm),
- &iter);
+ gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
GNUNET_free (sr);
}
@@ -1664,25 +1506,22 @@
* Tell FS to stop publishing.
*/
static void
-stop_publishing (GtkButton *button,
- gpointer user_data)
+stop_publishing (GtkButton * button, gpointer user_data)
{
struct PublishTab *tab = user_data;
struct GNUNET_FS_PublishContext *pc;
if (NULL != (pc = tab->pc))
- {
- tab->pc = NULL;
- GNUNET_FS_publish_stop (pc);
- }
+ {
+ tab->pc = NULL;
+ GNUNET_FS_publish_stop (pc);
+ }
}
static struct PublishEntry *
-setup_publish (struct GNUNET_FS_PublishContext *pc,
- const char *fn,
- uint64_t fsize,
- struct PublishEntry *parent)
+setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
+ uint64_t fsize, struct PublishEntry *parent)
{
struct PublishTab *tab;
struct PublishEntry *ent;
@@ -1699,79 +1538,74 @@
char *size_fancy;
if (NULL == parent)
- {
- /* create new tab */
- tab = GNUNET_malloc (sizeof (struct PublishTab));
- tab->pc = pc;
- GNUNET_CONTAINER_DLL_insert (publish_tab_head,
- publish_tab_tail,
- tab);
- tab->builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_tab.glade");
- df = GTK_WINDOW (gtk_builder_get_object (tab->builder,
- "_publish_frame_window"));
- tab->frame = gtk_bin_get_child (GTK_BIN (df));
- gtk_widget_ref (tab->frame);
- gtk_container_remove (GTK_CONTAINER (df), tab->frame);
- gtk_widget_destroy (GTK_WIDGET (df));
-
- /* load tab_label */
- df = GTK_WINDOW (gtk_builder_get_object (tab->builder,
- "_publish_label_window"));
- tab_label = gtk_bin_get_child (GTK_BIN (df));
- gtk_widget_ref (tab_label);
- gtk_container_remove (GTK_CONTAINER (df), tab_label);
- gtk_widget_destroy (GTK_WIDGET (df));
-
- /* get refs to widgets */
- fn_label = GTK_LABEL (gtk_builder_get_object (tab->builder,
-
"_publish_label_window_label"));
- gtk_label_set_text (fn_label, fn);
- close_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
-
"_publish_label_close_button"));
- g_signal_connect(G_OBJECT(close_button), "clicked",
- G_CALLBACK(stop_publishing), tab);
- /* make visible */
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
- pages = gtk_notebook_get_n_pages (notebook);
- gtk_notebook_insert_page (notebook,
- tab->frame,
- tab_label,
- pages - 1);
- gtk_widget_show (GTK_WIDGET (notebook));
- tab->ts = GTK_TREE_STORE (gtk_builder_get_object (tab->builder,
-
"_publish_frame_tree_store"));
- pitrptr = NULL;
- }
+ {
+ /* create new tab */
+ tab = GNUNET_malloc (sizeof (struct PublishTab));
+ tab->pc = pc;
+ GNUNET_CONTAINER_DLL_insert (publish_tab_head, publish_tab_tail, tab);
+ tab->builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
+ df = GTK_WINDOW (gtk_builder_get_object
+ (tab->builder, "_publish_frame_window"));
+ tab->frame = gtk_bin_get_child (GTK_BIN (df));
+ gtk_widget_ref (tab->frame);
+ gtk_container_remove (GTK_CONTAINER (df), tab->frame);
+ gtk_widget_destroy (GTK_WIDGET (df));
+
+ /* load tab_label */
+ df = GTK_WINDOW (gtk_builder_get_object
+ (tab->builder, "_publish_label_window"));
+ tab_label = gtk_bin_get_child (GTK_BIN (df));
+ gtk_widget_ref (tab_label);
+ gtk_container_remove (GTK_CONTAINER (df), tab_label);
+ gtk_widget_destroy (GTK_WIDGET (df));
+
+ /* get refs to widgets */
+ fn_label =
+ GTK_LABEL (gtk_builder_get_object
+ (tab->builder, "_publish_label_window_label"));
+ gtk_label_set_text (fn_label, fn);
+ close_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (tab->builder, "_publish_label_close_button"));
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (stop_publishing), tab);
+ /* make visible */
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
+ pages = gtk_notebook_get_n_pages (notebook);
+ gtk_notebook_insert_page (notebook, tab->frame, tab_label, pages - 1);
+ gtk_widget_show (GTK_WIDGET (notebook));
+ tab->ts =
+ GTK_TREE_STORE (gtk_builder_get_object
+ (tab->builder, "_publish_frame_tree_store"));
+ pitrptr = NULL;
+ }
else
+ {
+ /* create new iter from parent */
+ tab = parent->tab;
+ path = gtk_tree_row_reference_get_path (parent->rr);
+ if (TRUE !=
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tab->ts), &piter, path))
{
- /* create new iter from parent */
- tab = parent->tab;
- path = gtk_tree_row_reference_get_path (parent->rr);
- if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (tab->ts),
- &piter, path))
- {
- GNUNET_break (0);
- return NULL;
- }
- pitrptr = &piter;
+ GNUNET_break (0);
+ return NULL;
}
+ pitrptr = &piter;
+ }
size_fancy = GNUNET_STRINGS_byte_size_fancy (fsize);
- gtk_tree_store_insert_with_values (tab->ts,
- &iter,
- pitrptr,
- G_MAXINT,
- 0, fn,
- 1, size_fancy,
- 2, "white",
- 3, (guint) 0 /* progress */,
- -1);
+ gtk_tree_store_insert_with_values (tab->ts, &iter, pitrptr, G_MAXINT, 0, fn,
+ 1, size_fancy, 2, "white", 3,
+ (guint) 0 /* progress */ ,
+ -1);
GNUNET_free (size_fancy);
ent = GNUNET_malloc (sizeof (struct PublishEntry));
ent->is_top = (parent == NULL) ? GNUNET_YES : GNUNET_NO;
ent->tab = tab;
path = gtk_tree_model_get_path (GTK_TREE_MODEL (tab->ts), &iter);
- ent->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (tab->ts),
- path);
+ ent->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (tab->ts), path);
gtk_tree_path_free (path);
ent->pc = pc;
return ent;
@@ -1793,194 +1627,203 @@
* will be passed to future callbacks in the respective
* field in the GNUNET_FS_ProgressInfo struct.
*/
-void*
+void *
GNUNET_GTK_fs_event_handler (void *cls,
- const struct GNUNET_FS_ProgressInfo *info)
+ const struct GNUNET_FS_ProgressInfo *info)
{
- void *ret;
+ void *ret;
switch (info->status)
- {
- case GNUNET_FS_STATUS_PUBLISH_START:
- return setup_publish (info->value.publish.pc,
- info->value.publish.filename,
- info->value.publish.size,
- info->value.publish.pctx);
- case GNUNET_FS_STATUS_PUBLISH_RESUME:
- ret = setup_publish (info->value.publish.pc,
- info->value.publish.filename,
- info->value.publish.size,
- info->value.publish.pctx);
- if (ret == NULL)
- return ret;
- if (info->value.publish.specifics.resume.message != NULL)
- {
- ret = handle_publish_error (ret,
-
info->value.publish.specifics.resume.message);
- }
- else if (info->value.publish.specifics.resume.chk_uri != NULL)
- {
- ret = handle_publish_completed (ret,
-
info->value.publish.specifics.resume.chk_uri);
- }
+ {
+ case GNUNET_FS_STATUS_PUBLISH_START:
+ return setup_publish (info->value.publish.pc, info->value.publish.filename,
+ info->value.publish.size, info->value.publish.pctx);
+ case GNUNET_FS_STATUS_PUBLISH_RESUME:
+ ret =
+ setup_publish (info->value.publish.pc, info->value.publish.filename,
+ info->value.publish.size, info->value.publish.pctx);
+ if (ret == NULL)
return ret;
- case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
- close_publish_tab (info->value.publish.cctx);
- return NULL;
- case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
- return mark_publish_progress (info->value.publish.cctx,
- info->value.publish.size,
- info->value.publish.completed);
- case GNUNET_FS_STATUS_PUBLISH_ERROR:
- return handle_publish_error (info->value.publish.cctx,
- info->value.publish.specifics.error.message);
- case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
- return handle_publish_completed (info->value.publish.cctx,
-
info->value.publish.specifics.completed.chk_uri);
- case GNUNET_FS_STATUS_PUBLISH_STOPPED:
- close_publish_tab (info->value.publish.cctx);
- return NULL;
- case GNUNET_FS_STATUS_DOWNLOAD_START:
- return setup_download (info->value.download.cctx,
- info->value.download.pctx,
- info->value.download.sctx,
- info->value.download.dc,
- info->value.download.uri,
- info->value.download.specifics.start.meta,
- info->value.download.size,
- info->value.download.completed);
- case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
- ret = setup_download (info->value.download.cctx,
- info->value.download.pctx,
- info->value.download.sctx,
- info->value.download.dc,
- info->value.download.uri,
- info->value.download.specifics.resume.meta,
- info->value.download.size,
- info->value.download.completed);
- if (info->value.download.specifics.resume.message != NULL)
- {
- ret = mark_download_error (ret,
-
info->value.download.specifics.resume.message);
- }
- return ret;
- case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
- stop_download (info->value.download.cctx, GNUNET_YES);
- return NULL;
- case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
- return mark_download_progress (info->value.download.cctx,
- info->value.download.size,
- info->value.download.completed,
-
info->value.download.specifics.progress.data,
-
info->value.download.specifics.progress.offset,
-
info->value.download.specifics.progress.data_len,
-
info->value.download.specifics.progress.depth);
- case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- return mark_download_error (info->value.download.cctx,
- info->value.download.specifics.error.message);
- case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- return mark_download_completed (info->value.download.cctx,
- info->value.download.size,
- info->value.download.filename);
- case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
- stop_download (info->value.download.cctx, GNUNET_NO);
- return NULL;
- case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
- return change_download_colour (info->value.download.cctx,
- "yellow");
- case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
- return change_download_colour (info->value.download.cctx,
- "blue");
- case GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT:
- return download_lost_parent (info->value.download.cctx,
- info->value.download.size,
- info->value.download.completed,
- info->value.download.is_active);
- case GNUNET_FS_STATUS_SEARCH_START:
- if (info->value.search.pctx != NULL)
- return setup_inner_search (info->value.search.sc,
- info->value.search.pctx);
- return setup_search (info->value.search.sc,
- info->value.search.query);
- case GNUNET_FS_STATUS_SEARCH_RESUME:
- ret = setup_search (info->value.search.sc,
- info->value.search.query);
- if (info->value.search.specifics.resume.message)
- ret = handle_search_error (ret,
- info->value.search.specifics.resume.message);
- return ret;
- case GNUNET_FS_STATUS_SEARCH_RESUME_RESULT:
- ret = process_search_result (info->value.search.cctx,
- info->value.search.pctx,
-
info->value.search.specifics.resume_result.uri,
-
info->value.search.specifics.resume_result.meta,
-
info->value.search.specifics.resume_result.result,
-
info->value.search.specifics.resume_result.applicability_rank);
- return update_search_result (ret,
-
info->value.search.specifics.resume_result.meta,
-
info->value.search.specifics.resume_result.applicability_rank,
-
info->value.search.specifics.resume_result.availability_certainty,
-
info->value.search.specifics.resume_result.availability_rank);
- case GNUNET_FS_STATUS_SEARCH_SUSPEND:
- close_search_tab (info->value.search.cctx);
- return NULL;
- case GNUNET_FS_STATUS_SEARCH_RESULT:
- return process_search_result (info->value.search.cctx,
- info->value.search.pctx,
- info->value.search.specifics.result.uri,
- info->value.search.specifics.result.meta,
- info->value.search.specifics.result.result,
-
info->value.search.specifics.result.applicability_rank);
- case GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_SEARCH_UPDATE:
- return update_search_result (info->value.search.specifics.update.cctx,
- info->value.search.specifics.update.meta,
-
info->value.search.specifics.update.applicability_rank,
-
info->value.search.specifics.update.availability_certainty,
-
info->value.search.specifics.update.availability_rank);
- case GNUNET_FS_STATUS_SEARCH_ERROR:
- return handle_search_error (info->value.search.cctx,
- info->value.search.specifics.error.message);
- case GNUNET_FS_STATUS_SEARCH_PAUSED:
- return info->value.search.cctx;
- case GNUNET_FS_STATUS_SEARCH_CONTINUED:
- return info->value.search.cctx;
- case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
- free_search_result (info->value.search.specifics.result_suspend.cctx);
- return NULL;
- case GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND:
- free_search_result (info->value.search.specifics.result_suspend.cctx);
- return NULL;
- case GNUNET_FS_STATUS_SEARCH_STOPPED:
- close_search_tab (info->value.search.cctx);
- return NULL;
- case GNUNET_FS_STATUS_UNINDEX_START:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_RESUME:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_SUSPEND:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_ERROR:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
- GNUNET_break (0);
- break;
- case GNUNET_FS_STATUS_UNINDEX_STOPPED:
- GNUNET_break (0);
- break;
- default:
- GNUNET_break (0);
- break;
+ if (info->value.publish.specifics.resume.message != NULL)
+ {
+ ret =
+ handle_publish_error (ret,
+ info->value.publish.specifics.resume.message);
}
+ else if (info->value.publish.specifics.resume.chk_uri != NULL)
+ {
+ ret =
+ handle_publish_completed (ret,
+ info->value.publish.specifics.
+ resume.chk_uri);
+ }
+ return ret;
+ case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
+ close_publish_tab (info->value.publish.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+ return mark_publish_progress (info->value.publish.cctx,
+ info->value.publish.size,
+ info->value.publish.completed);
+ case GNUNET_FS_STATUS_PUBLISH_ERROR:
+ return handle_publish_error (info->value.publish.cctx,
+ info->value.publish.specifics.error.message);
+ case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+ return handle_publish_completed (info->value.publish.cctx,
+ info->value.publish.specifics.
+ completed.chk_uri);
+ case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+ close_publish_tab (info->value.publish.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_DOWNLOAD_START:
+ return setup_download (info->value.download.cctx,
info->value.download.pctx,
+ info->value.download.sctx, info->value.download.dc,
+ info->value.download.uri,
+ info->value.download.specifics.start.meta,
+ info->value.download.size,
+ info->value.download.completed);
+ case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
+ ret =
+ setup_download (info->value.download.cctx, info->value.download.pctx,
+ info->value.download.sctx, info->value.download.dc,
+ info->value.download.uri,
+ info->value.download.specifics.resume.meta,
+ info->value.download.size,
+ info->value.download.completed);
+ if (info->value.download.specifics.resume.message != NULL)
+ {
+ ret =
+ mark_download_error (ret,
+ info->value.download.specifics.resume.message);
+ }
+ return ret;
+ case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
+ stop_download (info->value.download.cctx, GNUNET_YES);
+ return NULL;
+ case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
+ return mark_download_progress (info->value.download.cctx,
+ info->value.download.size,
+ info->value.download.completed,
+
info->value.download.specifics.progress.data,
+ info->value.download.specifics.
+ progress.offset,
+ info->value.download.specifics.
+ progress.data_len,
+ info->value.download.specifics.
+ progress.depth);
+ case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
+ return mark_download_error (info->value.download.cctx,
+ info->value.download.specifics.error.message);
+ case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
+ return mark_download_completed (info->value.download.cctx,
+ info->value.download.size,
+ info->value.download.filename);
+ case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
+ stop_download (info->value.download.cctx, GNUNET_NO);
+ return NULL;
+ case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
+ return change_download_colour (info->value.download.cctx, "yellow");
+ case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
+ return change_download_colour (info->value.download.cctx, "blue");
+ case GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT:
+ return download_lost_parent (info->value.download.cctx,
+ info->value.download.size,
+ info->value.download.completed,
+ info->value.download.is_active);
+ case GNUNET_FS_STATUS_SEARCH_START:
+ if (info->value.search.pctx != NULL)
+ return setup_inner_search (info->value.search.sc,
+ info->value.search.pctx);
+ return setup_search (info->value.search.sc, info->value.search.query);
+ case GNUNET_FS_STATUS_SEARCH_RESUME:
+ ret = setup_search (info->value.search.sc, info->value.search.query);
+ if (info->value.search.specifics.resume.message)
+ ret =
+ handle_search_error (ret,
+ info->value.search.specifics.resume.message);
+ return ret;
+ case GNUNET_FS_STATUS_SEARCH_RESUME_RESULT:
+ ret =
+ process_search_result (info->value.search.cctx,
info->value.search.pctx,
+ info->value.search.specifics.resume_result.uri,
+ info->value.search.specifics.resume_result.meta,
+ info->value.search.specifics.
+ resume_result.result,
+ info->value.search.specifics.
+ resume_result.applicability_rank);
+ return update_search_result (ret,
+ info->value.search.specifics.
+ resume_result.meta,
+ info->value.search.specifics.
+ resume_result.applicability_rank,
+ info->value.search.specifics.
+ resume_result.availability_certainty,
+ info->value.search.specifics.
+ resume_result.availability_rank);
+ case GNUNET_FS_STATUS_SEARCH_SUSPEND:
+ close_search_tab (info->value.search.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_SEARCH_RESULT:
+ return process_search_result (info->value.search.cctx,
+ info->value.search.pctx,
+ info->value.search.specifics.result.uri,
+ info->value.search.specifics.result.meta,
+ info->value.search.specifics.result.result,
+ info->value.search.specifics.
+ result.applicability_rank);
+ case GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_SEARCH_UPDATE:
+ return update_search_result (info->value.search.specifics.update.cctx,
+ info->value.search.specifics.update.meta,
+ info->value.search.specifics.
+ update.applicability_rank,
+ info->value.search.specifics.
+ update.availability_certainty,
+ info->value.search.specifics.
+ update.availability_rank);
+ case GNUNET_FS_STATUS_SEARCH_ERROR:
+ return handle_search_error (info->value.search.cctx,
+ info->value.search.specifics.error.message);
+ case GNUNET_FS_STATUS_SEARCH_PAUSED:
+ return info->value.search.cctx;
+ case GNUNET_FS_STATUS_SEARCH_CONTINUED:
+ return info->value.search.cctx;
+ case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+ free_search_result (info->value.search.specifics.result_suspend.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND:
+ free_search_result (info->value.search.specifics.result_suspend.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_SEARCH_STOPPED:
+ close_search_tab (info->value.search.cctx);
+ return NULL;
+ case GNUNET_FS_STATUS_UNINDEX_START:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_RESUME:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_SUSPEND:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_ERROR:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
+ GNUNET_break (0);
+ break;
+ case GNUNET_FS_STATUS_UNINDEX_STOPPED:
+ GNUNET_break (0);
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
return NULL;
}
@@ -1990,8 +1833,8 @@
* metadata views.
*/
void
-GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkNotebook *notebook;
gint page;
@@ -2001,24 +1844,29 @@
GtkListStore *ms;
GtkTreeView *tv;
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
page = gtk_notebook_get_current_page (notebook);
w = gtk_notebook_get_nth_page (notebook, page);
tab = search_tab_head;
while (tab != NULL)
+ {
+ if (tab->frame == w)
{
- if (tab->frame == w)
- {
- tv = GTK_TREE_VIEW (gtk_builder_get_object (tab->builder,
- "_search_result_frame"));
- update_meta_data_views (tv, tab);
- return;
- }
- tab = tab->next;
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (tab->builder, "_search_result_frame"));
+ update_meta_data_views (tv, tab);
+ return;
}
- image = GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_preview_image"));
+ tab = tab->next;
+ }
+ image =
+ GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_preview_image"));
gtk_image_clear (image);
- ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_meta_data_list_store"));
+ ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_meta_data_list_store"));
gtk_list_store_clear (ms);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -44,31 +44,28 @@
char *nvalue;
char *emsg;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_model_get (tm, &iter,
- 0, &value,
- -1);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 0, &value, -1);
emsg = NULL;
uri = GNUNET_FS_uri_ksk_create (value, &emsg);
if (uri == NULL)
- {
- GNUNET_break (0);
- GNUNET_free (emsg);
- g_free (value);
- return;
- }
+ {
+ GNUNET_break (0);
+ GNUNET_free (emsg);
+ g_free (value);
+ return;
+ }
nuri = GNUNET_FS_uri_ksk_canonicalize (uri);
nvalue = GNUNET_FS_uri_ksk_to_string_fancy (nuri);
- gtk_list_store_set (GTK_LIST_STORE (tm), &iter,
- 0, nvalue,
- -1);
+ gtk_list_store_set (GTK_LIST_STORE (tm), &iter, 0, nvalue, -1);
GNUNET_FS_uri_destroy (nuri);
GNUNET_FS_uri_destroy (uri);
GNUNET_free (nvalue);
@@ -87,22 +84,22 @@
GtkTreeModel *tm;
GtkTreeIter iter;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_list_store_remove (GTK_LIST_STORE (tm),
- &iter);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
}
/**
* Add keyword from entry line to keyword list.
- */
+ */
void
GNUNET_GTK_advertise_pseudonym_keyword_list_add_button_clicked_cb ()
{
@@ -111,10 +108,11 @@
GtkListStore *ls;
GtkTreeIter iter;
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_keyword_list_store"));
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_entry"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_keyword_list_store"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_advertise_pseudonym_keyword_entry"));
keyword = gtk_entry_get_text (entry);
if (strlen (keyword) > 0)
gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, -1);
@@ -132,33 +130,37 @@
GtkEntry *entry;
GtkWidget *button;
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_add_button"));
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_entry"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_keyword_list_add_button"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_advertise_pseudonym_keyword_entry"));
keyword = gtk_entry_get_text (entry);
- gtk_widget_set_sensitive (button,
- (strlen (keyword) > 0) ? TRUE : FALSE);
+ gtk_widget_set_sensitive (button, (strlen (keyword) > 0) ? TRUE : FALSE);
}
/**
* Update sensitivity of metadata delete button.
*/
static void
-metadata_selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+metadata_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkWidget *button;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_delete_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_delete_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
}
@@ -166,25 +168,29 @@
* Update sensitivity of keyword delete and normalize button.
*/
static void
-keyword_selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+keyword_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkWidget *button;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_del_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_keyword_list_del_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button"));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button"));
gtk_widget_set_sensitive (button,
- gtk_tree_selection_get_selected (sel, NULL, NULL));
+ gtk_tree_selection_get_selected (sel, NULL, NULL));
}
@@ -193,25 +199,31 @@
*/
void
GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb ()
-{
+{
GtkTreeView *tv;
GtkTreeSelection *sel;
const char *value;
GtkEntry *entry;
GtkWidget *button;
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_value_entry"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_value_entry"));
value = gtk_entry_get_text (entry);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_add_button"));
+ button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_add_button"));
gtk_widget_set_sensitive (button,
- (strlen (value) > 0)
- ? gtk_tree_selection_get_selected (sel, NULL, NULL)
- : FALSE);
+ (strlen (value) >
+ 0) ? gtk_tree_selection_get_selected (sel, NULL,
+ NULL) :
+ FALSE);
}
@@ -225,8 +237,7 @@
}
-void
-GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb
()
+void
GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb
()
{
GNUNET_break (0);
}
@@ -235,23 +246,23 @@
* Delete currently selected item from meta data list.
*/
void
-GNUNET_GTK_advertise_pseudonym_metadata_delete_button_clicked_cb()
+GNUNET_GTK_advertise_pseudonym_metadata_delete_button_clicked_cb ()
{
GtkTreeView *tv;
GtkTreeSelection *sel;
GtkTreeModel *tm;
GtkTreeIter iter;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_list_store_remove (GTK_LIST_STORE (tm),
- &iter);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
}
@@ -274,69 +285,63 @@
size_t slen;
char *pos;
- entry = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_value_entry"));
+ entry =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_value_entry"));
value = gtk_entry_get_text (entry);
if ((value == NULL) || (strlen (value) == 0))
- {
- GNUNET_break (0);
- return;
- }
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
tm = gtk_tree_view_get_model (tv);
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 1, &type, -1);
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ if ((type == EXTRACTOR_METATYPE_FILENAME) &&
+ (value[strlen (value) - 1] != '/'))
+ {
+ GNUNET_asprintf (&avalue, "%s/", value);
+ /* if user typed '\' instead of '/', change it! */
+ slen = strlen (avalue);
+ while ((slen > 1) && (avalue[slen - 2] == '\\'))
{
- GNUNET_break (0);
- return;
+ avalue[slen - 2] = '/';
+ avalue[slen - 1] = '\0';
+ slen--;
}
- gtk_tree_model_get (tm,
- &iter,
- 1, &type, -1);
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- if ( (type == EXTRACTOR_METATYPE_FILENAME) &&
- (value[strlen(value)-1] != '/') )
- {
- GNUNET_asprintf (&avalue,
- "%s/",
- value);
- /* if user typed '\' instead of '/', change it! */
- slen = strlen (avalue);
- while ( (slen > 1) &&
- (avalue[slen-2] == '\\') )
- {
- avalue[slen-2] = '/';
- avalue[slen-1] = '\0';
- slen--;
- }
- while (NULL != (pos = strstr (avalue, "\\")))
- *pos = '/';
- /* remove '../' everywhere */
- while (NULL != (pos = strstr (avalue, "../")))
- {
- pos[0] = '_';
- pos[1] = '_';
- pos[2] = '_';
- }
- ivalue = avalue;
- }
- else
+ while (NULL != (pos = strstr (avalue, "\\")))
+ *pos = '/';
+ /* remove '../' everywhere */
+ while (NULL != (pos = strstr (avalue, "../")))
{
- ivalue = value;
- avalue = NULL;
+ pos[0] = '_';
+ pos[1] = '_';
+ pos[2] = '_';
}
+ ivalue = avalue;
+ }
+ else
+ {
+ ivalue = value;
+ avalue = NULL;
+ }
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT,
- 0, type,
- 1, (guint) EXTRACTOR_METAFORMAT_UTF8,
- 2, EXTRACTOR_metatype_to_string (type),
- 3, ivalue,
- -1);
- GNUNET_free_non_null (avalue);
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, type, 1,
+ (guint) EXTRACTOR_METAFORMAT_UTF8, 2,
+ EXTRACTOR_metatype_to_string (type), 3,
+ ivalue, -1);
+ GNUNET_free_non_null (avalue);
gtk_entry_set_text (GTK_ENTRY (entry), "");
}
@@ -351,33 +356,28 @@
* @param id hash identifier for the namespace
*/
static void
-add_to_list (void *cls,
- const char *name,
- const GNUNET_HashCode *id)
+add_to_list (void *cls, const char *name, const GNUNET_HashCode * id)
{
GtkListStore *ls = cls;
GtkTreeIter iter;
- gtk_list_store_insert_with_values (ls,
- &iter,
- -1,
- 0, name,
- 1, GNUNET_FS_namespace_create
(GNUNET_FS_GTK_get_fs_handle (),
- name),
- -1);
-
+ gtk_list_store_insert_with_values (ls, &iter, -1, 0, name, 1,
+ GNUNET_FS_namespace_create
+ (GNUNET_FS_GTK_get_fs_handle (), name),
+ -1);
+
}
static void
-selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
GtkTreeIter iter;
GtkWidget *ok_button;
-
- ok_button = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_select_pseudonym_ok_button"));
+
+ ok_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
gtk_widget_set_sensitive (ok_button, TRUE);
else
@@ -389,8 +389,8 @@
* Advertise pseudonym selected.
*/
void
-GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkWidget *ad;
struct GNUNET_FS_Namespace *ns;
@@ -408,173 +408,165 @@
struct GNUNET_CONTAINER_MetaData *nm;
const char *root;
char *value;
- guint ntype;
+ guint ntype;
guint nformat;
guint type;
guint max_type;
-
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_select_pseudonym_dialog.glade");
+
+ builder =
+ GNUNET_GTK_get_new_builder
+ ("gnunet_fs_gtk_select_pseudonym_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_select_pseudonym_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_select_pseudonym_liststore"));
- GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
- &add_to_list,
- ls);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_select_pseudonym_tree_view"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_dialog"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_liststore"));
+ GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (), &add_to_list, ls);
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (selection_changed_cb), NULL);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- builder = NULL;
- return;
- }
- GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel,
- &tm,
- &iter));
- gtk_tree_model_get (tm,
- &iter,
- 1, &ns,
- -1);
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ builder = NULL;
+ return;
+ }
+ GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, &tm, &iter));
+ gtk_tree_model_get (tm, &iter, 1, &ns, -1);
/* free all namespaces from list store except "ns" */
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm, &iter,
- 1, &nso,
- -1);
- if (ns != nso)
- GNUNET_FS_namespace_delete (nso, GNUNET_NO);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 1, &nso, -1);
+ if (ns != nso)
+ GNUNET_FS_namespace_delete (nso, GNUNET_NO);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
builder = NULL;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_advertise_pseudonym_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder
+ ("gnunet_fs_gtk_advertise_pseudonym_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_metatype_list_store"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_advertise_pseudonym_dialog"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_metatype_list_store"));
max_type = EXTRACTOR_metatype_get_max ();
- type = 1;
+ type = 1;
while (type < max_type - 1)
- {
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT,
- 0, EXTRACTOR_metatype_to_string (type),
- 1, type,
- 2, EXTRACTOR_metatype_to_description
(type),
- -1);
- type++;
- }
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
+ {
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0,
+ EXTRACTOR_metatype_to_string (type), 1,
+ type, 2,
+ EXTRACTOR_metatype_to_description
(type),
+ -1);
+ type++;
+ }
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
-
G_CALLBACK(GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb),
NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK
+
(GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb),
+ NULL);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_metadata_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(metadata_selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (metadata_selection_changed_cb), NULL);
- tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(keyword_selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (keyword_selection_changed_cb), NULL);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- builder = NULL;
- return;
- }
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ builder = NULL;
+ return;
+ }
/* get keywords from list store */
nxt = NULL;
mrg = NULL;
uri = NULL;
- tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
-
"GNUNET_GTK_keyword_list_store"));
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (builder, "GNUNET_GTK_keyword_list_store"));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &value,
- -1);
- nxt = GNUNET_FS_uri_ksk_create_from_args (1, (const char**) &value);
- mrg = GNUNET_FS_uri_ksk_merge (nxt, uri);
- GNUNET_FS_uri_destroy (nxt);
- if (NULL != uri)
- GNUNET_FS_uri_destroy (uri);
- uri = mrg;
- g_free (value);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 0, &value, -1);
+ nxt = GNUNET_FS_uri_ksk_create_from_args (1, (const char **) &value);
+ mrg = GNUNET_FS_uri_ksk_merge (nxt, uri);
+ GNUNET_FS_uri_destroy (nxt);
+ if (NULL != uri)
+ GNUNET_FS_uri_destroy (uri);
+ uri = mrg;
+ g_free (value);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
/* get meta */
nm = GNUNET_CONTAINER_meta_data_create ();
- tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
-
"GNUNET_GTK_meta_data_list_store"));
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (builder, "GNUNET_GTK_meta_data_list_store"));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &ntype,
- 1, &nformat,
- 3, &value,
- -1);
- GNUNET_CONTAINER_meta_data_insert (nm,
- "<user>",
- ntype,
- nformat,
- "text/plain",
- value,
- strlen (value)+1);
- g_free (value);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
+ GNUNET_CONTAINER_meta_data_insert (nm, "<user>", ntype, nformat,
+ "text/plain", value,
+ strlen (value) + 1);
+ g_free (value);
}
- bo.anonymity_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_anonymity_spin_button")));
- bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_priority_spin_button")));
- sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_expiration_year_spin_button"));
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
+ bo.anonymity_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_anonymity_spin_button")));
+ bo.content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_priority_spin_button")));
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_advertise_pseudonym_expiration_year_spin_button"));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- root = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_advertise_pseudonym_root_entry")));
- GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (),
- uri,
- ns,
- nm,
- &bo,
- root,
- NULL, NULL);
+ root =
+ gtk_entry_get_text (GTK_ENTRY
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_advertise_pseudonym_root_entry")));
+ GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), uri, ns, nm,
+ &bo, root, NULL, NULL);
GNUNET_FS_namespace_delete (ns, GNUNET_NO);
GNUNET_CONTAINER_meta_data_destroy (nm);
if (NULL != uri)
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
2011-08-15 22:37:19 UTC (rev 16585)
@@ -29,33 +29,37 @@
/**
*/
void
-GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkWidget *ad;
GtkBuilder *builder;
const char *name;
struct GNUNET_FS_Namespace *ns;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_create_namespace_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder
+ ("gnunet_fs_gtk_create_namespace_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_create_namespace_dialog"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_create_namespace_dialog"));
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- return;
- }
- name = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_create_namespace_name_entry")));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ return;
+ }
+ name =
+ gtk_entry_get_text (GTK_ENTRY
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_create_namespace_name_entry")));
/* FIXME: show busy dialog while doing key creation */
- ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (),
- name);
+ ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
GNUNET_FS_namespace_delete (ns, GNUNET_NO);
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_download.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -29,27 +29,31 @@
static GtkBuilder *builder;
void
-GNUNET_GTK_open_url_dialog_url_entry_changed_cb (GtkEditable *editable,
- gpointer user_data)
+GNUNET_GTK_open_url_dialog_url_entry_changed_cb (GtkEditable * editable,
+ gpointer user_data)
{
struct GNUNET_FS_Uri *uri;
char *perr;
const char *uris;
-
+
perr = NULL;
- uris = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_open_url_dialog_url_entry")));
+ uris =
+ gtk_entry_get_text (GTK_ENTRY
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_dialog_url_entry")));
if (uris != NULL)
uri = GNUNET_FS_uri_parse (uris, &perr);
else
uri = NULL;
- gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_open_url_dialog_execute_button")),
- (uri == NULL) ? FALSE : TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET
+ (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_open_url_dialog_execute_button")),
+ (uri == NULL) ? FALSE : TRUE);
if (uri != NULL)
GNUNET_FS_uri_destroy (uri);
else
- GNUNET_free_non_null (perr);
+ GNUNET_free_non_null (perr);
}
@@ -57,8 +61,8 @@
* User selected "Open URI" in main window.
*/
void
-GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkWidget *ad;
const char *uris;
@@ -70,59 +74,58 @@
GNUNET_assert (builder == NULL);
builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_url_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_open_url_dialog"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_dialog"));
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- builder = NULL;
- fprintf (stderr,
- "Dialog closed!\n");
- return;
- }
- uris = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_open_url_dialog_url_entry")));
- anonymity = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_open_url_dialog_anonymity_spin_button")));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ builder = NULL;
+ fprintf (stderr, "Dialog closed!\n");
+ return;
+ }
+ uris =
+ gtk_entry_get_text (GTK_ENTRY
+ (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_url_dialog_url_entry")));
+ anonymity =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_open_url_dialog_anonymity_spin_button")));
uri = GNUNET_FS_uri_parse (uris, &perr);
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
builder = NULL;
if (uri == NULL)
- {
- GNUNET_free (perr);
- /* Why was "execute" button sensitive!? */
- GNUNET_break (0);
- return;
- }
- if (GNUNET_FS_uri_test_sks (uri) ||
- GNUNET_FS_uri_test_ksk (uri))
- {
- fprintf (stderr,
- "Starting search!\n");
- GNUNET_break (NULL !=
- GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (),
- uri,
- anonymity,
- GNUNET_FS_SEARCH_OPTION_NONE,
- NULL));
- GNUNET_FS_uri_destroy (uri);
- return;
- }
- if (GNUNET_FS_uri_test_chk (uri) ||
- GNUNET_FS_uri_test_loc (uri))
- {
- dc = GNUNET_malloc (sizeof (struct DownloadContext));
- dc->uri = uri;
- dc->anonymity = anonymity;
- GNUNET_FS_GTK_open_download_as_dialog (dc);
- return;
- }
+ {
+ GNUNET_free (perr);
+ /* Why was "execute" button sensitive!? */
+ GNUNET_break (0);
+ return;
+ }
+ if (GNUNET_FS_uri_test_sks (uri) || GNUNET_FS_uri_test_ksk (uri))
+ {
+ fprintf (stderr, "Starting search!\n");
+ GNUNET_break (NULL !=
+ GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
+ anonymity,
+ GNUNET_FS_SEARCH_OPTION_NONE, NULL));
+ GNUNET_FS_uri_destroy (uri);
+ return;
+ }
+ if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
+ {
+ dc = GNUNET_malloc (sizeof (struct DownloadContext));
+ dc->uri = uri;
+ dc->anonymity = anonymity;
+ GNUNET_FS_GTK_open_download_as_dialog (dc);
+ return;
+ }
GNUNET_break (0);
GNUNET_FS_uri_destroy (uri);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -44,9 +44,7 @@
* @return GNUNET_YES if they are equal
*/
static int
-gtk_tree_iter_equals (GtkTreeModel *tm,
- GtkTreeIter *i1,
- GtkTreeIter *i2)
+gtk_tree_iter_equals (GtkTreeModel * tm, GtkTreeIter * i1, GtkTreeIter * i2)
{
GtkTreePath *p1;
GtkTreePath *p2;
@@ -85,111 +83,119 @@
struct GNUNET_FS_FileInformation *fip;
int ns_ok;
gchar *namespace_id;
-
- tm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_file_sharing_publishing_tree_store"));
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_file_sharing_publishing_tree_store"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
sel = gtk_tree_view_get_selection (tv);
ns_ok = GNUNET_YES;
if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
- {
- gtk_tree_model_get (ptm,
- &iter,
- 2, &namespace_id,
- -1);
- if (namespace_id == NULL)
- ns_ok = GNUNET_NO;
- else
- g_free (namespace_id);
- }
- up_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_up_button"));
- down_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_down_button"));
- left_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_left_button"));
- right_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_right_button"));
- delete_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_delete_button"));
- edit_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_edit_button"));
- execute_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_execute_button"));
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ {
+ gtk_tree_model_get (ptm, &iter, 2, &namespace_id, -1);
+ if (namespace_id == NULL)
+ ns_ok = GNUNET_NO;
+ else
+ g_free (namespace_id);
+ }
+ up_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_up_button"));
+ down_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_down_button"));
+ left_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_left_button"));
+ right_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_right_button"));
+ delete_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_delete_button"));
+ edit_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_edit_button"));
+ execute_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_master_publish_dialog_execute_button"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
tm = gtk_tree_view_get_model (tv);
- if ( (gtk_tree_model_get_iter_first (tm, &iter)) &&
- (ns_ok == GNUNET_YES) )
+ if ((gtk_tree_model_get_iter_first (tm, &iter)) && (ns_ok == GNUNET_YES))
gtk_widget_set_sensitive (execute_button, TRUE);
else
gtk_widget_set_sensitive (execute_button, FALSE);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- gtk_widget_set_sensitive (up_button, FALSE);
- gtk_widget_set_sensitive (down_button, FALSE);
- gtk_widget_set_sensitive (left_button, FALSE);
- gtk_widget_set_sensitive (right_button, FALSE);
- gtk_widget_set_sensitive (delete_button, FALSE);
- gtk_widget_set_sensitive (edit_button, FALSE);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ gtk_widget_set_sensitive (up_button, FALSE);
+ gtk_widget_set_sensitive (down_button, FALSE);
+ gtk_widget_set_sensitive (left_button, FALSE);
+ gtk_widget_set_sensitive (right_button, FALSE);
+ gtk_widget_set_sensitive (delete_button, FALSE);
+ gtk_widget_set_sensitive (edit_button, FALSE);
+ return;
+ }
gtk_widget_set_sensitive (delete_button, TRUE);
gtk_widget_set_sensitive (edit_button, TRUE);
/* now figure out which move operations are currently legal */
GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, NULL, &iter));
if (TRUE == gtk_tree_model_iter_next (tm, &iter))
- {
- gtk_widget_set_sensitive (down_button, TRUE);
- }
+ {
+ gtk_widget_set_sensitive (down_button, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (down_button, FALSE);
- }
+ {
+ gtk_widget_set_sensitive (down_button, FALSE);
+ }
GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, NULL, &iter));
if (TRUE == gtk_tree_model_iter_parent (tm, &parent, &iter))
- {
- gtk_widget_set_sensitive (left_button, TRUE);
- GNUNET_assert (TRUE ==
- gtk_tree_model_iter_children (tm, &pred, &parent));
- }
+ {
+ gtk_widget_set_sensitive (left_button, TRUE);
+ GNUNET_assert (TRUE == gtk_tree_model_iter_children (tm, &pred, &parent));
+ }
else
- {
- gtk_widget_set_sensitive (left_button, FALSE);
- GNUNET_assert (TRUE ==
- gtk_tree_model_get_iter_first (tm, &pred));
- }
+ {
+ gtk_widget_set_sensitive (left_button, FALSE);
+ GNUNET_assert (TRUE == gtk_tree_model_get_iter_first (tm, &pred));
+ }
/* iterate over 'next' of pred to find out if our
- predecessor is a directory! */
+ * predecessor is a directory! */
is_dir = GNUNET_SYSERR;
while (GNUNET_YES != gtk_tree_iter_equals (tm, &pred, &iter))
- {
- gtk_tree_model_get (tm, &pred,
- 5, &fip, -1);
- is_dir = GNUNET_FS_file_information_is_directory (fip);
- GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
- }
+ {
+ gtk_tree_model_get (tm, &pred, 5, &fip, -1);
+ is_dir = GNUNET_FS_file_information_is_directory (fip);
+ GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
+ }
if (GNUNET_YES == is_dir)
- {
- gtk_widget_set_sensitive (right_button, TRUE);
- }
+ {
+ gtk_widget_set_sensitive (right_button, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (right_button, FALSE);
- }
+ {
+ gtk_widget_set_sensitive (right_button, FALSE);
+ }
if (GNUNET_SYSERR != is_dir)
- {
- gtk_widget_set_sensitive (up_button, TRUE);
- }
+ {
+ gtk_widget_set_sensitive (up_button, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (up_button, FALSE);
- }
+ {
+ gtk_widget_set_sensitive (up_button, FALSE);
+ }
}
@@ -202,10 +208,8 @@
* @param iter parent entry, or NULL for top-level addition
*/
static void
-add_file_at_iter (const char *filename,
- const struct GNUNET_FS_BlockOptions *bo,
- int do_index,
- GtkTreeIter *iter)
+add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions
*bo,
+ int do_index, GtkTreeIter * iter)
{
struct GNUNET_FS_FileInformation *fi;
GtkTreeRowReference *row_reference;
@@ -223,73 +227,53 @@
if (0 != STAT (filename, &sbuf))
return;
if (S_ISDIR (sbuf.st_mode))
- {
- file_size = 0;
- }
+ {
+ file_size = 0;
+ }
else
+ {
+ if (GNUNET_OK != GNUNET_DISK_file_size (filename, &file_size, GNUNET_YES))
{
- if (GNUNET_OK !=
- GNUNET_DISK_file_size (filename,
- &file_size,
- GNUNET_YES))
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_break (0);
+ return;
}
- ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_file_sharing_publishing_tree_store"));
+ }
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_file_sharing_publishing_tree_store"));
meta = GNUNET_CONTAINER_meta_data_create ();
- GNUNET_FS_meta_data_extract_from_file (meta,
- filename,
- GNUNET_FS_GTK_get_le_plugins());
- GNUNET_CONTAINER_meta_data_delete (meta,
- EXTRACTOR_METATYPE_FILENAME,
- NULL, 0);
+ GNUNET_FS_meta_data_extract_from_file (meta, filename,
+ GNUNET_FS_GTK_get_le_plugins ());
+ GNUNET_CONTAINER_meta_data_delete (meta, EXTRACTOR_METATYPE_FILENAME, NULL,
+ 0);
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<gnunet-gtk>",
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_UTF8,
- "text/plain",
- short_fn,
- strlen(short_fn)+1);
+ GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet-gtk>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+ short_fn, strlen (short_fn) + 1);
ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
- gtk_tree_store_insert_before (ts,
- &pos,
- iter,
- NULL);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
- &pos);
- row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
- path);
+ gtk_tree_store_insert_before (ts, &pos, iter, NULL);
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), &pos);
+ row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts), path);
gtk_tree_path_free (path);
- fi = GNUNET_FS_file_information_create_from_file
(GNUNET_FS_GTK_get_fs_handle (),
- row_reference,
- filename,
- ksk_uri,
- meta,
- do_index,
- bo);
+ fi = GNUNET_FS_file_information_create_from_file (GNUNET_FS_GTK_get_fs_handle
+ (), row_reference,
filename,
+ ksk_uri, meta, do_index,
+ bo);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_FS_uri_destroy (ksk_uri);
if (S_ISDIR (sbuf.st_mode))
file_size_fancy = GNUNET_strdup (MARKER_DIR_FILE_SIZE);
else
file_size_fancy = GNUNET_STRINGS_byte_size_fancy (file_size);
- gtk_tree_store_set (ts, &pos,
- 0, file_size_fancy,
- 1, (gboolean) do_index,
- 2, short_fn,
- 3, (guint) bo->anonymity_level,
- 4, (guint) bo->content_priority,
- 5, fi,
- -1);
+ gtk_tree_store_set (ts, &pos, 0, file_size_fancy, 1, (gboolean) do_index, 2,
+ short_fn, 3, (guint) bo->anonymity_level, 4,
+ (guint) bo->content_priority, 5, fi, -1);
GNUNET_free (file_size_fancy);
- update_selectivity ();
+ update_selectivity ();
}
@@ -303,10 +287,8 @@
* @param pos iterator to set to the location of the new element
*/
static void
-create_dir_at_iter (const char *name,
- const struct GNUNET_FS_BlockOptions *bo,
- GtkTreeIter *iter,
- GtkTreeIter *pos)
+create_dir_at_iter (const char *name, const struct GNUNET_FS_BlockOptions *bo,
+ GtkTreeIter * iter, GtkTreeIter * pos)
{
struct GNUNET_FS_FileInformation *fi;
GtkTreeRowReference *row_reference;
@@ -314,40 +296,25 @@
struct GNUNET_CONTAINER_MetaData *meta;
GtkTreeStore *ts;
- ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_file_sharing_publishing_tree_store"));
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_file_sharing_publishing_tree_store"));
meta = GNUNET_CONTAINER_meta_data_create ();
GNUNET_FS_meta_data_make_directory (meta);
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<gnunet-gtk>",
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_UTF8,
- "text/plain",
- name,
- strlen(name)+1);
- gtk_tree_store_insert_before (ts,
- pos,
- iter,
- NULL);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
- pos);
- row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
- path);
+ GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet-gtk>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+ name, strlen (name) + 1);
+ gtk_tree_store_insert_before (ts, pos, iter, NULL);
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), pos);
+ row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts), path);
gtk_tree_path_free (path);
- fi = GNUNET_FS_file_information_create_empty_directory
(GNUNET_FS_GTK_get_fs_handle (),
- row_reference,
- NULL,
- meta,
- bo);
+ fi = GNUNET_FS_file_information_create_empty_directory
+ (GNUNET_FS_GTK_get_fs_handle (), row_reference, NULL, meta, bo);
GNUNET_CONTAINER_meta_data_destroy (meta);
- gtk_tree_store_set (ts, pos,
- 0, MARKER_DIR_FILE_SIZE,
- 1, (gboolean) GNUNET_NO,
- 2, name,
- 3, (guint) bo->anonymity_level,
- 4, (guint) bo->content_priority,
- 5, fi,
- -1);
+ gtk_tree_store_set (ts, pos, 0, MARKER_DIR_FILE_SIZE, 1, (gboolean)
GNUNET_NO,
+ 2, name, 3, (guint) bo->anonymity_level, 4,
+ (guint) bo->content_priority, 5, fi, -1);
update_selectivity ();
}
@@ -393,7 +360,7 @@
* Type of the value.
*/
enum EXTRACTOR_MetaType type;
-
+
/**
* Format of the value.
*/
@@ -478,13 +445,11 @@
* @return 0 to continue extracting, 1 to abort
*/
static int
-add_to_meta_counter (void *cls,
- const char *plugin_name,
- enum EXTRACTOR_MetaType type,
- enum EXTRACTOR_MetaFormat format,
- const char *data_mime_type,
- const char *data,
- size_t data_len)
+add_to_meta_counter (void *cls, const char *plugin_name,
+ enum EXTRACTOR_MetaType type,
+ enum EXTRACTOR_MetaFormat format,
+ const char *data_mime_type, const char *data,
+ size_t data_len)
{
struct GNUNET_CONTAINER_MultiHashMap *mcm = cls;
struct MetaCounter *cnt;
@@ -492,44 +457,35 @@
size_t mlen;
size_t dlen;
- if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
- (format != EXTRACTOR_METAFORMAT_C_STRING) )
+ if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
+ (format != EXTRACTOR_METAFORMAT_C_STRING))
return 0;
dlen = strlen (data) + 1;
- GNUNET_CRYPTO_hash (data,
- dlen - 1,
- &hc);
+ GNUNET_CRYPTO_hash (data, dlen - 1, &hc);
cnt = GNUNET_CONTAINER_multihashmap_get (mcm, &hc);
if (cnt == NULL)
- {
- mlen = strlen (data_mime_type) + 1;
- cnt = GNUNET_malloc (sizeof (struct MetaCounter) +
- dlen + mlen);
- cnt->count = 1;
- cnt->value = (const char *) &cnt[1];
- cnt->value_mimetype = &cnt->value[dlen];
- memcpy (&cnt[1],
- data,
- dlen);
- memcpy ((char*) cnt->value_mimetype,
- data_mime_type,
- mlen);
- cnt->type = type;
- cnt->format = format;
- GNUNET_CONTAINER_multihashmap_put (mcm,
- &hc,
- cnt,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ {
+ mlen = strlen (data_mime_type) + 1;
+ cnt = GNUNET_malloc (sizeof (struct MetaCounter) + dlen + mlen);
+ cnt->count = 1;
+ cnt->value = (const char *) &cnt[1];
+ cnt->value_mimetype = &cnt->value[dlen];
+ memcpy (&cnt[1], data, dlen);
+ memcpy ((char *) cnt->value_mimetype, data_mime_type, mlen);
+ cnt->type = type;
+ cnt->format = format;
+ GNUNET_CONTAINER_multihashmap_put (mcm, &hc, cnt,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- }
+ }
else
- {
- cnt->count++;
- if (cnt->format == EXTRACTOR_METAFORMAT_C_STRING)
- cnt->format = format; /* possibly improve to UTF8 */
- if (cnt->type == EXTRACTOR_METATYPE_UNKNOWN)
- cnt->type = type;
- }
+ {
+ cnt->count++;
+ if (cnt->format == EXTRACTOR_METAFORMAT_C_STRING)
+ cnt->format = format; /* possibly improve to UTF8 */
+ if (cnt->type == EXTRACTOR_METATYPE_UNKNOWN)
+ cnt->type = type;
+ }
return 0;
}
@@ -542,8 +498,7 @@
* @param filename name of the file to process
*/
static void
-extract_file (struct AddDirContext *adc,
- const char *filename)
+extract_file (struct AddDirContext *adc, const char *filename)
{
struct PublishData *pd;
GNUNET_HashCode hc;
@@ -553,38 +508,25 @@
adc->dir_entry_count++;
pd = GNUNET_malloc (sizeof (struct PublishData));
pd->meta = GNUNET_CONTAINER_meta_data_create ();
- GNUNET_FS_meta_data_extract_from_file (pd->meta,
- filename,
- GNUNET_FS_GTK_get_le_plugins());
- GNUNET_CONTAINER_meta_data_delete (pd->meta,
- EXTRACTOR_METATYPE_FILENAME,
- NULL, 0);
+ GNUNET_FS_meta_data_extract_from_file (pd->meta, filename,
+ GNUNET_FS_GTK_get_le_plugins ());
+ GNUNET_CONTAINER_meta_data_delete (pd->meta, EXTRACTOR_METATYPE_FILENAME,
+ NULL, 0);
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- GNUNET_CONTAINER_meta_data_insert (pd->meta,
- "<gnunet-gtk>",
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_UTF8,
- "text/plain",
- short_fn,
- strlen(short_fn)+1);
+ GNUNET_CONTAINER_meta_data_insert (pd->meta, "<gnunet-gtk>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+ short_fn, strlen (short_fn) + 1);
- gtk_tree_store_insert_before (adc->ts,
- &pd->iter,
- adc->parent,
- NULL);
- GNUNET_CRYPTO_hash (filename,
- strlen (filename),
- &hc);
- GNUNET_CONTAINER_multihashmap_put (adc->metamap,
- &hc,
- pd,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- GNUNET_CONTAINER_meta_data_iterate (pd->meta,
- &add_to_meta_counter,
- adc->metacounter);
+ gtk_tree_store_insert_before (adc->ts, &pd->iter, adc->parent, NULL);
+ GNUNET_CRYPTO_hash (filename, strlen (filename), &hc);
+ GNUNET_CONTAINER_multihashmap_put (adc->metamap, &hc, pd,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_meta_data_iterate (pd->meta, &add_to_meta_counter,
+ adc->metacounter);
}
@@ -597,12 +539,10 @@
* @return always GNUNET_OK
*/
static int
-remove_keyword (void *cls,
- const char *keyword,
- int is_mandatory)
+remove_keyword (void *cls, const char *keyword, int is_mandatory)
{
struct GNUNET_FS_Uri *ksk = cls;
-
+
GNUNET_FS_uri_ksk_remove_keyword (ksk, keyword);
return GNUNET_OK;
}
@@ -622,14 +562,11 @@
* @param meta metadata for the file
*/
static void
-add_entry_to_ts (GtkTreeStore *ts,
- GtkTreeIter *iter,
- const char *filename,
- const struct GNUNET_FS_BlockOptions *bo,
- int do_index,
- struct GNUNET_CONTAINER_MetaData *md_no_ksk,
- struct GNUNET_CONTAINER_MetaData *meta)
-{
+add_entry_to_ts (GtkTreeStore * ts, GtkTreeIter * iter, const char *filename,
+ const struct GNUNET_FS_BlockOptions *bo, int do_index,
+ struct GNUNET_CONTAINER_MetaData *md_no_ksk,
+ struct GNUNET_CONTAINER_MetaData *meta)
+{
char *file_size_fancy;
struct GNUNET_FS_FileInformation *fi;
GtkTreeRowReference *row_reference;
@@ -644,59 +581,43 @@
if (0 != STAT (filename, &sbuf))
return;
if (S_ISDIR (sbuf.st_mode))
- {
- file_size = 0;
- }
+ {
+ file_size = 0;
+ }
else
+ {
+ if (GNUNET_OK != GNUNET_DISK_file_size (filename, &file_size, GNUNET_YES))
{
- if (GNUNET_OK !=
- GNUNET_DISK_file_size (filename,
- &file_size,
- GNUNET_YES))
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_break (0);
+ return;
}
+ }
ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
kill_ksk = GNUNET_FS_uri_ksk_create_from_meta_data (md_no_ksk);
if (kill_ksk != NULL)
- {
- GNUNET_FS_uri_ksk_get_keywords (kill_ksk,
- &remove_keyword,
- ksk_uri);
- GNUNET_FS_uri_destroy (kill_ksk);
- }
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
- iter);
- row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
- path);
+ {
+ GNUNET_FS_uri_ksk_get_keywords (kill_ksk, &remove_keyword, ksk_uri);
+ GNUNET_FS_uri_destroy (kill_ksk);
+ }
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts), iter);
+ row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts), path);
gtk_tree_path_free (path);
if (S_ISDIR (sbuf.st_mode))
- {
- GNUNET_CONTAINER_meta_data_delete (meta,
- EXTRACTOR_METATYPE_MIMETYPE,
- NULL, 0);
- GNUNET_FS_meta_data_make_directory (meta);
- GNUNET_FS_uri_ksk_add_keyword (ksk_uri,
- GNUNET_FS_DIRECTORY_MIME,
- GNUNET_NO);
- fi = GNUNET_FS_file_information_create_empty_directory
(GNUNET_FS_GTK_get_fs_handle (),
- row_reference,
- ksk_uri,
- meta,
- bo);
- }
+ {
+ GNUNET_CONTAINER_meta_data_delete (meta, EXTRACTOR_METATYPE_MIMETYPE, NULL,
+ 0);
+ GNUNET_FS_meta_data_make_directory (meta);
+ GNUNET_FS_uri_ksk_add_keyword (ksk_uri, GNUNET_FS_DIRECTORY_MIME,
+ GNUNET_NO);
+ fi = GNUNET_FS_file_information_create_empty_directory
+ (GNUNET_FS_GTK_get_fs_handle (), row_reference, ksk_uri, meta, bo);
+ }
else
- {
- fi = GNUNET_FS_file_information_create_from_file
(GNUNET_FS_GTK_get_fs_handle (),
- row_reference,
- filename,
- ksk_uri,
- meta,
- do_index,
- bo);
- }
+ {
+ fi = GNUNET_FS_file_information_create_from_file
+ (GNUNET_FS_GTK_get_fs_handle (), row_reference, filename, ksk_uri,
meta,
+ do_index, bo);
+ }
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_FS_uri_destroy (ksk_uri);
if (S_ISDIR (sbuf.st_mode))
@@ -706,14 +627,9 @@
short_fn = filename;
while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR)))
short_fn = 1 + ss;
- gtk_tree_store_set (ts, iter,
- 0, file_size_fancy,
- 1, (gboolean) do_index,
- 2, short_fn,
- 3, (guint) bo->anonymity_level,
- 4, (guint) bo->content_priority,
- 5, fi,
- -1);
+ gtk_tree_store_set (ts, iter, 0, file_size_fancy, 1, (gboolean) do_index, 2,
+ short_fn, 3, (guint) bo->anonymity_level, 4,
+ (guint) bo->content_priority, 5, fi, -1);
GNUNET_free (file_size_fancy);
}
@@ -727,28 +643,17 @@
* @param filename file or directory to scan
*/
static int
-publish_entry (void *cls,
- const char *filename)
+publish_entry (void *cls, const char *filename)
{
struct AddDirContext *adc = cls;
struct PublishData *pd;
GNUNET_HashCode hc;
- GNUNET_CRYPTO_hash (filename,
- strlen (filename),
- &hc);
- pd = GNUNET_CONTAINER_multihashmap_get (adc->metamap,
- &hc);
- add_entry_to_ts (adc->ts,
- &pd->iter,
- filename,
- &adc->bo,
- adc->do_index,
- adc->no_ksk,
- pd->meta);
- GNUNET_CONTAINER_multihashmap_remove (adc->metamap,
- &hc,
- pd);
+ GNUNET_CRYPTO_hash (filename, strlen (filename), &hc);
+ pd = GNUNET_CONTAINER_multihashmap_get (adc->metamap, &hc);
+ add_entry_to_ts (adc->ts, &pd->iter, filename, &adc->bo, adc->do_index,
+ adc->no_ksk, pd->meta);
+ GNUNET_CONTAINER_multihashmap_remove (adc->metamap, &hc, pd);
GNUNET_free (pd);
return GNUNET_OK;
}
@@ -778,23 +683,18 @@
*
*/
static int
-migrate_and_drop (void *cls,
- const GNUNET_HashCode *key,
- void *value)
+migrate_and_drop (void *cls, const GNUNET_HashCode * key, void *value)
{
struct MetaProcessContext *mpc = cls;
struct MetaCounter *counter = value;
if (counter->count >= mpc->threshold)
- {
- GNUNET_CONTAINER_meta_data_insert (mpc->md,
- "<gnunet-gtk>",
- counter->type,
- counter->format,
- counter->value_mimetype,
- counter->value,
- strlen (counter->value)+1);
- }
+ {
+ GNUNET_CONTAINER_meta_data_insert (mpc->md, "<gnunet-gtk>", counter->type,
+ counter->format,
counter->value_mimetype,
+ counter->value,
+ strlen (counter->value) + 1);
+ }
GNUNET_free (counter);
return GNUNET_YES;
}
@@ -814,10 +714,9 @@
struct MetaProcessContext mpc;
mpc.md = GNUNET_CONTAINER_meta_data_create ();
- mpc.threshold = (adc->dir_entry_count + 1) / 2; /* 50% */
- GNUNET_CONTAINER_multihashmap_iterate (adc->metacounter,
- &migrate_and_drop,
- &mpc);
+ mpc.threshold = (adc->dir_entry_count + 1) / 2; /* 50% */
+ GNUNET_CONTAINER_multihashmap_iterate (adc->metacounter, &migrate_and_drop,
+ &mpc);
GNUNET_CONTAINER_multihashmap_destroy (adc->metacounter);
return mpc.md;
}
@@ -832,9 +731,7 @@
* @param filename file or directory to scan
*/
static int
-scan_directory (void *cls,
- const char *filename)
-
+scan_directory (void *cls, const char *filename)
{
struct AddDirContext *adc = cls;
struct stat sbuf;
@@ -848,64 +745,46 @@
if (0 != STAT (filename, &sbuf))
return GNUNET_OK;
if (S_ISDIR (sbuf.st_mode))
+ {
+ parent = adc->parent;
+ mhm = adc->metamap;
+ mcm = adc->metacounter;
+ pc = adc->dir_entry_count;
+ adc->metamap = GNUNET_CONTAINER_multihashmap_create (1024);
+ adc->metacounter = GNUNET_CONTAINER_multihashmap_create (1024);
+ adc->dir_entry_count = 0;
+ pd = GNUNET_malloc (sizeof (struct PublishData));
+ gtk_tree_store_insert_before (adc->ts, &pd->iter, parent, NULL);
+ adc->parent = &pd->iter;
+ GNUNET_DISK_directory_scan (filename, &scan_directory, adc);
+ pd->meta = process_metadata (adc);
+ adc->no_ksk = pd->meta;
+ GNUNET_DISK_directory_scan (filename, &publish_entry, adc);
+ GNUNET_CONTAINER_multihashmap_destroy (adc->metamap);
+ adc->metamap = mhm;
+ adc->metacounter = mcm;
+ adc->parent = parent;
+ adc->dir_entry_count = pc + 1;
+ if (adc->metamap != NULL)
{
- parent = adc->parent;
- mhm = adc->metamap;
- mcm = adc->metacounter;
- pc = adc->dir_entry_count;
- adc->metamap = GNUNET_CONTAINER_multihashmap_create (1024);
- adc->metacounter = GNUNET_CONTAINER_multihashmap_create (1024);
- adc->dir_entry_count = 0;
- pd = GNUNET_malloc (sizeof (struct PublishData));
- gtk_tree_store_insert_before (adc->ts,
- &pd->iter,
- parent,
- NULL);
- adc->parent = &pd->iter;
- GNUNET_DISK_directory_scan (filename,
- &scan_directory,
- adc);
- pd->meta = process_metadata (adc);
- adc->no_ksk = pd->meta;
- GNUNET_DISK_directory_scan (filename,
- &publish_entry,
- adc);
- GNUNET_CONTAINER_multihashmap_destroy (adc->metamap);
- adc->metamap = mhm;
- adc->metacounter = mcm;
- adc->parent = parent;
- adc->dir_entry_count = pc + 1;
- if (adc->metamap != NULL)
- {
- GNUNET_CRYPTO_hash (filename,
- strlen (filename),
- &hc);
- GNUNET_CONTAINER_multihashmap_put (adc->metamap,
- &hc,
- pd,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- GNUNET_CONTAINER_meta_data_iterate (pd->meta,
- &add_to_meta_counter,
- mcm);
- }
- else
- {
- GNUNET_assert (mcm == NULL);
- /* we're top-level */
- add_entry_to_ts (adc->ts,
- &pd->iter,
- filename,
- &adc->bo,
- adc->do_index,
- NULL,
- pd->meta);
- }
+ GNUNET_CRYPTO_hash (filename, strlen (filename), &hc);
+ GNUNET_CONTAINER_multihashmap_put (adc->metamap, &hc, pd,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_meta_data_iterate (pd->meta, &add_to_meta_counter, mcm);
}
- else
+ else
{
- GNUNET_assert (adc->metamap != NULL);
- extract_file (adc, filename);
+ GNUNET_assert (mcm == NULL);
+ /* we're top-level */
+ add_entry_to_ts (adc->ts, &pd->iter, filename, &adc->bo, adc->do_index,
+ NULL, pd->meta);
}
+ }
+ else
+ {
+ GNUNET_assert (adc->metamap != NULL);
+ extract_file (adc, filename);
+ }
return GNUNET_OK;
}
@@ -918,25 +797,26 @@
* @param do_index should we index?
*/
static void
-add_dir (const char *filename,
- const struct GNUNET_FS_BlockOptions *bo,
- int do_index)
+add_dir (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
+ int do_index)
{
struct stat sbuf;
struct AddDirContext scan_ctx;
if (0 != STAT (filename, &sbuf))
return;
- if (! S_ISDIR (sbuf.st_mode))
- {
- GNUNET_break (0);
- return;
- }
+ if (!S_ISDIR (sbuf.st_mode))
+ {
+ GNUNET_break (0);
+ return;
+ }
memset (&scan_ctx, 0, sizeof (scan_ctx));
scan_ctx.bo = *bo;
scan_ctx.do_index = do_index;
- scan_ctx.ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_file_sharing_publishing_tree_store"));
+ scan_ctx.ts =
+ GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_file_sharing_publishing_tree_store"));
scan_directory (&scan_ctx, filename);
}
@@ -945,22 +825,20 @@
static void
-selection_changed_cb (GtkTreeSelection *ts,
- gpointer user_data)
+selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
{
update_selectivity ();
}
static void
-remove_old_entry (GtkTreeStore *ts,
- GtkTreeIter *root)
+remove_old_entry (GtkTreeStore * ts, GtkTreeIter * root)
{
GtkTreeIter child;
-
- while (TRUE == gtk_tree_model_iter_children (GTK_TREE_MODEL (ts),
- &child, root))
- remove_old_entry (ts, &child);
+
+ while (TRUE ==
+ gtk_tree_model_iter_children (GTK_TREE_MODEL (ts), &child, root))
+ remove_old_entry (ts, &child);
gtk_tree_store_remove (ts, root);
}
@@ -969,10 +847,8 @@
* Move an entry in the tree.
*/
static void
-move_entry (GtkTreeModel *tm,
- GtkTreeIter *old,
- GtkTreeIter *newpos,
- int dsel)
+move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
+ int dsel)
{
struct GNUNET_FS_FileInformation *fip;
GtkTreeView *tv;
@@ -987,72 +863,56 @@
GtkTreeIter cnewpos;
GtkTreeRowReference *rr;
GtkTreeRowReference *rr2;
-
- gtk_tree_model_get (tm,
- old,
- 0, &fsf,
- 1, &do_index,
- 2, &short_fn,
- 3, &anonymity_level,
- 4, &priority,
- 5, &fip,
- -1);
- gtk_tree_store_set (GTK_TREE_STORE (tm), newpos,
- 0, fsf,
- 1, do_index,
- 2, short_fn,
- 3, (guint)anonymity_level,
- 4, (guint) priority,
- 5, fip,
- -1);
+
+ gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
+ &anonymity_level, 4, &priority, 5, &fip, -1);
+ gtk_tree_store_set (GTK_TREE_STORE (tm), newpos, 0, fsf, 1, do_index, 2,
+ short_fn, 3, (guint) anonymity_level, 4, (guint)
priority,
+ 5, fip, -1);
sel = NULL;
tv = NULL;
if (dsel == GNUNET_YES)
- {
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
- sel = gtk_tree_view_get_selection (tv);
- path = gtk_tree_model_get_path (tm, newpos);
- rr = gtk_tree_row_reference_new (tm, path);
- gtk_tree_path_free (path);
- }
+ {
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ sel = gtk_tree_view_get_selection (tv);
+ path = gtk_tree_model_get_path (tm, newpos);
+ rr = gtk_tree_row_reference_new (tm, path);
+ gtk_tree_path_free (path);
+ }
else
- {
- rr = NULL;
- }
+ {
+ rr = NULL;
+ }
if (TRUE == gtk_tree_model_iter_children (tm, &child, old))
+ {
+ do
{
- do
- {
- path = gtk_tree_model_get_path (tm, &child);
- rr2 = gtk_tree_row_reference_new (tm, path);
- gtk_tree_path_free (path);
- gtk_tree_store_insert_before (GTK_TREE_STORE (tm),
- &cnewpos, newpos, NULL);
- move_entry (tm, &child, &cnewpos, GNUNET_NO);
- path = gtk_tree_row_reference_get_path (rr2);
- gtk_tree_row_reference_free (rr2);
- GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm,
- &child,
- path));
- gtk_tree_path_free (path);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &child));
+ path = gtk_tree_model_get_path (tm, &child);
+ rr2 = gtk_tree_row_reference_new (tm, path);
+ gtk_tree_path_free (path);
+ gtk_tree_store_insert_before (GTK_TREE_STORE (tm), &cnewpos, newpos,
+ NULL);
+ move_entry (tm, &child, &cnewpos, GNUNET_NO);
+ path = gtk_tree_row_reference_get_path (rr2);
+ gtk_tree_row_reference_free (rr2);
+ GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &child, path));
+ gtk_tree_path_free (path);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &child));
+ }
g_free (short_fn);
g_free (fsf);
if (dsel == GNUNET_YES)
- {
- path = gtk_tree_row_reference_get_path (rr);
- gtk_tree_row_reference_free (rr);
- gtk_tree_view_expand_to_path (tv, path);
- GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm,
- newpos,
- path));
- gtk_tree_path_free (path);
- gtk_tree_selection_select_iter (sel,
- newpos);
- }
+ {
+ path = gtk_tree_row_reference_get_path (rr);
+ gtk_tree_row_reference_free (rr);
+ gtk_tree_view_expand_to_path (tv, path);
+ GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, newpos, path));
+ gtk_tree_path_free (path);
+ gtk_tree_selection_select_iter (sel, newpos);
+ }
update_selectivity ();
}
@@ -1060,24 +920,22 @@
* User has changed the "current" identifier for the content in
* the GtkTreeView. Update the model.
*/
-void
-GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
(GtkCellRendererText *renderer,
- gchar
*cpath,
- gchar
*new_text,
- gpointer
user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkTreeStore *ts;
- ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_pseudonym_tree_store"));
-
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+
if (TRUE !=
gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
gtk_tree_store_set (ts, &iter, 5, new_text, -1);
update_selectivity ();
}
@@ -1087,32 +945,30 @@
* User has changed the "current" identifier for the content in
* the GtkTreeView. Update the model.
*/
-void
-GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
(GtkCellRendererText *renderer,
- gchar
*cpath,
- gchar
*new_text,
-
gpointer user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
+ (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkTreeStore *ts;
- ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_pseudonym_tree_store"));
-
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+
if (TRUE !=
gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
gtk_tree_store_set (ts, &iter, 2, new_text, -1);
update_selectivity ();
}
void
-GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1123,49 +979,45 @@
GtkTreeIter prev;
GtkTreeIter pos;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE == gtk_tree_model_iter_parent (tm, &parent, &iter))
- {
- GNUNET_assert (TRUE == gtk_tree_model_iter_children (tm, &pred,
&parent));
- }
+ {
+ GNUNET_assert (TRUE == gtk_tree_model_iter_children (tm, &pred, &parent));
+ }
else if (TRUE != gtk_tree_model_get_iter_first (tm, &pred))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* iterate over 'next' of pred to find out who our predecessor is! */
memset (&prev, 0, sizeof (GtkTreeIter));
while (GNUNET_YES != gtk_tree_iter_equals (tm, &pred, &iter))
- {
- prev = pred;
- GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
- }
- gtk_tree_store_insert_before (GTK_TREE_STORE (tm),
- &pos, &prev, NULL);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ prev = pred;
+ GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
+ }
+ gtk_tree_store_insert_before (GTK_TREE_STORE (tm), &pos, &prev, NULL);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
move_entry (tm, &iter, &pos, GNUNET_YES);
remove_old_entry (GTK_TREE_STORE (tm), &iter);
}
void
-GNUNET_GTK_master_publish_dialog_left_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_left_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1174,38 +1026,34 @@
GtkTreeIter parent;
GtkTreeIter pos;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_iter_parent (tm, &parent, &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_store_insert_after (GTK_TREE_STORE (tm),
- &pos, NULL, &parent);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_store_insert_after (GTK_TREE_STORE (tm), &pos, NULL, &parent);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
move_entry (tm, &iter, &pos, GNUNET_YES);
remove_old_entry (GTK_TREE_STORE (tm), &iter);
}
void
-GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1217,54 +1065,50 @@
GtkTreeIter *pprev;
GtkTreeIter pos;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE == gtk_tree_model_iter_parent (tm, &parent, &iter))
- {
- GNUNET_assert (TRUE == gtk_tree_model_iter_children (tm, &pred,
&parent));
- pprev = &parent;
- }
+ {
+ GNUNET_assert (TRUE == gtk_tree_model_iter_children (tm, &pred, &parent));
+ pprev = &parent;
+ }
else if (TRUE == gtk_tree_model_get_iter_first (tm, &pred))
- {
- pprev = NULL;
- }
+ {
+ pprev = NULL;
+ }
else
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* iterate over 'next' of pred to find out who our predecessor is! */
while (GNUNET_YES != gtk_tree_iter_equals (tm, &pred, &iter))
- {
- prev = pred;
- pprev = &prev;
- GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
- }
- gtk_tree_store_insert_before (GTK_TREE_STORE (tm),
- &pos, NULL, pprev);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ prev = pred;
+ pprev = &prev;
+ GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &pred));
+ }
+ gtk_tree_store_insert_before (GTK_TREE_STORE (tm), &pos, NULL, pprev);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
move_entry (tm, &iter, &pos, GNUNET_YES);
remove_old_entry (GTK_TREE_STORE (tm), &iter);
}
void
-GNUNET_GTK_master_publish_dialog_down_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_down_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1273,41 +1117,35 @@
GtkTreeIter next;
GtkTreeIter pos;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &next))
- {
- GNUNET_break (0);
- return;
- }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &next))
+ {
+ GNUNET_break (0);
+ return;
+ }
GNUNET_assert (TRUE == gtk_tree_model_iter_next (tm, &next));
- gtk_tree_store_insert_after (GTK_TREE_STORE (tm),
- &pos, NULL, &next);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
+ gtk_tree_store_insert_after (GTK_TREE_STORE (tm), &pos, NULL, &next);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
move_entry (tm, &iter, &pos, GNUNET_YES);
remove_old_entry (GTK_TREE_STORE (tm), &iter);
}
void
-GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeSelection *sel;
@@ -1315,8 +1153,9 @@
GtkTreeIter pos;
struct GNUNET_FS_BlockOptions bo;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
/* FIXME: consider opening a dialog to get
* anonymity, priority and expiration prior
@@ -1325,26 +1164,21 @@
*/
bo.anonymity_level = 1;
bo.content_priority = 1000;
- bo.expiration_time = GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_UNIT_YEARS);
+ bo.expiration_time =
+ GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_YEARS);
bo.replication_level = 1;
- if (TRUE != gtk_tree_selection_get_selected (sel,
- NULL,
- &iter))
- {
- create_dir_at_iter ("unnamed/",
- &bo,
- NULL, &pos);
- return;
- }
- create_dir_at_iter ("unnamed/",
- &bo,
- &iter, &pos);
+ if (TRUE != gtk_tree_selection_get_selected (sel, NULL, &iter))
+ {
+ create_dir_at_iter ("unnamed/", &bo, NULL, &pos);
+ return;
+ }
+ create_dir_at_iter ("unnamed/", &bo, &iter, &pos);
}
void
-GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkWidget *ad;
GtkBuilder *builder;
@@ -1353,35 +1187,44 @@
int do_index;
GtkSpinButton *sb;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_file_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_file_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_publish_file_dialog"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publish_file_dialog"));
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- return;
- }
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(ad));
- sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
- bo.anonymity_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_file_dialog_anonymity_spin_button")));
- bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_file_dialog_priority_spin_button")));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ return;
+ }
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
+ bo.anonymity_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_anonymity_spin_button")));
+ bo.content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_priority_spin_button")));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- bo.replication_level = 1; /* FIXME... */
- do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
- add_file_at_iter (filename,
- &bo, do_index,
- NULL);
+ bo.replication_level = 1; /* FIXME... */
+ do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
+ add_file_at_iter (filename, &bo, do_index, NULL);
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
g_free (filename);
@@ -1390,8 +1233,8 @@
void
-GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1403,36 +1246,21 @@
gchar *short_fn;
struct GNUNET_FS_FileInformation *fip;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_model_get (tm,
- &iter,
- 1, &do_index,
- 2, &short_fn,
- 3, &anonymity_level,
- 4, &priority,
- 5, &fip,
- -1);
- GNUNET_FS_GTK_edit_publish_dialog (&do_index,
- &short_fn,
- &anonymity_level,
- &priority,
- fip);
- gtk_tree_store_set (GTK_TREE_STORE (tm),
- &iter,
- 1, do_index,
- 2, short_fn,
- 3, anonymity_level,
- 4, priority,
- -1);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 1, &do_index, 2, &short_fn, 3,
+ &anonymity_level, 4, &priority, 5, &fip, -1);
+ GNUNET_FS_GTK_edit_publish_dialog (&do_index, &short_fn, &anonymity_level,
+ &priority, fip);
+ gtk_tree_store_set (GTK_TREE_STORE (tm), &iter, 1, do_index, 2, short_fn, 3,
+ anonymity_level, 4, priority, -1);
g_free (short_fn);
}
@@ -1442,22 +1270,19 @@
* client-info pointer.
*/
static int
-free_fi_row_reference (void *cls,
- struct GNUNET_FS_FileInformation *fi,
- uint64_t length,
- struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
- int *do_index,
- void **client_info)
+free_fi_row_reference (void *cls, struct GNUNET_FS_FileInformation *fi,
+ uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
{
GtkTreeRowReference *row = *client_info;
if (row == NULL)
- {
- GNUNET_break (0);
- return GNUNET_OK;
- }
+ {
+ GNUNET_break (0);
+ return GNUNET_OK;
+ }
gtk_tree_row_reference_free (row);
return GNUNET_OK;
}
@@ -1465,8 +1290,8 @@
void
-GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkTreeView *tv;
GtkTreeModel *tm;
@@ -1474,32 +1299,25 @@
GtkTreeIter iter;
struct GNUNET_FS_FileInformation *fip;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- if (TRUE != gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_model_get (tm,
- &iter,
- 5, &fip,
- -1);
- GNUNET_FS_file_information_destroy (fip,
- &free_fi_row_reference,
- NULL);
- gtk_tree_store_remove (GTK_TREE_STORE (tm),
- &iter);
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 5, &fip, -1);
+ GNUNET_FS_file_information_destroy (fip, &free_fi_row_reference, NULL);
+ gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
update_selectivity ();
}
void
-GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkWidget *ad;
GtkBuilder *builder;
@@ -1508,32 +1326,44 @@
GtkSpinButton *sb;
struct GNUNET_FS_BlockOptions bo;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_directory_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder
+ ("gnunet_fs_gtk_publish_directory_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_publish_directory_dialog"));
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- return;
- }
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(ad));
- sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
- bo.anonymity_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog_anonymity_spin_button")));
- bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ return;
+ }
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+ sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
+ bo.anonymity_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_anonymity_spin_button")));
+ bo.content_priority =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
- do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (builder,
-
"GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
-
+ do_index =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
+
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
/* FIXME: open progress dialog here... */
@@ -1553,32 +1383,25 @@
* @return file information from the given position (never NULL)
*/
static struct GNUNET_FS_FileInformation *
-get_file_information (GtkTreeModel *tm,
- GtkTreeIter *iter)
+get_file_information (GtkTreeModel * tm, GtkTreeIter * iter)
{
struct GNUNET_FS_FileInformation *fi;
struct GNUNET_FS_FileInformation *fic;
GtkTreeIter child;
-
- gtk_tree_model_get (tm, iter,
- 5, &fi,
- -1);
- gtk_tree_store_set (GTK_TREE_STORE (tm), iter,
- 5, NULL,
- -1);
+
+ gtk_tree_model_get (tm, iter, 5, &fi, -1);
+ gtk_tree_store_set (GTK_TREE_STORE (tm), iter, 5, NULL, -1);
GNUNET_assert (fi != NULL);
if (gtk_tree_model_iter_children (tm, &child, iter))
+ {
+ GNUNET_break (GNUNET_YES == GNUNET_FS_file_information_is_directory (fi));
+ do
{
- GNUNET_break (GNUNET_YES ==
- GNUNET_FS_file_information_is_directory (fi));
- do
- {
- fic = get_file_information (tm, &child);
- GNUNET_break (GNUNET_OK ==
- GNUNET_FS_file_information_add (fi, fic));
- }
- while (gtk_tree_model_iter_next (tm, &child));
+ fic = get_file_information (tm, &child);
+ GNUNET_break (GNUNET_OK == GNUNET_FS_file_information_add (fi, fic));
}
+ while (gtk_tree_model_iter_next (tm, &child));
+ }
return fi;
}
@@ -1590,7 +1413,7 @@
{
/**
* Parent of current insertion.
- */
+ */
GtkTreeIter *parent;
/**
@@ -1628,13 +1451,12 @@
* @param last_uri associated URI
* @param last_meta associate meta data
* @param next_id ID for future updates
- */
+ */
static void
-add_updateable_to_ts (void *cls,
- const char *last_id,
- const struct GNUNET_FS_Uri *last_uri,
- const struct GNUNET_CONTAINER_MetaData *last_meta,
- const char *next_id)
+add_updateable_to_ts (void *cls, const char *last_id,
+ const struct GNUNET_FS_Uri *last_uri,
+ const struct GNUNET_CONTAINER_MetaData *last_meta,
+ const char *next_id)
{
struct UpdateableContext *uc = cls;
struct UpdateableContext sc;
@@ -1644,41 +1466,31 @@
GNUNET_HashCode hc;
uc->update_called = GNUNET_YES;
- GNUNET_CRYPTO_hash (last_id,
- strlen (last_id),
- &hc);
- if (NULL !=
- GNUNET_CONTAINER_multihashmap_get (uc->seen,
- &hc))
+ GNUNET_CRYPTO_hash (last_id, strlen (last_id), &hc);
+ if (NULL != GNUNET_CONTAINER_multihashmap_get (uc->seen, &hc))
return;
- GNUNET_CONTAINER_multihashmap_put (uc->seen,
- &hc,
- "dummy",
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
- desc = GNUNET_CONTAINER_meta_data_get_first_by_types (last_meta,
-
EXTRACTOR_METATYPE_DESCRIPTION,
-
EXTRACTOR_METATYPE_TITLE,
-
EXTRACTOR_METATYPE_BOOK_TITLE,
-
EXTRACTOR_METATYPE_FILENAME,
-
EXTRACTOR_METATYPE_SUMMARY,
-
EXTRACTOR_METATYPE_ALBUM,
-
EXTRACTOR_METATYPE_COMMENT,
-
EXTRACTOR_METATYPE_SUBJECT,
- -1);
- gtk_tree_store_insert_with_values (uc->ts,
- &iter,
- uc->parent,
- G_MAXINT,
- 0, uc->namespace_name,
- 1, uc->ns,
- 2, last_id,
- 3, GNUNET_FS_uri_dup (last_uri),
- 4, GNUNET_CONTAINER_meta_data_duplicate
(last_meta),
- 5, "",
- 6, desc,
- 7, TRUE /* update editable (always) */,
- 8, FALSE /* current not editable (only for
top-level) */,
- -1);
+ GNUNET_CONTAINER_multihashmap_put (uc->seen, &hc, "dummy",
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ desc =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (last_meta,
+
EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_TITLE,
+
EXTRACTOR_METATYPE_BOOK_TITLE,
+
EXTRACTOR_METATYPE_FILENAME,
+
EXTRACTOR_METATYPE_SUMMARY,
+ EXTRACTOR_METATYPE_ALBUM,
+
EXTRACTOR_METATYPE_COMMENT,
+
EXTRACTOR_METATYPE_SUBJECT,
+ -1);
+ gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0,
+ uc->namespace_name, 1, uc->ns, 2, last_id,
+ 3, GNUNET_FS_uri_dup (last_uri), 4,
+ GNUNET_CONTAINER_meta_data_duplicate
+ (last_meta), 5, "", 6, desc, 7,
+ TRUE /* update editable (always) */ ,
+ 8, FALSE
+ /* current not editable (only for
top-level) */
+ , -1);
GNUNET_free_non_null (desc);
sc.parent = &iter;
sc.ts = uc->ts;
@@ -1686,30 +1498,20 @@
sc.ns = uc->ns;
sc.seen = uc->seen;
sc.update_called = GNUNET_NO;
- GNUNET_FS_namespace_list_updateable (uc->ns,
- next_id,
- &add_updateable_to_ts,
- &sc);
- if ( (sc.update_called == GNUNET_NO) &&
- (next_id != NULL) &&
- (strlen (next_id) > 0) )
- {
- /* add leaf */
- gtk_tree_store_insert_with_values (uc->ts,
- &titer,
- &iter,
- G_MAXINT,
- 0, uc->namespace_name,
- 1, uc->ns,
- 2, next_id,
- 3, NULL,
- 4, NULL,
- 5, "",
- 6, "",
- 7, TRUE /* update editable (always) */,
- 8, FALSE /* current not editable (only
for top-level) */,
- -1);
- }
+ GNUNET_FS_namespace_list_updateable (uc->ns, next_id, &add_updateable_to_ts,
+ &sc);
+ if ((sc.update_called == GNUNET_NO) && (next_id != NULL) &&
+ (strlen (next_id) > 0))
+ {
+ /* add leaf */
+ gtk_tree_store_insert_with_values (uc->ts, &titer, &iter, G_MAXINT, 0,
+ uc->namespace_name, 1, uc->ns, 2,
+ next_id, 3, NULL, 4, NULL, 5, "", 6, "",
+ 7, TRUE /* update editable (always) */ ,
+ 8, FALSE
+ /* current not editable (only for
top-level) */
+ , -1);
+ }
}
@@ -1722,9 +1524,7 @@
* @param id identity of the namespace to add
*/
static void
-add_namespace_to_ts (void *cls,
- const char *name,
- const GNUNET_HashCode *id)
+add_namespace_to_ts (void *cls, const char *name, const GNUNET_HashCode * id)
{
GtkTreeStore *ts = cls;
struct UpdateableContext uc;
@@ -1733,99 +1533,76 @@
uc.parent = &iter;
uc.namespace_name = name;
uc.ts = ts;
- uc.ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (),
- name);
+ uc.ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
uc.update_called = GNUNET_NO;
- gtk_tree_store_insert_with_values (ts, &iter,
- NULL,
- G_MAXINT,
- 0, name,
- 1, uc.ns,
- 2, NULL /* last-id */,
- 3, NULL /* last-uri */,
- 4, NULL /* meta */,
- 5, NULL /* next-ID */,
- 6, NULL /* last-description */,
- 7, TRUE /* update editable */,
- 8, TRUE /* current editable */,
- -1);
+ gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 0, name, 1,
+ uc.ns, 2, NULL /* last-id */ ,
+ 3, NULL /* last-uri */ ,
+ 4, NULL /* meta */ ,
+ 5, NULL /* next-ID */ ,
+ 6, NULL /* last-description */ ,
+ 7, TRUE /* update editable */ ,
+ 8, TRUE /* current editable */ ,
+ -1);
uc.seen = GNUNET_CONTAINER_multihashmap_create (128);
- GNUNET_FS_namespace_list_updateable (uc.ns, NULL,
- &add_updateable_to_ts, &uc);
+ GNUNET_FS_namespace_list_updateable (uc.ns, NULL, &add_updateable_to_ts,
&uc);
GNUNET_CONTAINER_multihashmap_destroy (uc.seen);
}
static void
-free_pseudonym_tree_store (GtkTreeModel *tm,
- GtkTreeIter *iter)
+free_pseudonym_tree_store (GtkTreeModel * tm, GtkTreeIter * iter)
{
struct GNUNET_FS_Uri *uri;
struct GNUNET_CONTAINER_MetaData *meta;
struct GNUNET_FS_Namespace *ns;
GtkTreeIter child;
- gtk_tree_model_get (tm,
- iter,
- 1, &ns,
- 3, &uri,
- 4, &meta,
- -1);
+ gtk_tree_model_get (tm, iter, 1, &ns, 3, &uri, 4, &meta, -1);
if (uri != NULL)
GNUNET_FS_uri_destroy (uri);
if (meta != NULL)
GNUNET_CONTAINER_meta_data_destroy (meta);
if (ns != NULL)
+ {
+ // FIXME: delete ns?
+ // GNUNET_FS_namespace_delete (nso, GNUNET_NO);
+ }
+ if (TRUE == gtk_tree_model_iter_children (tm, &child, iter))
+ {
+ do
{
- // FIXME: delete ns?
- // GNUNET_FS_namespace_delete (nso, GNUNET_NO);
+ free_pseudonym_tree_store (tm, &child);
}
- if (TRUE ==
- gtk_tree_model_iter_children (tm, &child, iter))
- {
- do
- {
- free_pseudonym_tree_store (tm,
- &child);
- }
- while (TRUE == gtk_tree_model_iter_next (tm,
- &child));
- }
+ while (TRUE == gtk_tree_model_iter_next (tm, &child));
+ }
}
static void
-free_file_information_tree_store (GtkTreeModel *tm,
- GtkTreeIter *iter)
+free_file_information_tree_store (GtkTreeModel * tm, GtkTreeIter * iter)
{
GtkTreeIter child;
struct GNUNET_FS_FileInformation *fip;
- gtk_tree_model_get (tm,
- iter,
- 5, &fip,
- -1);
+ gtk_tree_model_get (tm, iter, 5, &fip, -1);
if (fip != NULL)
GNUNET_FS_file_information_destroy (fip, NULL, NULL);
- if (TRUE ==
- gtk_tree_model_iter_children (tm, &child, iter))
+ if (TRUE == gtk_tree_model_iter_children (tm, &child, iter))
+ {
+ do
{
- do
- {
- free_file_information_tree_store (tm,
- &child);
- }
- while (TRUE == gtk_tree_model_iter_next (tm,
- &child));
+ free_file_information_tree_store (tm, &child);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &child));
+ }
}
/**
*/
void
-GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer
data)
{
GtkWidget *ad;
GtkTreeStore *ts;
@@ -1839,90 +1616,79 @@
struct GNUNET_FS_Namespace *namespace;
gchar *namespace_id;
gchar *namespace_uid;
-
+
GNUNET_assert (master_builder == NULL);
- master_builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_dialog.glade");
+ master_builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_dialog.glade");
if (master_builder == NULL)
return;
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(selection_changed_cb), NULL);
- ad = GTK_WIDGET (gtk_builder_get_object (master_builder,
- "GNUNET_GTK_master_publish_dialog"));
- ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_pseudonym_tree_store"));
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (selection_changed_cb), NULL);
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (master_builder, "GNUNET_GTK_master_publish_dialog"));
+ ts = GTK_TREE_STORE (gtk_builder_get_object
+ (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
- &add_namespace_to_ts,
- ts);
- tm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_file_sharing_publishing_tree_store"));
- tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+ &add_namespace_to_ts, ts);
+ tm = GTK_TREE_MODEL (gtk_builder_get_object
+ (master_builder,
+ "GNUNET_GTK_file_sharing_publishing_tree_store"));
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (master_builder,
+
"GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
sel = gtk_tree_view_get_selection (tv);
- g_signal_connect(G_OBJECT(sel), "changed",
- G_CALLBACK(selection_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (selection_changed_cb), NULL);
ret = gtk_dialog_run (GTK_DIALOG (ad));
if (ret == GTK_RESPONSE_OK)
+ {
+ if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
{
- if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
- {
- gtk_tree_model_get (ptm,
- &iter,
- 1, &namespace,
- 2, &namespace_id,
- 5, &namespace_uid,
- -1);
- }
- else
- {
- namespace = NULL;
- namespace_id = NULL;
- namespace_uid = NULL;
- }
- if (gtk_tree_model_get_iter_first (tm, &iter))
- do
- {
- fi = get_file_information (tm, &iter);
- GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (),
- fi,
- namespace,
- namespace_id,
- namespace_uid,
- GNUNET_FS_PUBLISH_OPTION_NONE);
- }
- while (gtk_tree_model_iter_next (tm, &iter));
- if (namespace_id != NULL)
- g_free (namespace_id);
- if (namespace_uid != NULL)
- g_free (namespace_uid);
- }
- ptm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
-
"GNUNET_GTK_pseudonym_tree_store"));
- /* free state from 'ptm' */
- if (TRUE ==
- gtk_tree_model_get_iter_first (ptm,
- &iter))
- do
+ gtk_tree_model_get (ptm, &iter, 1, &namespace, 2, &namespace_id, 5,
+ &namespace_uid, -1);
+ }
+ else
+ {
+ namespace = NULL;
+ namespace_id = NULL;
+ namespace_uid = NULL;
+ }
+ if (gtk_tree_model_get_iter_first (tm, &iter))
+ do
{
- free_pseudonym_tree_store (ptm,
- &iter);
+ fi = get_file_information (tm, &iter);
+ GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (), fi, namespace,
+ namespace_id, namespace_uid,
+ GNUNET_FS_PUBLISH_OPTION_NONE);
}
- while (TRUE == gtk_tree_model_iter_next (ptm,
- &iter));
-
+ while (gtk_tree_model_iter_next (tm, &iter));
+ if (namespace_id != NULL)
+ g_free (namespace_id);
+ if (namespace_uid != NULL)
+ g_free (namespace_uid);
+ }
+ ptm =
+ GTK_TREE_MODEL (gtk_builder_get_object
+ (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+ /* free state from 'ptm' */
+ if (TRUE == gtk_tree_model_get_iter_first (ptm, &iter))
+ do
+ {
+ free_pseudonym_tree_store (ptm, &iter);
+ }
+ while (TRUE == gtk_tree_model_iter_next (ptm, &iter));
+
/* free state from 'tm' */
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm,
- &iter))
- do
- {
- free_file_information_tree_store (tm,
- &iter);
- }
- while (TRUE == gtk_tree_model_iter_next (tm,
- &iter));
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ do
+ {
+ free_file_information_tree_store (tm, &iter);
+ }
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (master_builder));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -35,11 +35,15 @@
* User double-clicked on namespace or pressed enter;
* move namespace root to the 'keywords' line.
*/
-void
-GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb (GtkTreeView
*tree_view,
- GtkTreePath
*path,
-
GtkTreeViewColumn *column,
- gpointer
user_data)
+void
+GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb (GtkTreeView *
+ tree_view,
+ GtkTreePath *
+ path,
+
GtkTreeViewColumn
+ * column,
+ gpointer
+ user_data)
{
GtkTreeModel *ls;
GtkTreeSelection *sel;
@@ -47,27 +51,22 @@
GtkTreeIter iter;
char *root;
- query = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_search_dialog_keyword_entry"));
- sel = gtk_tree_view_get_selection (tree_view);
- if (TRUE ==
- gtk_tree_selection_get_selected (sel,
- &ls,
- &iter))
- {
- gtk_tree_model_get (ls, &iter,
- 1, &root,
- -1);
- gtk_entry_set_text (query,
- root);
- GNUNET_free (root);
- }
+ query =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_search_dialog_keyword_entry"));
+ sel = gtk_tree_view_get_selection (tree_view);
+ if (TRUE == gtk_tree_selection_get_selected (sel, &ls, &iter))
+ {
+ gtk_tree_model_get (ls, &iter, 1, &root, -1);
+ gtk_entry_set_text (query, root);
+ GNUNET_free (root);
+ }
}
void
-GNUNET_GTK_search_dialog_search_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_search_dialog_search_button_clicked_cb (GtkWidget * dummy,
+ gpointer data)
{
GtkEntry *query;
GtkSpinButton *anonymity;
@@ -80,47 +79,41 @@
GtkTreeSelection *sel;
GtkTreeIter iter;
- query = GTK_ENTRY (gtk_builder_get_object (builder,
-
"GNUNET_GTK_search_dialog_keyword_entry"));
- anonymity = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-
"GNUNET_GTK_search_dialog_anonymity_spin_button"));
- namespace = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-
"GNUNET_GTK_search_dialog_namespace_tree_view"));
+ query =
+ GTK_ENTRY (gtk_builder_get_object
+ (builder, "GNUNET_GTK_search_dialog_keyword_entry"));
+ anonymity =
+ GTK_SPIN_BUTTON (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_search_dialog_anonymity_spin_button"));
+ namespace =
+ GTK_TREE_VIEW (gtk_builder_get_object
+ (builder,
"GNUNET_GTK_search_dialog_namespace_tree_view"));
keywords = gtk_entry_get_text (query);
nsid = NULL;
- sel = gtk_tree_view_get_selection (namespace);
- if (TRUE ==
- gtk_tree_selection_get_selected (sel,
- &ls,
- &iter))
- gtk_tree_model_get (ls, &iter,
- 2, &nsid,
- -1);
+ sel = gtk_tree_view_get_selection (namespace);
+ if (TRUE == gtk_tree_selection_get_selected (sel, &ls, &iter))
+ gtk_tree_model_get (ls, &iter, 2, &nsid, -1);
if (nsid != NULL)
+ {
+ uri = GNUNET_FS_uri_sks_create_from_nsid (nsid, keywords);
+ GNUNET_assert (uri != NULL);
+ }
+ else
+ {
+ emsg = NULL;
+ uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
+ if (uri == NULL)
{
- uri = GNUNET_FS_uri_sks_create_from_nsid (nsid,
- keywords);
- GNUNET_assert (uri != NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid keyword string `%s':
%s"),
+ keywords, emsg);
+ GNUNET_free_non_null (emsg);
+ return;
}
- else
- {
- emsg = NULL;
- uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
- if (uri == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid keyword string `%s': %s"),
- keywords,
- emsg);
- GNUNET_free_non_null (emsg);
- return;
- }
- }
- GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (),
- uri,
- gtk_spin_button_get_value_as_int (anonymity),
- GNUNET_FS_SEARCH_OPTION_NONE,
- NULL);
+ }
+ GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
+ gtk_spin_button_get_value_as_int (anonymity),
+ GNUNET_FS_SEARCH_OPTION_NONE, NULL);
GNUNET_FS_uri_destroy (uri);
}
@@ -136,12 +129,8 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
static int
-add_namespace_to_ls (void *cls,
- const GNUNET_HashCode *
- pseudonym,
- const struct
- GNUNET_CONTAINER_MetaData * md,
- int rating)
+add_namespace_to_ls (void *cls, const GNUNET_HashCode * pseudonym,
+ const struct GNUNET_CONTAINER_MetaData *md, int rating)
{
GtkListStore *ls = cls;
char *root;
@@ -152,41 +141,36 @@
char *emsg;
struct GNUNET_FS_Uri *uri;
GtkTreeIter iter;
-
- ns_name = GNUNET_PSEUDONYM_id_to_name (GNUNET_FS_GTK_get_configuration (),
- pseudonym);
+
+ ns_name =
+ GNUNET_PSEUDONYM_id_to_name (GNUNET_FS_GTK_get_configuration (),
+ pseudonym);
nsid = GNUNET_malloc (sizeof (GNUNET_HashCode));
*nsid = *pseudonym;
root = NULL;
- uris = GNUNET_CONTAINER_meta_data_get_by_type (md,
- EXTRACTOR_METATYPE_URI);
+ uris = GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_URI);
if (uris != NULL)
- {
- emsg = NULL;
- uri = GNUNET_FS_uri_parse (uris, &emsg);
- if (uri == NULL)
- GNUNET_free (emsg);
- root = GNUNET_FS_uri_sks_get_content_id (uri);
- GNUNET_FS_uri_destroy (uri);
- }
- description = GNUNET_CONTAINER_meta_data_get_first_by_types (md,
-
EXTRACTOR_METATYPE_TITLE,
-
EXTRACTOR_METATYPE_BOOK_TITLE,
-
EXTRACTOR_METATYPE_DESCRIPTION,
-
EXTRACTOR_METATYPE_SUMMARY,
-
EXTRACTOR_METATYPE_ALBUM,
-
EXTRACTOR_METATYPE_COMMENT,
-
EXTRACTOR_METATYPE_SUBJECT,
-
EXTRACTOR_METATYPE_KEYWORDS,
- -1);
- gtk_list_store_insert_with_values (ls,
- &iter,
- G_MAXINT,
- 0, ns_name,
- 1, root,
- 2, nsid,
- 3, description,
- -1);
+ {
+ emsg = NULL;
+ uri = GNUNET_FS_uri_parse (uris, &emsg);
+ if (uri == NULL)
+ GNUNET_free (emsg);
+ root = GNUNET_FS_uri_sks_get_content_id (uri);
+ GNUNET_FS_uri_destroy (uri);
+ }
+ description =
+ GNUNET_CONTAINER_meta_data_get_first_by_types (md,
+ EXTRACTOR_METATYPE_TITLE,
+
EXTRACTOR_METATYPE_BOOK_TITLE,
+
EXTRACTOR_METATYPE_DESCRIPTION,
+
EXTRACTOR_METATYPE_SUMMARY,
+ EXTRACTOR_METATYPE_ALBUM,
+
EXTRACTOR_METATYPE_COMMENT,
+
EXTRACTOR_METATYPE_SUBJECT,
+
EXTRACTOR_METATYPE_KEYWORDS,
+ -1);
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, ns_name, 1, root,
+ 2, nsid, 3, description, -1);
GNUNET_free (ns_name);
GNUNET_free_non_null (root);
GNUNET_free_non_null (description);
@@ -198,43 +182,35 @@
* Search selected in 'file' menu.
*/
void
-GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy, gpointer data)
{
GtkWidget *ad;
GtkListStore *ls;
GtkTreeIter iter;
GNUNET_HashCode *nsid;
-
+
GNUNET_assert (builder == NULL);
builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_dialog.glade");
if (builder == NULL)
return;
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_search_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
-
"GNUNET_GTK_namespace_list_store"));
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_search_dialog"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_namespace_list_store"));
GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
- &add_namespace_to_ls,
- ls);
+ &add_namespace_to_ls, ls);
gtk_dialog_run (GTK_DIALOG (ad));
/* free nsids from 'ls' */
- if (TRUE ==
- gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls),
- &iter))
+ if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls), &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (GTK_TREE_MODEL (ls),
- &iter,
- 2, &nsid,
- -1);
- GNUNET_free (nsid);
- }
- while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ls),
- &iter));
+ gtk_tree_model_get (GTK_TREE_MODEL (ls), &iter, 2, &nsid, -1);
+ GNUNET_free (nsid);
}
+ while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ls), &iter));
+ }
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
builder = NULL;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_open_directory.c
2011-08-15 22:37:19 UTC (rev 16585)
@@ -32,7 +32,7 @@
struct SearchTab *tab;
struct SearchResult *par;
GtkTreeRowReference *prr;
- GtkTreeIter iter;
+ GtkTreeIter iter;
};
@@ -51,13 +51,10 @@
* embedded with the directory itself).
* @param data data available for the file (length bytes)
*/
-static void
-add_child (void *cls,
- const char *filename,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- size_t length,
- const void *data)
+static void
+add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta, size_t length,
+ const void *data)
{
struct AddChildContext *acc = cls;
struct GNUNET_CONTAINER_MetaData *dmeta;
@@ -65,39 +62,27 @@
GtkTreeIter iter;
if (uri == NULL)
- {
- /* directory meta data itself */
- dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
- GNUNET_CONTAINER_meta_data_insert (dmeta,
- "<user>",
- EXTRACTOR_METATYPE_FILENAME,
- EXTRACTOR_METAFORMAT_C_STRING,
- "text/plain",
- acc->filename,
- strlen (acc->filename) + 1);
- acc->tab = GNUNET_GTK_add_to_uri_tab (&acc->iter,
- &acc->par,
- dmeta,
- NULL);
- tp = gtk_tree_model_get_path (GTK_TREE_MODEL (acc->tab->ts),
- &acc->iter);
- acc->prr = gtk_tree_row_reference_new (GTK_TREE_MODEL (acc->tab->ts),
- tp);
- gtk_tree_path_free (tp);
- acc->ts = acc->tab->ts;
- GNUNET_CONTAINER_meta_data_destroy (dmeta);
- return;
- }
+ {
+ /* directory meta data itself */
+ dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+ GNUNET_CONTAINER_meta_data_insert (dmeta, "<user>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain", acc->filename,
+ strlen (acc->filename) + 1);
+ acc->tab = GNUNET_GTK_add_to_uri_tab (&acc->iter, &acc->par, dmeta, NULL);
+ tp = gtk_tree_model_get_path (GTK_TREE_MODEL (acc->tab->ts), &acc->iter);
+ acc->prr = gtk_tree_row_reference_new (GTK_TREE_MODEL (acc->tab->ts), tp);
+ gtk_tree_path_free (tp);
+ acc->ts = acc->tab->ts;
+ GNUNET_CONTAINER_meta_data_destroy (dmeta);
+ return;
+ }
if (acc->ts == NULL)
return;
GNUNET_assert (NULL !=
- GNUNET_GTK_add_search_result (acc->tab,
- &iter,
- acc->prr,
- uri,
- meta,
- NULL,
- 0));
+ GNUNET_GTK_add_search_result (acc->tab, &iter, acc->prr, uri,
+ meta, NULL, 0));
}
@@ -106,8 +91,8 @@
* file and then display a new tab with its contents.
*/
void
-GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget *
dummy,
- gpointer data)
+GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
+ gpointer data)
{
struct AddChildContext acc;
GtkWidget *ad;
@@ -115,32 +100,31 @@
char *filename;
GtkFileFilter *ff;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_open_directory_dialog.glade");
+ builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_directory_dialog.glade");
if (builder == NULL)
- {
- GNUNET_break (0);
- return;
- }
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- "GNUNET_GTK_open_directory_dialog"));
- ff = GTK_FILE_FILTER (gtk_builder_get_object (builder,
- "gnunet_directory_filter"));
+ {
+ GNUNET_break (0);
+ return;
+ }
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_open_directory_dialog"));
+ ff = GTK_FILE_FILTER (gtk_builder_get_object
+ (builder, "gnunet_directory_filter"));
/* FIXME: some day, write a custom file filter for gnunet-directories... */
gtk_file_filter_add_pattern (ff, "*" GNUNET_FS_DIRECTORY_EXT);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
- {
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- return;
- }
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(ad));
+ {
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (builder));
+ return;
+ }
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
acc.filename = filename;
acc.ts = NULL;
- GNUNET_FS_GTK_mmap_and_scan (filename,
- &add_child,
- &acc);
+ GNUNET_FS_GTK_mmap_and_scan (filename, &add_child, &acc);
g_free (filename);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_view_toggles.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -36,12 +36,11 @@
* @param toggle_menu name of menu entry
*/
static void
-toggle_view (const char *toggled_widget,
- const char *toggle_menu)
+toggle_view (const char *toggled_widget, const char *toggle_menu)
{
GtkCheckMenuItem *mi;
GtkWidget *widget;
-
+
widget = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object (toggled_widget));
mi = GTK_CHECK_MENU_ITEM (GNUNET_FS_GTK_get_main_window_object
(toggle_menu));
if (gtk_check_menu_item_get_active (mi))
@@ -55,11 +54,10 @@
* Preview view is toggled.
*/
void
-GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy, gpointer data)
{
toggle_view ("GNUNET_GTK_main_window_preview_image",
- "GNUNET_GTK_main_menu_view_preview");
+ "GNUNET_GTK_main_menu_view_preview");
}
@@ -67,11 +65,11 @@
* Neighbour view is toggled.
*/
void
-GNUNET_GTK_main_menu_view_neighbours_toggled_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_view_neighbours_toggled_cb (GtkWidget * dummy,
+ gpointer data)
{
toggle_view ("GNUNET_GTK_main_window_peerinfo_treeview",
- "GNUNET_GTK_main_menu_view_neighbours");
+ "GNUNET_GTK_main_menu_view_neighbours");
}
@@ -79,11 +77,10 @@
* Metadata view is toggled.
*/
void
-GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy,
- gpointer data)
+GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy, gpointer
data)
{
toggle_view ("GNUNET_GTK_main_window_metadata_treeview",
- "GNUNET_GTK_main_menu_view_metadata");
+ "GNUNET_GTK_main_menu_view_metadata");
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -97,14 +97,13 @@
* FIXME: does this need to be a separate task!?
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (fs != NULL)
- {
- GNUNET_FS_stop (fs);
- fs = NULL;
- }
+ {
+ GNUNET_FS_stop (fs);
+ fs = NULL;
+ }
EXTRACTOR_plugin_remove_all (plugins);
plugins = NULL;
}
@@ -113,29 +112,26 @@
/**
* Callback invoked if the application is supposed to exit.
*/
-void
-GNUNET_GTK_quit_cb (GtkObject *object,
- gpointer user_data)
+void
+GNUNET_GTK_quit_cb (GtkObject * object, gpointer user_data)
{
GNUNET_GTK_tray_icon_destroy ();
GNUNET_GTK_main_loop_quit (ml);
- GNUNET_SCHEDULER_add_now (&shutdown_task,
- NULL);
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
/**
* Search selected in 'file' menu. (from main_window_file_search.c)
*/
-void
-GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy,
- gpointer data);
+void GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy,
+ gpointer data);
/**
* Add the tab with the 'new' icon for starting a search.
- */
-static void
+ */
+static void
add_new_tab ()
{
GtkNotebook *notebook;
@@ -145,28 +141,28 @@
GtkWidget *label;
GtkWidget *frame;
- builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_main_tab_new_frame.glade");
+ builder =
+ GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_main_tab_new_frame.glade");
/* load frame */
- sf = GTK_WINDOW (gtk_builder_get_object (builder,
- "_main_tab_new_frame"));
+ sf = GTK_WINDOW (gtk_builder_get_object (builder, "_main_tab_new_frame"));
label = gtk_bin_get_child (GTK_BIN (sf));
gtk_widget_ref (label);
gtk_container_remove (GTK_CONTAINER (sf), label);
gtk_widget_destroy (GTK_WIDGET (sf));
g_object_unref (builder);
- g_signal_connect(G_OBJECT(label), "clicked",
- G_CALLBACK(&GNUNET_GTK_main_menu_file_search_activate_cb),
NULL);
+ g_signal_connect (G_OBJECT (label), "clicked",
+ G_CALLBACK (&GNUNET_GTK_main_menu_file_search_activate_cb),
+ NULL);
- notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ notebook =
+ GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window_notebook"));
pages = gtk_notebook_get_n_pages (notebook);
frame = gtk_label_new ("");
gtk_widget_show (frame);
- gtk_notebook_append_page (notebook,
- frame,
- label);
- gtk_notebook_set_current_page (notebook,
- pages);
+ gtk_notebook_append_page (notebook, frame, label);
+ gtk_notebook_set_current_page (notebook, pages);
gtk_widget_show (GTK_WIDGET (notebook));
}
@@ -174,54 +170,67 @@
/**
* Actual main function run right after GNUnet's scheduler
* is initialized. Initializes up GTK and Glade.
- */
+ */
static void
-run (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GtkWidget *main_window;
+
ml = cls;
GNUNET_GTK_set_icon_search_path ();
GNUNET_GTK_setup_nls ();
-
+
/* setup main window */
- main_window = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window"));
+ main_window =
+ GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_window"));
gtk_window_maximize (GTK_WINDOW (main_window));
GNUNET_GTK_tray_icon_create (GTK_WINDOW (main_window),
- "gnunet-gtk" /* FIXME: rename icon? */,
- "gnunet-fs-gtk");
+ "gnunet-gtk" /* FIXME: rename icon? */ ,
+ "gnunet-fs-gtk");
/* initialize file-sharing */
plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml),
- "gnunet-gtk",
- &GNUNET_GTK_fs_event_handler,
- NULL,
- GNUNET_FS_FLAGS_NONE /* fixme later for
persistence/probes */,
- /* set other options here later! */
- GNUNET_FS_OPTIONS_END);
- if (fs != NULL)
- {
- add_new_tab ();
- }
+ "gnunet-gtk", &GNUNET_GTK_fs_event_handler, NULL,
+ GNUNET_FS_FLAGS_NONE
+ /* fixme later for persistence/probes */ ,
+ /* set other options here later! */
+ GNUNET_FS_OPTIONS_END);
+ if (fs != NULL)
+ {
+ add_new_tab ();
+ }
else
- {
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_create_pseudonym")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_advertise_pseudonym")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_publish")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_search")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_download_uri")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_menu_file_open_gnunet_directory")));
- /* FIXME: set warning in status bar... */
- }
+ {
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_create_pseudonym")));
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_advertise_pseudonym")));
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_publish")));
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_search")));
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_download_uri")));
+ gtk_widget_hide (GTK_WIDGET
+ (GNUNET_FS_GTK_get_main_window_object
+ ("GNUNET_GTK_main_menu_file_open_gnunet_directory")));
+ /* FIXME: set warning in status bar... */
+ }
/* make GUI visible */
if (!tray_only)
- {
- gtk_widget_show (main_window);
- gtk_window_present (GTK_WINDOW (main_window));
- }
-
+ {
+ gtk_widget_show (main_window);
+ gtk_window_present (GTK_WINDOW (main_window));
+ }
+
}
@@ -236,12 +245,9 @@
};
if (GNUNET_OK !=
- GNUNET_GTK_main_loop_start ("gnunet-gtk",
- "GTK GUI for GNUnet",
- argc, argv,
- options,
- "gnunet_fs_gtk_main_window.glade",
- &run))
+ GNUNET_GTK_main_loop_start ("gnunet-gtk", "GTK GUI for GNUnet", argc,
+ argv, options,
+ "gnunet_fs_gtk_main_window.glade", &run))
return 1;
return 0;
}
Modified: gnunet-gtk/src/lib/about.c
===================================================================
--- gnunet-gtk/src/lib/about.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/lib/about.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -33,8 +33,7 @@
* @param dialogname name of the about dialog in the file
*/
void
-GNUNET_GTK_display_about (const char *dialogfile,
- const char *dialogname)
+GNUNET_GTK_display_about (const char *dialogfile, const char *dialogname)
{
GtkBuilder *builder;
GtkWidget *ad;
@@ -42,8 +41,7 @@
builder = GNUNET_GTK_get_new_builder (dialogfile);
if (builder == NULL)
return;
- ad = GTK_WIDGET (gtk_builder_get_object (builder,
- dialogname));
+ ad = GTK_WIDGET (gtk_builder_get_object (builder, dialogname));
gtk_dialog_run (GTK_DIALOG (ad));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/lib/eventloop.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -55,11 +55,11 @@
* Initial task to run to setup the system.
*/
GNUNET_SCHEDULER_Task main_task;
-
+
/**
* Builder for the main window.
*/
- GtkBuilder *builder;
+ GtkBuilder *builder;
/**
* Gib's Main loop.
@@ -192,7 +192,7 @@
*/
GObject *
GNUNET_GTK_main_loop_get_object (struct GNUNET_GTK_MainLoop *ml,
- const char *name)
+ const char *name)
{
return gtk_builder_get_object (ml->builder, name);
}
@@ -205,10 +205,10 @@
* @param tc scheduler context
*/
static void
-dispatch_gtk_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+dispatch_gtk_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_GTK_MainLoop *ml = cls;
+
g_main_context_dispatch (ml->gmc);
}
@@ -220,8 +220,7 @@
* @param new_size desired size of the cached poll array
*/
static void
-resize_cached_poll_array (struct GNUNET_GTK_MainLoop *ml,
- guint new_size)
+resize_cached_poll_array (struct GNUNET_GTK_MainLoop *ml, guint new_size)
{
if (NULL == ml->cached_poll_array)
ml->cached_poll_array = g_new (GPollFD, new_size);
@@ -235,16 +234,14 @@
* Dummy task to keep our scheduler running.
*/
static void
-keepalive_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+keepalive_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_GTK_MainLoop *ml = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Dummy task was scheduled\n");
- ml->dummy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &keepalive_task,
- ml);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Dummy task was scheduled\n");
+ ml->dummy_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &keepalive_task, ml);
}
@@ -267,8 +264,7 @@
* @return number of selected sockets, GNUNET_SYSERR on error
*/
static int
-gnunet_gtk_select (void *cls,
- struct GNUNET_NETWORK_FDSet *rfds,
+gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
struct GNUNET_NETWORK_FDSet *wfds,
struct GNUNET_NETWORK_FDSet *efds,
const struct GNUNET_TIME_Relative timeout)
@@ -299,10 +295,7 @@
#endif
if (TRUE != g_main_loop_is_running (ml->gml))
- return GNUNET_NETWORK_socket_select (rfds,
- wfds,
- efds,
- timeout);
+ return GNUNET_NETWORK_socket_select (rfds, wfds, efds, timeout);
if (NULL != rfds)
FD_COPY (&rfds->sds, &aread);
else
@@ -340,249 +333,260 @@
#if !WINDOWS
fd_counter = 0;
for (i = 0; i < max_nfds; i++)
- {
- int isset[3];
-
- isset[0] = (rfds == NULL) ? 0 : FD_ISSET (i, &rfds->sds);
- isset[1] = (wfds == NULL) ? 0 : FD_ISSET (i, &wfds->sds);
- isset[2] = (efds == NULL) ? 0 : FD_ISSET (i, &efds->sds);
- if ((! isset[0]) && (! isset[1]) && (! isset[2]))
- continue;
- if (fd_counter >= ml->cached_poll_array_size)
- resize_cached_poll_array (ml, ml->cached_poll_array_size * 2);
- ml->cached_poll_array[fd_counter].fd = i;
- ml->cached_poll_array[fd_counter].events
- = (isset[0] ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0)
- | (isset[1] ? G_IO_OUT | G_IO_ERR : 0)
- | (isset[2] ? G_IO_ERR : 0);
- fd_counter++;
- }
+ {
+ int isset[3];
+
+ isset[0] = (rfds == NULL) ? 0 : FD_ISSET (i, &rfds->sds);
+ isset[1] = (wfds == NULL) ? 0 : FD_ISSET (i, &wfds->sds);
+ isset[2] = (efds == NULL) ? 0 : FD_ISSET (i, &efds->sds);
+ if ((!isset[0]) && (!isset[1]) && (!isset[2]))
+ continue;
+ if (fd_counter >= ml->cached_poll_array_size)
+ resize_cached_poll_array (ml, ml->cached_poll_array_size * 2);
+ ml->cached_poll_array[fd_counter].fd = i;
+ ml->cached_poll_array[fd_counter].events =
+ (isset[0] ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0) | (isset[1] ? G_IO_OUT |
+ G_IO_ERR : 0) |
+ (isset[2] ? G_IO_ERR : 0);
+ fd_counter++;
+ }
#else
/* FIXME: why while(1) here!? */
while (1)
+ {
+ struct GNUNET_CONTAINER_SList_Iterator *t;
+
+ fd_counter = 0;
+ /* We might overshoot a little, but that won't hurt very much */
+ int need_nfds =
+ (rfds->sds.fd_count + rfds->sds.fd_count + rfds->sds.fd_count >
+ 0 ? 3 : 0) + (rfds ==
+ NULL ? 0 : GNUNET_CONTAINER_slist_count (rfds->handles))
+ + (wfds == NULL ? 0 : 1) + 1;
+ if (need_nfds >= ml->cached_poll_array_size)
+ resize_cached_poll_array (ml, need_nfds * 2);
+ /* Since there are also gmainloop's own fds, just need_nfds won't be
+ * enough, so make it twice as long.
+ */
+ if (ml->read_array_length < GNUNET_CONTAINER_slist_count (rfds->handles))
{
- struct GNUNET_CONTAINER_SList_Iterator *t;
+ ml->read_array =
+ GNUNET_realloc (ml->read_array,
+ GNUNET_CONTAINER_slist_count (rfds->handles) *
+ sizeof (struct GNUNET_DISK_FileHandle *));
+ ml->read_array_length = GNUNET_CONTAINER_slist_count (rfds->handles);
+ }
+ if (rfds != NULL)
+ {
+ for (t = GNUNET_CONTAINER_slist_begin (rfds->handles), i = 0;
+ GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (t), i += 1)
+ {
+ struct GNUNET_DISK_FileHandle *fh =
+ GNUNET_CONTAINER_slist_get (t, NULL);
+ if (fh->type == GNUNET_PIPE)
+ {
+ if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
+ {
+ DWORD error_code = GetLastError ();
- fd_counter = 0;
- /* We might overshoot a little, but that won't hurt very much */
- int need_nfds = (rfds->sds.fd_count + rfds->sds.fd_count +
rfds->sds.fd_count > 0 ? 3 : 0)
- + (rfds == NULL ? 0 : GNUNET_CONTAINER_slist_count (rfds->handles))
- + (wfds == NULL ? 0 : 1)
- + 1;
- if (need_nfds >= ml->cached_poll_array_size)
- resize_cached_poll_array (ml, need_nfds * 2);
- /* Since there are also gmainloop's own fds, just need_nfds won't be
- * enough, so make it twice as long.
- */
- if (ml->read_array_length < GNUNET_CONTAINER_slist_count (rfds->handles))
- {
- ml->read_array = GNUNET_realloc (ml->read_array,
- GNUNET_CONTAINER_slist_count
(rfds->handles) * sizeof (struct GNUNET_DISK_FileHandle *));
- ml->read_array_length = GNUNET_CONTAINER_slist_count (rfds->handles);
- }
- if (rfds != NULL)
- {
- for (t = GNUNET_CONTAINER_slist_begin (rfds->handles), i = 0;
- GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (t), i += 1)
- {
- struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get
(t, NULL);
- if (fh->type == GNUNET_PIPE)
- {
- if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
- {
- DWORD error_code = GetLastError();
- if (error_code == ERROR_IO_PENDING)
- {
+ if (error_code == ERROR_IO_PENDING)
+ {
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the pipe's 0x%x overlapped event
to the array as %d\n",
- fh->h, nhandles);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the pipe's 0x%x overlapped event to the
array as %d\n",
+ fh->h, nhandles);
#endif
- ml->cached_poll_array[fd_counter].fd = (intptr_t)
fh->oOverlapRead->hEvent;
- /* On W32 .events makes no sense - g_poll will just
OR its
- * contents into .revents when the .fd event fires.
- * So we'll use it in the way that suits us the best.
- */
- ml->cached_poll_array[fd_counter].events = G_IO_IN;
- fd_counter += 1;
- ml->read_array[read_handles] = fh;
- read_handles += 1;
- }
- else
- {
- ml->cached_poll_array[fd_counter].fd = (intptr_t)
ml->hEventReadReady;
- ml->cached_poll_array[fd_counter].events = G_IO_HUP;
- fd_counter += 1;
- ml->read_array[read_handles] = fh;
- read_handles += 1;
- }
- }
- else
- {
+ ml->cached_poll_array[fd_counter].fd =
+ (intptr_t) fh->oOverlapRead->hEvent;
+ /* On W32 .events makes no sense - g_poll will just OR its
+ * contents into .revents when the .fd event fires.
+ * So we'll use it in the way that suits us the best.
+ */
+ ml->cached_poll_array[fd_counter].events = G_IO_IN;
+ fd_counter += 1;
+ ml->read_array[read_handles] = fh;
+ read_handles += 1;
+ }
+ else
+ {
+ ml->cached_poll_array[fd_counter].fd =
+ (intptr_t) ml->hEventReadReady;
+ ml->cached_poll_array[fd_counter].events = G_IO_HUP;
+ fd_counter += 1;
+ ml->read_array[read_handles] = fh;
+ read_handles += 1;
+ }
+ }
+ else
+ {
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the read ready event to the array as
%d\n",
- nhandles);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the read ready event to the array as %d\n",
+ nhandles);
#endif
- ml->cached_poll_array[fd_counter].fd = (intptr_t)
ml->hEventReadReady;
- ml->cached_poll_array[fd_counter].events = G_IO_IN;
- fd_counter += 1;
- ml->read_array[read_handles] = fh;
- read_handles += 1;
- }
- }
- else
- {
- GNUNET_CONTAINER_slist_add (ml->handles_read,
-
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct
GNUNET_DISK_FileHandle));
- pre_ret++;
- }
- }
- }
- if ( (wfds != NULL) && (GNUNET_CONTAINER_slist_count (wfds->handles) >
0) )
- {
- ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventPipeWrite;
- ml->cached_poll_array[fd_counter].events = G_IO_OUT;
- always_ready_write_fd = fd_counter;
- fd_counter += 1;
- }
- if (efds != NULL)
- {
- for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
- GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (t), i += 1)
- {
- struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get
(t, NULL);
+ ml->cached_poll_array[fd_counter].fd =
+ (intptr_t) ml->hEventReadReady;
+ ml->cached_poll_array[fd_counter].events = G_IO_IN;
+ fd_counter += 1;
+ ml->read_array[read_handles] = fh;
+ read_handles += 1;
+ }
+ }
+ else
+ {
+ GNUNET_CONTAINER_slist_add (ml->handles_read,
+
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh,
+ sizeof (struct GNUNET_DISK_FileHandle));
+ pre_ret++;
+ }
+ }
+ }
+ if ((wfds != NULL) && (GNUNET_CONTAINER_slist_count (wfds->handles) > 0))
+ {
+ ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventPipeWrite;
+ ml->cached_poll_array[fd_counter].events = G_IO_OUT;
+ always_ready_write_fd = fd_counter;
+ fd_counter += 1;
+ }
+ if (efds != NULL)
+ {
+ for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
+ GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (t), i += 1)
+ {
+ struct GNUNET_DISK_FileHandle *fh =
+ GNUNET_CONTAINER_slist_get (t, NULL);
- DWORD dwBytes;
- if (fh->type == GNUNET_PIPE)
- {
- if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
- {
- GNUNET_CONTAINER_slist_add (ml->handles_except,
-
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct
GNUNET_DISK_FileHandle));
- pre_ret++;
- }
- }
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (t);
-
- if ( (rfds != NULL) && (rfds->sds.fd_count > 0) )
- {
+ DWORD dwBytes;
+
+ if (fh->type == GNUNET_PIPE)
+ {
+ if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
+ {
+ GNUNET_CONTAINER_slist_add (ml->handles_except,
+
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh,
+ sizeof (struct
GNUNET_DISK_FileHandle));
+ pre_ret++;
+ }
+ }
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (t);
+
+ if ((rfds != NULL) && (rfds->sds.fd_count > 0))
+ {
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket read event to the array as %d\n",
- fd_counter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the socket read event to the array as %d\n",
+ fd_counter);
#endif
- ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventRead;
- ml->cached_poll_array[fd_counter].events = G_IO_IN;
- for (i = 0; i < rfds->sds.fd_count; i++)
- WSAEventSelect (rfds->sds.fd_array[i], ml->hEventRead, FD_ACCEPT |
FD_READ | FD_CLOSE);
- fd_counter += 1;
- sock_read = rfds->sds.fd_count;
- }
- if ( (wfds != NULL) && (wfds->sds.fd_count > 0) )
- {
- int wakeup = 0;
+ ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventRead;
+ ml->cached_poll_array[fd_counter].events = G_IO_IN;
+ for (i = 0; i < rfds->sds.fd_count; i++)
+ WSAEventSelect (rfds->sds.fd_array[i], ml->hEventRead,
+ FD_ACCEPT | FD_READ | FD_CLOSE);
+ fd_counter += 1;
+ sock_read = rfds->sds.fd_count;
+ }
+ if ((wfds != NULL) && (wfds->sds.fd_count > 0))
+ {
+ int wakeup = 0;
+
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket write event to the array as %d\n",
- fd_counter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the socket write event to the array as %d\n",
+ fd_counter);
#endif
- ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventWrite;
- ml->cached_poll_array[fd_counter].events = G_IO_OUT;
- for (i = 0; i < wfds->sds.fd_count; i++)
- {
- DWORD error;
- int status;
- status = send (wfds->sds.fd_array[i], NULL, 0, 0);
- error = GetLastError ();
+ ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventWrite;
+ ml->cached_poll_array[fd_counter].events = G_IO_OUT;
+ for (i = 0; i < wfds->sds.fd_count; i++)
+ {
+ DWORD error;
+ int status;
+
+ status = send (wfds->sds.fd_array[i], NULL, 0, 0);
+ error = GetLastError ();
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "pre-send to the socket %d returned %d (%u)\n",
- i, status, error);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "pre-send to the socket %d returned %d (%u)\n", i, status,
+ error);
#endif
- if (status == 0 || (error != WSAEWOULDBLOCK && error !=
WSAENOTCONN))
- wakeup = 1;
- WSAEventSelect (wfds->sds.fd_array[i], ml->hEventWrite, FD_WRITE
| FD_CONNECT | FD_CLOSE);
- }
- if (wakeup)
- SetEvent (ml->hEventWrite);
- fd_counter += 1;
- sock_write = wfds->sds.fd_count;
- }
- if ( (efds != NULL) && (efds->sds.fd_count > 0) )
- {
+ if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN))
+ wakeup = 1;
+ WSAEventSelect (wfds->sds.fd_array[i], ml->hEventWrite,
+ FD_WRITE | FD_CONNECT | FD_CLOSE);
+ }
+ if (wakeup)
+ SetEvent (ml->hEventWrite);
+ fd_counter += 1;
+ sock_write = wfds->sds.fd_count;
+ }
+ if ((efds != NULL) && (efds->sds.fd_count > 0))
+ {
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket error event to the array as %d\n",
- fd_counter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the socket error event to the array as %d\n",
+ fd_counter);
#endif
- ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventException;
- ml->cached_poll_array[fd_counter].events = G_IO_ERR;
- for (i = 0; i < efds->sds.fd_count; i++)
- WSAEventSelect (efds->sds.fd_array[i], ml->hEventException, FD_OOB
| FD_CLOSE);
- fd_counter++;
- sock_err = efds->sds.fd_count;
- }
- break;
+ ml->cached_poll_array[fd_counter].fd = (intptr_t) ml->hEventException;
+ ml->cached_poll_array[fd_counter].events = G_IO_ERR;
+ for (i = 0; i < efds->sds.fd_count; i++)
+ WSAEventSelect (efds->sds.fd_array[i], ml->hEventException,
+ FD_OOB | FD_CLOSE);
+ fd_counter++;
+ sock_err = efds->sds.fd_count;
}
+ break;
+ }
socks = sock_read + sock_write + sock_err;
#endif
/* combine with Gtk events */
g_main_context_prepare (ml->gmc, &max_priority);
while (1)
- {
- need_gfds = g_main_context_query (ml->gmc,
- max_priority,
- &delay,
- &ml->cached_poll_array[fd_counter],
- ml->cached_poll_array_size -
fd_counter);
- if (ml->cached_poll_array_size >= need_gfds + fd_counter)
- break;
- resize_cached_poll_array (ml,
- fd_counter + need_gfds);
- }
+ {
+ need_gfds =
+ g_main_context_query (ml->gmc, max_priority, &delay,
+ &ml->cached_poll_array[fd_counter],
+ ml->cached_poll_array_size - fd_counter);
+ if (ml->cached_poll_array_size >= need_gfds + fd_counter)
+ break;
+ resize_cached_poll_array (ml, fd_counter + need_gfds);
+ }
if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
- {
- if (delay >= 0)
- delay = GNUNET_MIN (timeout.rel_value /
GNUNET_TIME_UNIT_MILLISECONDS.rel_value,
- delay);
- else
- delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
- }
+ {
+ if (delay >= 0)
+ delay =
+ GNUNET_MIN (timeout.rel_value /
+ GNUNET_TIME_UNIT_MILLISECONDS.rel_value, delay);
+ else
+ delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
+ }
#if WINDOWS
if (pre_ret > 0)
- {
+ {
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "pre_ret is %d, setting delay to 0\n",
- pre_ret);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pre_ret is %d, setting delay to 0\n",
+ pre_ret);
#endif
- delay = 0;
- }
+ delay = 0;
+ }
#endif
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "We have %d of our FDs and %d of GMC ones, going to wait %6dms\n",
- fd_counter, need_gfds, delay);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "We have %d of our FDs and %d of GMC ones, going to wait
%6dms\n",
+ fd_counter, need_gfds, delay);
#endif
- poll_result = g_poll (ml->cached_poll_array,
- fd_counter + need_gfds,
- delay);
+ poll_result = g_poll (ml->cached_poll_array, fd_counter + need_gfds, delay);
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "g_poll returned : %d\n",
- poll_result);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "g_poll returned : %d\n", poll_result);
#endif
/* Take care of GUI events.
@@ -590,12 +594,11 @@
* from within a task (currently we're not in a task, but in a select()
call, remember)
* Startup reason is used to pass the scheduler sanity check.
*/
- if (TRUE == g_main_context_check (ml->gmc,
- max_priority,
- &ml->cached_poll_array[fd_counter],
- need_gfds))
+ if (TRUE ==
+ g_main_context_check (ml->gmc, max_priority,
+ &ml->cached_poll_array[fd_counter], need_gfds))
GNUNET_SCHEDULER_add_continuation (&dispatch_gtk_task, ml,
- GNUNET_SCHEDULER_REASON_STARTUP);
+ GNUNET_SCHEDULER_REASON_STARTUP);
/* Now map back GNUnet scheduler events ... */
#if !WINDOWS
@@ -606,167 +609,177 @@
if (NULL != efds)
GNUNET_NETWORK_fdset_zero (efds);
for (i = 0; i < fd_counter; i++)
- {
- int set = 0;
+ {
+ int set = 0;
- if ( (NULL != rfds) &&
- (set |= (FD_ISSET (ml->cached_poll_array[i].fd, &aread) &&
- (0 != (ml->cached_poll_array[i].revents & (G_IO_IN |
G_IO_HUP | G_IO_ERR))))))
- GNUNET_NETWORK_fdset_set_native (rfds, ml->cached_poll_array[i].fd);
- if ( (NULL != wfds) &&
- (set |= (FD_ISSET (ml->cached_poll_array[i].fd, &awrite) &&
- (0 != (ml->cached_poll_array[i].revents & (G_IO_OUT |
G_IO_ERR))))))
- GNUNET_NETWORK_fdset_set_native (wfds, ml->cached_poll_array[i].fd);
- if ( (NULL != efds) &&
- (set |= (FD_ISSET (ml->cached_poll_array[i].fd, &aexcept) &&
- (0 != (ml->cached_poll_array[i].revents & G_IO_ERR)))))
- GNUNET_NETWORK_fdset_set_native (efds, ml->cached_poll_array[i].fd);
- if (set)
- result++;
- }
+ if ((NULL != rfds) &&
+ (set |=
+ (FD_ISSET (ml->cached_poll_array[i].fd, &aread) &&
+ (0 !=
+ (ml->
+ cached_poll_array[i].revents & (G_IO_IN | G_IO_HUP | G_IO_ERR))))))
+ GNUNET_NETWORK_fdset_set_native (rfds, ml->cached_poll_array[i].fd);
+ if ((NULL != wfds) &&
+ (set |=
+ (FD_ISSET (ml->cached_poll_array[i].fd, &awrite) &&
+ (0 != (ml->cached_poll_array[i].revents & (G_IO_OUT | G_IO_ERR))))))
+ GNUNET_NETWORK_fdset_set_native (wfds, ml->cached_poll_array[i].fd);
+ if ((NULL != efds) &&
+ (set |=
+ (FD_ISSET (ml->cached_poll_array[i].fd, &aexcept) &&
+ (0 != (ml->cached_poll_array[i].revents & G_IO_ERR)))))
+ GNUNET_NETWORK_fdset_set_native (efds, ml->cached_poll_array[i].fd);
+ if (set)
+ result++;
+ }
#else
if (socks > 0)
- {
- struct timeval tvslice;
- tvslice.tv_sec = 0;
- tvslice.tv_usec = 0;
- select_ret = select (max_nfds, &aread, &awrite, &aexcept, &tvslice);
- if (select_ret == -1)
- select_ret = 0;
+ {
+ struct timeval tvslice;
+
+ tvslice.tv_sec = 0;
+ tvslice.tv_usec = 0;
+ select_ret = select (max_nfds, &aread, &awrite, &aexcept, &tvslice);
+ if (select_ret == -1)
+ select_ret = 0;
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "select() returned %d\n",
- select_ret);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "select() returned %d\n", select_ret);
#endif
- }
- if (always_ready_write_fd >= 0 &&
ml->cached_poll_array[always_ready_write_fd].revents & G_IO_OUT)
- {
- GNUNET_CONTAINER_slist_append (ml->handles_write, wfds->handles);
- result += GNUNET_CONTAINER_slist_count (ml->handles_write);
+ }
+ if (always_ready_write_fd >= 0 &&
+ ml->cached_poll_array[always_ready_write_fd].revents & G_IO_OUT)
+ {
+ GNUNET_CONTAINER_slist_append (ml->handles_write, wfds->handles);
+ result += GNUNET_CONTAINER_slist_count (ml->handles_write);
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added write pipe\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added write pipe\n");
#endif
- }
+ }
for (i = 0; i < read_handles; i++)
- {
- DWORD error;
- BOOL bret;
- if (!(ml->cached_poll_array[i].revents & (G_IO_IN | G_IO_HUP |
G_IO_ERR)))
- continue;
- SetLastError (0);
- waitstatus = 0;
- bret = PeekNamedPipe (ml->read_array[i]->h, NULL, 0, NULL, &waitstatus,
NULL);
- error = GetLastError ();
+ {
+ DWORD error;
+ BOOL bret;
+
+ if (!(ml->cached_poll_array[i].revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)))
+ continue;
+ SetLastError (0);
+ waitstatus = 0;
+ bret =
+ PeekNamedPipe (ml->read_array[i]->h, NULL, 0, NULL, &waitstatus, NULL);
+ error = GetLastError ();
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peek at read pipe %d (0x%x) returned %d (%d bytes available)
GLE %u\n",
- i, ml->read_array[i]->h, bret, waitstatus, error);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peek at read pipe %d (0x%x) returned %d (%d bytes available)
GLE %u\n",
+ i, ml->read_array[i]->h, bret, waitstatus, error);
#endif
- if (bret == 0 || (ml->cached_poll_array[i].revents & G_IO_ERR))
- {
- if (efds != NULL)
- {
- struct GNUNET_CONTAINER_SList_Iterator *t;
- for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
- GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (t), i += 1)
- {
- struct GNUNET_DISK_FileHandle *fh =
GNUNET_CONTAINER_slist_get (t, NULL);
- if (fh == ml->read_array[i])
- {
- GNUNET_CONTAINER_slist_add (ml->handles_except,
-
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct
GNUNET_DISK_FileHandle));
- break;
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (t);
- }
- }
- else if (waitstatus <= 0)
- continue;
- GNUNET_CONTAINER_slist_add (ml->handles_read,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- ml->read_array[i], sizeof (struct
GNUNET_DISK_FileHandle));
- result += 1;
+ if (bret == 0 || (ml->cached_poll_array[i].revents & G_IO_ERR))
+ {
+ if (efds != NULL)
+ {
+ struct GNUNET_CONTAINER_SList_Iterator *t;
+
+ for (t = GNUNET_CONTAINER_slist_begin (efds->handles), i = 0;
+ GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (t), i += 1)
+ {
+ struct GNUNET_DISK_FileHandle *fh =
+ GNUNET_CONTAINER_slist_get (t, NULL);
+ if (fh == ml->read_array[i])
+ {
+ GNUNET_CONTAINER_slist_add (ml->handles_except,
+
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh,
+ sizeof (struct
GNUNET_DISK_FileHandle));
+ break;
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (t);
+ }
+ }
+ else if (waitstatus <= 0)
+ continue;
+ GNUNET_CONTAINER_slist_add (ml->handles_read,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ ml->read_array[i],
+ sizeof (struct GNUNET_DISK_FileHandle));
+ result += 1;
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Added read Pipe 0x%x (0x%x)\n",
- ml->read_array[i],
- ml->read_array[i]->h);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added read Pipe 0x%x (0x%x)\n",
+ ml->read_array[i], ml->read_array[i]->h);
#endif
- }
+ }
waitstatus = WaitForSingleObject (ml->hEventWrite, 0);
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Wait for the write event returned %d\n",
- waitstatus);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Wait for the write event returned
%d\n",
+ waitstatus);
#endif
if (waitstatus == WAIT_OBJECT_0)
+ {
+ for (i = 0; i < wfds->sds.fd_count; i++)
{
- for (i = 0; i < wfds->sds.fd_count; i++)
- {
- DWORD error;
- int status;
- int so_error = 0;
- int sizeof_so_error = sizeof (so_error);
- int gso_result = getsockopt (wfds->sds.fd_array[i],
- SOL_SOCKET, SO_ERROR,
- (char *) &so_error, &sizeof_so_error);
- status = send (wfds->sds.fd_array[i], NULL, 0, 0);
- error = GetLastError ();
+ DWORD error;
+ int status;
+ int so_error = 0;
+ int sizeof_so_error = sizeof (so_error);
+ int gso_result = getsockopt (wfds->sds.fd_array[i],
+ SOL_SOCKET, SO_ERROR,
+ (char *) &so_error, &sizeof_so_error);
+
+ status = send (wfds->sds.fd_array[i], NULL, 0, 0);
+ error = GetLastError ();
#if DEBUG_EVENTLOOP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "send to the socket %d returned %d (%u)\n",
- i, status, error);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "send to the socket %d returned %d (%u)\n", i, status,
error);
#endif
- if (status == 0
- || (error != WSAEWOULDBLOCK && error != WSAENOTCONN)
- || (status == -1 && gso_result == 0 && error == WSAENOTCONN &&
so_error == WSAECONNREFUSED))
- {
- FD_SET (wfds->sds.fd_array[i], &awrite);
- result += 1;
- }
- }
+ if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) ||
+ (status == -1 && gso_result == 0 && error == WSAENOTCONN &&
+ so_error == WSAECONNREFUSED))
+ {
+ FD_SET (wfds->sds.fd_array[i], &awrite);
+ result += 1;
+ }
}
+ }
if (rfds)
+ {
+ struct GNUNET_CONTAINER_SList_Iterator *t;
+
+ for (i = 0; i < rfds->sds.fd_count; i++)
+ WSAEventSelect (rfds->sds.fd_array[i], ml->hEventRead, 0);
+ for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
+ GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (t))
{
- struct GNUNET_CONTAINER_SList_Iterator *t;
- for (i = 0; i < rfds->sds.fd_count; i++)
- WSAEventSelect (rfds->sds.fd_array[i], ml->hEventRead, 0);
- for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
- GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (t))
- {
- struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t,
NULL);
- if (fh->type == GNUNET_PIPE)
- CancelIo (fh->h);
- }
- GNUNET_CONTAINER_slist_iter_destroy (t);
- GNUNET_NETWORK_fdset_zero (rfds);
- if (select_ret != -1 && socks > 0)
- GNUNET_NETWORK_fdset_copy_native (rfds, &aread, select_ret);
- GNUNET_CONTAINER_slist_append (rfds->handles, ml->handles_read);
+ struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
+
+ if (fh->type == GNUNET_PIPE)
+ CancelIo (fh->h);
}
+ GNUNET_CONTAINER_slist_iter_destroy (t);
+ GNUNET_NETWORK_fdset_zero (rfds);
+ if (select_ret != -1 && socks > 0)
+ GNUNET_NETWORK_fdset_copy_native (rfds, &aread, select_ret);
+ GNUNET_CONTAINER_slist_append (rfds->handles, ml->handles_read);
+ }
if (wfds)
- {
- for (i = 0; i < wfds->sds.fd_count; i++)
- WSAEventSelect (wfds->sds.fd_array[i], ml->hEventWrite, 0);
- GNUNET_NETWORK_fdset_zero (wfds);
- if (select_ret != -1 && socks > 0)
- GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, select_ret);
- GNUNET_CONTAINER_slist_append (wfds->handles, ml->handles_write);
- }
+ {
+ for (i = 0; i < wfds->sds.fd_count; i++)
+ WSAEventSelect (wfds->sds.fd_array[i], ml->hEventWrite, 0);
+ GNUNET_NETWORK_fdset_zero (wfds);
+ if (select_ret != -1 && socks > 0)
+ GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, select_ret);
+ GNUNET_CONTAINER_slist_append (wfds->handles, ml->handles_write);
+ }
if (efds)
- {
- for (i = 0; i < efds->sds.fd_count; i++)
- WSAEventSelect (efds->sds.fd_array[i], ml->hEventException, 0);
- GNUNET_NETWORK_fdset_zero (efds);
- if (select_ret != -1 && socks > 0)
- GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, select_ret);
- GNUNET_CONTAINER_slist_append (efds->handles, ml->handles_except);
- result += GNUNET_CONTAINER_slist_count (ml->handles_except);
- }
+ {
+ for (i = 0; i < efds->sds.fd_count; i++)
+ WSAEventSelect (efds->sds.fd_array[i], ml->hEventException, 0);
+ GNUNET_NETWORK_fdset_zero (efds);
+ if (select_ret != -1 && socks > 0)
+ GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, select_ret);
+ GNUNET_CONTAINER_slist_append (efds->handles, ml->handles_except);
+ result += GNUNET_CONTAINER_slist_count (ml->handles_except);
+ }
if (fd_counter > 0)
/* This is not accurate (select_ret counts write-ready sockets,
* and result does as well. Anything out there actually cares
@@ -789,19 +802,18 @@
* @param args leftover command line arguments (go to gtk)
* @param cfgfile name of the configuration file
* @param cfg handle to the configuration
- */
+ */
static void
-run_main_loop (void *cls,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+run_main_loop (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_GTK_MainLoop *ml = cls;
int argc;
-
+
/* command-line processing for Gtk arguments */
argc = 0;
- while (args[argc] != NULL) argc++;
+ while (args[argc] != NULL)
+ argc++;
gtk_init (&argc, (char ***) &args);
/* setup main context */
@@ -828,16 +840,16 @@
/* run main task of the application */
GNUNET_SCHEDULER_add_continuation (ml->main_task, ml,
- GNUNET_SCHEDULER_REASON_STARTUP);
+ GNUNET_SCHEDULER_REASON_STARTUP);
/* start the Gtk event loop */
GNUNET_assert (TRUE == g_main_context_acquire (ml->gmc));
GNUNET_SCHEDULER_set_select (&gnunet_gtk_select, ml);
/* keep Gtk event loop running even if there are no GNUnet tasks */
- ml->dummy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &keepalive_task,
- ml);
+ ml->dummy_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &keepalive_task, ml);
}
@@ -855,13 +867,11 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. bad command-line
options, etc)
*/
int
-GNUNET_GTK_main_loop_start (const char *binary_name,
- const char *binary_help,
- int argc,
- char *const*argv,
- struct GNUNET_GETOPT_CommandLineOption *options,
- const char *main_window_file,
- GNUNET_SCHEDULER_Task main_task)
+GNUNET_GTK_main_loop_start (const char *binary_name, const char *binary_help,
+ int argc, char *const *argv,
+ struct GNUNET_GETOPT_CommandLineOption *options,
+ const char *main_window_file,
+ GNUNET_SCHEDULER_Task main_task)
{
struct GNUNET_GTK_MainLoop ml;
int ret;
@@ -869,11 +879,9 @@
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,
- "GTK GUI for GNUnet",
- options,
- &run_main_loop, &ml);
+ ret =
+ GNUNET_PROGRAM_run (argc, argv, binary_name, "GTK GUI for GNUnet",
+ options, &run_main_loop, &ml);
if (NULL != ml.cached_poll_array)
g_free (ml.cached_poll_array);
if (NULL != ml.rs)
Modified: gnunet-gtk/src/lib/glade.c
===================================================================
--- gnunet-gtk/src/lib/glade.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/lib/glade.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -74,21 +74,16 @@
ret = gtk_builder_new ();
gtk_builder_set_translation_domain (ret, "gnunet-gtk");
- GNUNET_asprintf (&glade_path,
- "%s%s",
- GNUNET_GTK_get_data_dir (),
- filename);
+ GNUNET_asprintf (&glade_path, "%s%s", GNUNET_GTK_get_data_dir (), filename);
error = NULL;
if (0 == gtk_builder_add_from_file (ret, glade_path, &error))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load `%s': %s\n"),
- glade_path,
- error->message);
- g_error_free (error);
- GNUNET_free (glade_path);
- return NULL;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to load `%s': %s\n"),
+ glade_path, error->message);
+ g_error_free (error);
+ GNUNET_free (glade_path);
+ return NULL;
+ }
gtk_builder_connect_signals (ret, NULL);
GNUNET_free (glade_path);
return ret;
Modified: gnunet-gtk/src/lib/nls.c
===================================================================
--- gnunet-gtk/src/lib/nls.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/lib/nls.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -40,10 +40,8 @@
char *path;
setlocale (LC_ALL, "");
- GNUNET_asprintf (&path,
- "%s/%s/locale/",
- GNUNET_GTK_get_data_dir (),
- PACKAGE_NAME);
+ GNUNET_asprintf (&path, "%s/%s/locale/", GNUNET_GTK_get_data_dir (),
+ PACKAGE_NAME);
bindtextdomain ("gnunet-gtk", path);
textdomain ("gnunet-gtk");
bind_textdomain_codeset ("GNUnet", "UTF-8");
@@ -51,7 +49,7 @@
GNUNET_free (path);
#else
fprintf (stderr,
- "WARNING: gnunet-gtk was compiled without i18n support (did CFLAGS
contain -Werror?).\n");
+ "WARNING: gnunet-gtk was compiled without i18n support (did CFLAGS
contain -Werror?).\n");
#endif
}
Modified: gnunet-gtk/src/lib/os_installation.c
===================================================================
--- gnunet-gtk/src/lib/os_installation.c 2011-08-15 22:36:56 UTC (rev
16584)
+++ gnunet-gtk/src/lib/os_installation.c 2011-08-15 22:37:19 UTC (rev
16585)
@@ -50,25 +50,21 @@
FILE *f;
char *lgu;
- GNUNET_snprintf (fn,
- sizeof(fn),
- "/proc/%u/maps",
- getpid ());
+ GNUNET_snprintf (fn, sizeof (fn), "/proc/%u/maps", getpid ());
f = fopen (fn, "r");
if (f == NULL)
return NULL;
- while (NULL != fgets (line, sizeof(line), f))
+ while (NULL != fgets (line, sizeof (line), f))
+ {
+ if ((1 ==
+ sscanf (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s", dir))
&&
+ (NULL != (lgu = strstr (dir, "gnunet-gtk"))))
{
- if ((1 == sscanf (line,
- "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s",
- dir)) &&
- (NULL != (lgu = strstr (dir, "gnunet-gtk"))))
- {
- lgu[0] = '\0';
- fclose (f);
- return GNUNET_strdup (dir);
- }
+ lgu[0] = '\0';
+ fclose (f);
+ return GNUNET_strdup (dir);
}
+ }
fclose (f);
return NULL;
}
@@ -83,23 +79,22 @@
char lnk[1024];
ssize_t size;
- GNUNET_snprintf (fn,
- sizeof(fn), "/proc/%u/exe", getpid ());
- size = readlink (fn, lnk, sizeof (lnk)-1);
+ GNUNET_snprintf (fn, sizeof (fn), "/proc/%u/exe", getpid ());
+ size = readlink (fn, lnk, sizeof (lnk) - 1);
if (size <= 0)
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
- return NULL;
- }
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
+ return NULL;
+ }
GNUNET_assert (size < sizeof (lnk));
lnk[size] = '\0';
while ((lnk[size] != '/') && (size > 0))
size--;
if ((size < 4) || (lnk[size - 4] != '/'))
- {
- /* not installed in "/bin/" -- binary path probably useless */
- return NULL;
- }
+ {
+ /* not installed in "/bin/" -- binary path probably useless */
+ return NULL;
+ }
lnk[size] = '\0';
return GNUNET_strdup (lnk);
}
@@ -115,7 +110,7 @@
char path[4097];
char *idx;
- GetModuleFileName (NULL, path, sizeof(path)-1);
+ GetModuleFileName (NULL, path, sizeof (path) - 1);
idx = path + strlen (path);
while ((idx > path) && (*idx != '\\') && (*idx != '/'))
idx--;
@@ -138,7 +133,7 @@
path = NULL;
func =
- (MyNSGetExecutablePathProto) dlsym (RTLD_DEFAULT, "_NSGetExecutablePath");
+ (MyNSGetExecutablePathProto) dlsym (RTLD_DEFAULT,
"_NSGetExecutablePath");
if (!func)
return NULL;
path = &zero;
@@ -150,10 +145,10 @@
path = GNUNET_malloc (len);
ret = func (path, &len);
if (ret != 0)
- {
- GNUNET_free (path);
- return NULL;
- }
+ {
+ GNUNET_free (path);
+ return NULL;
+ }
len = strlen (path);
while ((path[len] != '/') && (len > 0))
len--;
@@ -172,22 +167,22 @@
p = NULL;
c = _dyld_image_count ();
for (i = 0; i < c; i++)
+ {
+ if (_dyld_get_image_header (i) == &_mh_dylib_header)
{
- if (_dyld_get_image_header (i) == &_mh_dylib_header)
- {
- path = _dyld_get_image_name (i);
- if (path != NULL && strlen (path) > 0)
- {
- p = strdup (path);
- s = p + strlen (p);
- while ((s > p) && (*s != '/'))
- s--;
- s++;
- *s = '\0';
- }
- break;
- }
+ path = _dyld_get_image_name (i);
+ if (path != NULL && strlen (path) > 0)
+ {
+ p = strdup (path);
+ s = p + strlen (p);
+ while ((s > p) && (*s != '/'))
+ s--;
+ s++;
+ *s = '\0';
+ }
+ break;
}
+ }
return p;
}
#endif
@@ -209,26 +204,26 @@
pos = path;
while (NULL != (end = strchr (pos, ':')))
+ {
+ *end = '\0';
+ sprintf (buf, "%s/%s", pos, "gnunet-gtk");
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
{
- *end = '\0';
- sprintf (buf, "%s/%s", pos, "gnunet-gtk");
- if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
- {
- pos = GNUNET_strdup (pos);
- GNUNET_free (buf);
- GNUNET_free (path);
- return pos;
- }
- pos = end + 1;
- }
- sprintf (buf, "%s/%s", pos, "gnunet-gtk");
- if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
- {
pos = GNUNET_strdup (pos);
GNUNET_free (buf);
GNUNET_free (path);
return pos;
}
+ pos = end + 1;
+ }
+ sprintf (buf, "%s/%s", pos, "gnunet-gtk");
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+ {
+ pos = GNUNET_strdup (pos);
+ GNUNET_free (buf);
+ GNUNET_free (path);
+ return pos;
+ }
GNUNET_free (buf);
GNUNET_free (path);
return NULL;
@@ -290,8 +285,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Could not determine installation path for %s. Set `%s'
environment variable.\n"),
- "gnunet-gtk",
- "GNUNET_GTK_PREFIX");
+ "gnunet-gtk", "GNUNET_GTK_PREFIX");
return NULL;
}
@@ -357,11 +351,11 @@
n = strlen (execpath);
if (n == 0)
- {
- /* should never happen, but better safe than sorry */
- GNUNET_free (execpath);
- return NULL;
- }
+ {
+ /* should never happen, but better safe than sorry */
+ GNUNET_free (execpath);
+ return NULL;
+ }
/* remove filename itself */
while ((n > 1) && (execpath[n - 1] == DIR_SEPARATOR))
execpath[--n] = '\0';
@@ -370,62 +364,61 @@
if ((n > 5) &&
((0 == strcasecmp (&execpath[n - 5], "lib32")) ||
(0 == strcasecmp (&execpath[n - 5], "lib64"))))
+ {
+ if (dirkind != GNUNET_OS_IPK_LIBDIR)
{
- if (dirkind != GNUNET_OS_IPK_LIBDIR)
- {
- /* strip '/lib32' or '/lib64' */
- execpath[n - 5] = '\0';
- n -= 5;
- }
- else
- isbasedir = 0;
+ /* strip '/lib32' or '/lib64' */
+ execpath[n - 5] = '\0';
+ n -= 5;
}
+ else
+ isbasedir = 0;
+ }
else if ((n > 3) &&
((0 == strcasecmp (&execpath[n - 3], "bin")) ||
(0 == strcasecmp (&execpath[n - 3], "lib"))))
- {
- /* strip '/bin' or '/lib' */
- execpath[n - 3] = '\0';
- n -= 3;
- }
+ {
+ /* strip '/bin' or '/lib' */
+ execpath[n - 3] = '\0';
+ n -= 3;
+ }
/* in case this was a directory named foo-bin, remove "foo-" */
while ((n > 1) && (execpath[n - 1] == DIR_SEPARATOR))
execpath[--n] = '\0';
switch (dirkind)
- {
- case GNUNET_OS_IPK_PREFIX:
- case GNUNET_OS_IPK_SELF_PREFIX:
- dirname = DIR_SEPARATOR_STR;
- break;
- case GNUNET_OS_IPK_BINDIR:
- dirname = DIR_SEPARATOR_STR "bin" DIR_SEPARATOR_STR;
- break;
- case GNUNET_OS_IPK_LIBDIR:
- if (isbasedir)
- dirname =
+ {
+ case GNUNET_OS_IPK_PREFIX:
+ case GNUNET_OS_IPK_SELF_PREFIX:
+ dirname = DIR_SEPARATOR_STR;
+ break;
+ case GNUNET_OS_IPK_BINDIR:
+ dirname = DIR_SEPARATOR_STR "bin" DIR_SEPARATOR_STR;
+ break;
+ case GNUNET_OS_IPK_LIBDIR:
+ if (isbasedir)
+ dirname =
DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
- else
- dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
- break;
- case GNUNET_OS_IPK_DATADIR:
- dirname =
+ else
+ dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
+ break;
+ case GNUNET_OS_IPK_DATADIR:
+ dirname =
DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
- break;
- case GNUNET_OS_IPK_ICONDIR:
- dirname =
+ break;
+ case GNUNET_OS_IPK_ICONDIR:
+ dirname =
DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR;
- break;
- case GNUNET_OS_IPK_LOCALEDIR:
- dirname =
- DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "locale"
- DIR_SEPARATOR_STR;
- break;
- default:
- GNUNET_free (execpath);
- return NULL;
- }
+ break;
+ case GNUNET_OS_IPK_LOCALEDIR:
+ dirname =
+ DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "locale" DIR_SEPARATOR_STR;
+ break;
+ default:
+ GNUNET_free (execpath);
+ return NULL;
+ }
tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
sprintf (tmp, "%s%s", execpath, dirname);
GNUNET_free (execpath);
Modified: gnunet-gtk/src/lib/trayicon.c
===================================================================
--- gnunet-gtk/src/lib/trayicon.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/lib/trayicon.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -42,9 +42,8 @@
* We got a click on our tray icon. Toggle visibility of the main
* window.
*/
-static void
-tray_icon_on_click(GtkStatusIcon *status_icon,
- gpointer user_data)
+static void
+tray_icon_on_click (GtkStatusIcon * status_icon, gpointer user_data)
{
if (gtk_window_is_active (main_window))
gtk_widget_hide (GTK_WIDGET (main_window));
@@ -57,28 +56,27 @@
* We got a right-click on the tray icon. Display the context
* menu (which should have a 'quit' button).
*/
-static int
-tray_icon_on_menu(GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
+static int
+tray_icon_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
{
GtkMenu *tray_menu;
GdkEventButton *event_button;
GtkBuilder *builder;
-
+
if (event->type == GDK_BUTTON_PRESS)
+ {
+ event_button = (GdkEventButton *) event;
+ if (event_button->button == 3)
{
- event_button = (GdkEventButton *) event;
- if (event_button->button == 3)
- {
- builder = GNUNET_GTK_get_new_builder
("gnunet_gtk_status_bar_menu.glade");
- tray_menu = GTK_MENU (gtk_builder_get_object (builder,
-
"GNUNET_GTK_status_bar_popup_menu"));
- gtk_menu_popup (tray_menu, NULL, NULL, NULL, NULL,
- event_button->button, event_button->time);
- g_object_unref (builder);
- }
+ builder = GNUNET_GTK_get_new_builder
("gnunet_gtk_status_bar_menu.glade");
+ tray_menu =
+ GTK_MENU (gtk_builder_get_object
+ (builder, "GNUNET_GTK_status_bar_popup_menu"));
+ gtk_menu_popup (tray_menu, NULL, NULL, NULL, NULL, event_button->button,
+ event_button->time);
+ g_object_unref (builder);
}
+ }
return FALSE;
}
@@ -91,35 +89,30 @@
* @param tooltip tooltip for the tray icon
*/
void
-GNUNET_GTK_tray_icon_create (GtkWindow *main,
- const char *icon_name,
- const char *tooltip)
+GNUNET_GTK_tray_icon_create (GtkWindow * main, const char *icon_name,
+ const char *tooltip)
{
if (NULL != tray_icon)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
main_window = main;
- tray_icon = gtk_status_icon_new();
- g_signal_connect(G_OBJECT(tray_icon), "activate",
- G_CALLBACK(tray_icon_on_click), NULL);
- g_signal_connect (G_OBJECT(tray_icon),
- "button_press_event",
- G_CALLBACK(tray_icon_on_menu),
- tray_icon);
- gtk_status_icon_set_from_icon_name (tray_icon,
- icon_name);
- gtk_status_icon_set_tooltip(tray_icon,
- tooltip);
- gtk_status_icon_set_visible(tray_icon, TRUE);
+ tray_icon = gtk_status_icon_new ();
+ g_signal_connect (G_OBJECT (tray_icon), "activate",
+ G_CALLBACK (tray_icon_on_click), NULL);
+ g_signal_connect (G_OBJECT (tray_icon), "button_press_event",
+ G_CALLBACK (tray_icon_on_menu), tray_icon);
+ gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
+ gtk_status_icon_set_tooltip (tray_icon, tooltip);
+ gtk_status_icon_set_visible (tray_icon, TRUE);
}
/**
* Destroy the tray icon.
*/
-void
+void
GNUNET_GTK_tray_icon_destroy ()
{
if (tray_icon == NULL)
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -1,11 +1,11 @@
- mc->pnc = GNUNET_PEERINFO_notify (cfg,
- &GNUNET_GTK_peerinfo_processor,
- NULL);
- if (mc->pnc == NULL)
- {
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
-
"GNUNET_GTK_main_window_peerinfo_treeview")));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
-
"GNUNET_GTK_main_menu_view_neighbours")));
- /* FIXME: set warning in status bar... */
- }
+mc->pnc = GNUNET_PEERINFO_notify (cfg, &GNUNET_GTK_peerinfo_processor, NULL);
+if (mc->pnc == NULL)
+{
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (mc->builder,
"GNUNET_GTK_main_window_peerinfo_treeview")));
+ gtk_widget_hide (GTK_WIDGET
+ (gtk_builder_get_object
+ (mc->builder, "GNUNET_GTK_main_menu_view_neighbours")));
+ /* FIXME: set warning in status bar... */
+}
Modified: gnunet-gtk/src/peerinfo/peerinfo.c
===================================================================
--- gnunet-gtk/src/peerinfo/peerinfo.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/peerinfo/peerinfo.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -35,9 +35,9 @@
*/
void
GNUNET_GTK_peerinfo_processor (void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_HELLO_Message * hello,
- const char * err_msg)
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
+ const char *err_msg)
{
GtkListStore *ls;
GtkTreeModel *tm;
@@ -47,44 +47,38 @@
const char *npid;
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
- GNUNET_CRYPTO_hash_to_enc (&peer->hashPubKey,
- &enc);
- npid = (const char*) &enc;
- ls = GTK_LIST_STORE (GNUNET_GTK_get_main_window_object
("GNUNET_GTK_peer_info_list_store"));
+ GNUNET_CRYPTO_hash_to_enc (&peer->hashPubKey, &enc);
+ npid = (const char *) &enc;
+ ls = GTK_LIST_STORE (GNUNET_GTK_get_main_window_object
+ ("GNUNET_GTK_peer_info_list_store"));
tm = GTK_TREE_MODEL (ls);
found = GNUNET_NO;
if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
+ pid = NULL;
+ gtk_tree_model_get (tm, &iter, 0, &pid, -1);
+ if (pid != NULL)
+ {
+ if (0 == strcmp (pid, npid))
{
- pid = NULL;
- gtk_tree_model_get (tm,
- &iter,
- 0, &pid, -1);
- if (pid != NULL)
- {
- if (0 == strcmp (pid, npid))
- {
- found = GNUNET_YES;
- g_free (pid);
- break;
- }
- }
- g_free (pid);
+ found = GNUNET_YES;
+ g_free (pid);
+ break;
}
- while ( (found == GNUNET_NO) &&
- (TRUE == gtk_tree_model_iter_next (tm,
- &iter)));
+ }
+ g_free (pid);
}
+ while ((found == GNUNET_NO) &&
+ (TRUE == gtk_tree_model_iter_next (tm, &iter)));
+ }
if (found == GNUNET_NO)
gtk_list_store_append (ls, &iter);
- gtk_list_store_set (ls,
- &iter,
- 0, npid,
- 1, 0 /* number of known addresses */,
- 2, "" /* country name */,
- 3, NULL /* country flag */,
- -1);
+ gtk_list_store_set (ls, &iter, 0, npid, 1, 0 /* number of known addresses */
,
+ 2, "" /* country name */ ,
+ 3, NULL /* country flag */ ,
+ -1);
}
/* end of peerinfo.c */
Modified: gnunet-gtk/src/setup/gnunet-setup-datacache-config.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datacache-config.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-datacache-config.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -30,9 +30,7 @@
* Stub implementation of the 'DeleteNotifyCallback' callback.
*/
static void
-dnc_dummy (void *cls,
- const GNUNET_HashCode *key,
- size_t size)
+dnc_dummy (void *cls, const GNUNET_HashCode * key, size_t size)
{
/* do nothing */
}
@@ -47,13 +45,12 @@
static int
test_config (const char *name)
{
- struct GNUNET_DATACACHE_PluginEnvironment env =
- {
- cfg,
- "dhtcache",
- NULL, &dnc_dummy,
- 1024LL
- };
+ struct GNUNET_DATACACHE_PluginEnvironment env = {
+ cfg,
+ "dhtcache",
+ NULL, &dnc_dummy,
+ 1024LL
+ };
void *ret;
ret = GNUNET_PLUGIN_load (name, &env);
@@ -95,41 +92,38 @@
void
-GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb (GtkWidget * widget,
+ gpointer user_data)
{
- if (GNUNET_OK ==
- test_config ("libgnunet_plugin_datacache_mysql"))
- {
- show ("GNUNET_setup_datacache_mysql_tab_ok_image");
- hide ("GNUNET_setup_datacache_mysql_tab_error_image");
- }
+ if (GNUNET_OK == test_config ("libgnunet_plugin_datacache_mysql"))
+ {
+ show ("GNUNET_setup_datacache_mysql_tab_ok_image");
+ hide ("GNUNET_setup_datacache_mysql_tab_error_image");
+ }
else
- {
- hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
- show ("GNUNET_setup_datacache_mysql_tab_error_image");
- }
+ {
+ hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
+ show ("GNUNET_setup_datacache_mysql_tab_error_image");
+ }
}
void
-GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb (GtkWidget * widget,
+ gpointer user_data)
{
- if (GNUNET_OK ==
- test_config ("libgnunet_plugin_datacache_postgres"))
- {
- show ("GNUNET_setup_datacache_postgres_tab_ok_image");
- hide ("GNUNET_setup_datacache_postgres_tab_error_image");
- }
+ if (GNUNET_OK == test_config ("libgnunet_plugin_datacache_postgres"))
+ {
+ show ("GNUNET_setup_datacache_postgres_tab_ok_image");
+ hide ("GNUNET_setup_datacache_postgres_tab_error_image");
+ }
else
- {
- hide ("GNUNET_setup_datacache_postgres_tab_ok_image");
- show ("GNUNET_setup_datacache_postgres_tab_error_image");
- }
+ {
+ hide ("GNUNET_setup_datacache_postgres_tab_ok_image");
+ show ("GNUNET_setup_datacache_postgres_tab_error_image");
+ }
}
/* end of gnunet-setup-datacache-config.c */
-
Modified: gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -34,45 +34,40 @@
* @param name name of the plugin to check
*/
static void
-test_plugin (GtkWidget *widget,
- const char *name)
+test_plugin (GtkWidget * widget, const char *name)
{
- if (GNUNET_YES ==
- GNUNET_PLUGIN_test (name))
- {
- gtk_widget_set_sensitive (widget,
- TRUE);
- }
+ if (GNUNET_YES == GNUNET_PLUGIN_test (name))
+ {
+ gtk_widget_set_sensitive (widget, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (widget,
- FALSE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
- FALSE);
- }
+ {
+ gtk_widget_set_sensitive (widget, FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+ }
}
void
-GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datacache_sqlite");
}
void
-GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datacache_mysql");
}
void
-GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datacache_postgres");
}
@@ -80,4 +75,3 @@
/* end of gnunet-setup-transport-plugins.c */
-
Modified: gnunet-gtk/src/setup/gnunet-setup-datastore-config.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datastore-config.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-datastore-config.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -45,11 +45,10 @@
static int
test_config (const char *name)
{
- struct GNUNET_DATASTORE_PluginEnvironment env =
- {
- cfg,
- &duc_dummy, NULL
- };
+ struct GNUNET_DATASTORE_PluginEnvironment env = {
+ cfg,
+ &duc_dummy, NULL
+ };
void *ret;
ret = GNUNET_PLUGIN_load (name, &env);
@@ -91,41 +90,38 @@
void
-GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb (GtkWidget * widget,
+ gpointer user_data)
{
- if (GNUNET_OK ==
- test_config ("libgnunet_plugin_datastore_mysql"))
- {
- show ("GNUNET_setup_datastore_mysql_tab_ok_image");
- hide ("GNUNET_setup_datastore_mysql_tab_error_image");
- }
+ if (GNUNET_OK == test_config ("libgnunet_plugin_datastore_mysql"))
+ {
+ show ("GNUNET_setup_datastore_mysql_tab_ok_image");
+ hide ("GNUNET_setup_datastore_mysql_tab_error_image");
+ }
else
- {
- hide ("GNUNET_setup_datastore_mysql_tab_ok_image");
- show ("GNUNET_setup_datastore_mysql_tab_error_image");
- }
+ {
+ hide ("GNUNET_setup_datastore_mysql_tab_ok_image");
+ show ("GNUNET_setup_datastore_mysql_tab_error_image");
+ }
}
void
-GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb (GtkWidget * widget,
+ gpointer user_data)
{
- if (GNUNET_OK ==
- test_config ("libgnunet_plugin_datastore_postgres"))
- {
- show ("GNUNET_setup_datastore_postgres_tab_ok_image");
- hide ("GNUNET_setup_datastore_postgres_tab_error_image");
- }
+ if (GNUNET_OK == test_config ("libgnunet_plugin_datastore_postgres"))
+ {
+ show ("GNUNET_setup_datastore_postgres_tab_ok_image");
+ hide ("GNUNET_setup_datastore_postgres_tab_error_image");
+ }
else
- {
- hide ("GNUNET_setup_datastore_postgres_tab_ok_image");
- show ("GNUNET_setup_datastore_postgres_tab_error_image");
- }
+ {
+ hide ("GNUNET_setup_datastore_postgres_tab_ok_image");
+ show ("GNUNET_setup_datastore_postgres_tab_error_image");
+ }
}
/* end of gnunet-setup-datastore-config.c */
-
Modified: gnunet-gtk/src/setup/gnunet-setup-datastore-plugins.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datastore-plugins.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-datastore-plugins.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -33,44 +33,39 @@
* @param name name of the plugin to check
*/
static void
-test_plugin (GtkWidget *widget,
- const char *name)
+test_plugin (GtkWidget * widget, const char *name)
{
- if (GNUNET_YES ==
- GNUNET_PLUGIN_test (name))
- {
- gtk_widget_set_sensitive (widget,
- TRUE);
- }
+ if (GNUNET_YES == GNUNET_PLUGIN_test (name))
+ {
+ gtk_widget_set_sensitive (widget, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (widget,
- FALSE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
- FALSE);
- }
+ {
+ gtk_widget_set_sensitive (widget, FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+ }
}
void
-GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datastore_sqlite");
}
void
-GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datastore_mysql");
}
void
-GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_datastore_postgres");
}
@@ -78,4 +73,3 @@
/* end of gnunet-setup-datastore-plugins.c */
-
Modified: gnunet-gtk/src/setup/gnunet-setup-hostlist-editing.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-hostlist-editing.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-hostlist-editing.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -36,36 +36,31 @@
* @param user_data not used
*/
void
-GNUNET_setup_hostlist_url_cellrenderertext_edited_cb (GtkCellRendererText
*renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+GNUNET_setup_hostlist_url_cellrenderertext_edited_cb (GtkCellRendererText *
+ renderer, gchar * path,
+ gchar * new_text,
+ gpointer user_data)
{
GtkListStore *ls;
GtkTreeIter old;
GtkTreeIter iter;
- ls = GTK_LIST_STORE (GNUNET_SETUP_get_object
("GNUNET_setup_hostlist_url_liststore"));
+ ls = GTK_LIST_STORE (GNUNET_SETUP_get_object
+ ("GNUNET_setup_hostlist_url_liststore"));
if (ls == NULL)
- {
- GNUNET_break (0);
- return;
- }
- if (TRUE !=
- gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ls),
- &old,
- path))
- {
- GNUNET_break (0);
- return;
- }
-
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (TRUE !=
+ gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ls), &old, path))
+ {
+ GNUNET_break (0);
+ return;
+ }
+
gtk_list_store_insert_before (ls, &iter, &old);
- gtk_list_store_set (ls,
- &iter,
- 0, new_text,
- 1, FALSE,
- -1);
+ gtk_list_store_set (ls, &iter, 0, new_text, 1, FALSE, -1);
}
/* end of gnunet-setup-hostlist-editing.c */
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2011-08-15 22:36:56 UTC (rev
16584)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2011-08-15 22:37:19 UTC (rev
16585)
@@ -50,12 +50,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_yes_no (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_yes_no (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkToggleButton *button;
@@ -63,7 +60,8 @@
if (button == NULL)
return GNUNET_SYSERR;
gtk_toggle_button_set_active (button,
- (0 == strcasecmp (value, "YES")) ? TRUE :
FALSE);
+ (0 ==
+ strcasecmp (value, "YES")) ? TRUE : FALSE);
return GNUNET_OK;
}
@@ -79,22 +77,18 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_yes_no (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_yes_no (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
- GtkToggleButton *button;
+ GtkToggleButton *button;
gboolean mode;
button = GTK_TOGGLE_BUTTON (widget);
if (button == NULL)
return GNUNET_SYSERR;
mode = gtk_toggle_button_get_active (button);
- GNUNET_CONFIGURATION_set_value_string (cfg,
- section, option,
- mode == TRUE ? "YES" : "NO");
+ GNUNET_CONFIGURATION_set_value_string (cfg, section, option,
+ mode == TRUE ? "YES" : "NO");
return GNUNET_OK;
}
@@ -111,20 +105,16 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_filename (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_filename (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkFileChooser *chooser;
chooser = GTK_FILE_CHOOSER (widget);
if (chooser == NULL)
return GNUNET_SYSERR;
- gtk_file_chooser_set_filename (chooser,
- value);
+ gtk_file_chooser_set_filename (chooser, value);
return GNUNET_OK;
}
@@ -140,11 +130,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_filename (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_filename (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkFileChooser *chooser;
gchar *fn;
@@ -155,9 +142,7 @@
fn = gtk_file_chooser_get_filename (chooser);
if (fn == NULL)
fn = g_strdup ("");
- GNUNET_CONFIGURATION_set_value_string (cfg,
- section, option,
- fn);
+ GNUNET_CONFIGURATION_set_value_string (cfg, section, option, fn);
g_free (fn);
return GNUNET_OK;
}
@@ -175,20 +160,16 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_text (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_text (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkEntry *entry;
entry = GTK_ENTRY (widget);
if (entry == NULL)
return GNUNET_SYSERR;
- gtk_entry_set_text (entry,
- value);
+ gtk_entry_set_text (entry, value);
return GNUNET_OK;
}
@@ -204,11 +185,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_text (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_text (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkEntry *entry;
const gchar *txt;
@@ -217,9 +195,7 @@
if (entry == NULL)
return GNUNET_SYSERR;
txt = gtk_entry_get_text (entry);
- GNUNET_CONFIGURATION_set_value_string (cfg,
- section, option,
- txt);
+ GNUNET_CONFIGURATION_set_value_string (cfg, section, option, txt);
return GNUNET_OK;
}
@@ -237,12 +213,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_combo_text (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_combo_text (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkComboBoxText *cb;
@@ -265,11 +238,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_combo_text (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_combo_text (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkComboBox *cb;
gchar *c;
@@ -297,12 +267,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_number (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_number (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkSpinButton *spin;
unsigned int number;
@@ -312,8 +279,7 @@
return GNUNET_SYSERR;
if (1 != sscanf (value, "%u", &number))
return GNUNET_SYSERR;
- gtk_spin_button_set_value (spin,
- number);
+ gtk_spin_button_set_value (spin, number);
return GNUNET_OK;
}
@@ -329,20 +295,17 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_number (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_number (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkSpinButton *spin;
spin = GTK_SPIN_BUTTON (widget);
if (spin == NULL)
return GNUNET_SYSERR;
- GNUNET_CONFIGURATION_set_value_number (cfg,
- section, option,
- gtk_spin_button_get_value_as_int
(spin));
+ GNUNET_CONFIGURATION_set_value_number (cfg, section, option,
+ gtk_spin_button_get_value_as_int
+ (spin));
return GNUNET_OK;
}
@@ -360,12 +323,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_option_list (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_option_list (const void *cls, const char *section, const char *option,
+ const char *value, GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
const char *word = cls;
char *t;
@@ -380,17 +340,16 @@
t = GNUNET_strdup (value);
w = strtok (t, " ");
while (w != NULL)
+ {
+ if (0 == strcmp (w, word))
{
- if (0 == strcmp (w, word))
- {
- found = GNUNET_YES;
- break;
- }
- w = strtok (NULL, " ");
+ found = GNUNET_YES;
+ break;
}
+ w = strtok (NULL, " ");
+ }
GNUNET_free (t);
- gtk_toggle_button_set_active (button,
- found);
+ gtk_toggle_button_set_active (button, found);
return GNUNET_OK;
}
@@ -406,11 +365,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_option_list (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_option_list (const void *cls, const char *section, const char *option,
+ GObject * widget, struct GNUNET_CONFIGURATION_Handle *cfg)
{
const char *word = cls;
GtkToggleButton *button;
@@ -421,15 +377,9 @@
return GNUNET_SYSERR;
mode = gtk_toggle_button_get_active (button);
if (mode == TRUE)
- GNUNET_CONFIGURATION_append_value_filename (cfg,
- section,
- option,
- word);
+ GNUNET_CONFIGURATION_append_value_filename (cfg, section, option, word);
else
- GNUNET_CONFIGURATION_remove_value_filename (cfg,
- section,
- option,
- word);
+ GNUNET_CONFIGURATION_remove_value_filename (cfg, section, option, word);
return GNUNET_OK;
}
@@ -445,9 +395,8 @@
* @return TRUE to stop other handlers from being invoked
*/
gboolean
-GNUNET_setup_treeview_key_press_event_cb (GtkTreeView *tv,
- GdkEventKey *event,
- gpointer user_data)
+GNUNET_setup_treeview_key_press_event_cb (GtkTreeView * tv, GdkEventKey *
event,
+ gpointer user_data)
{
GtkListStore *ls;
GtkTreeModel *tm;
@@ -455,25 +404,21 @@
GtkTreeIter iter;
gboolean editable;
- if ( (event->type != GDK_KEY_PRESS) ||
- (event->state != 0) ||
- (event->keyval != GDK_Delete) )
+ if ((event->type != GDK_KEY_PRESS) || (event->state != 0) ||
+ (event->keyval != GDK_Delete))
return FALSE;
ls = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
if (ls == NULL)
- {
- GNUNET_break (0);
- return FALSE;
- }
+ {
+ GNUNET_break (0);
+ return FALSE;
+ }
sel = gtk_tree_view_get_selection (tv);
- if (TRUE !=
- gtk_tree_selection_get_selected (sel,
- &tm,
- &iter))
+ if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
return FALSE;
gtk_tree_model_get (tm, &iter, 1, &editable, -1);
if (TRUE == editable)
- return FALSE; /* likely currently editing... */
+ return FALSE; /* likely currently editing... */
gtk_list_store_remove (ls, &iter);
gtk_tree_model_get_iter_first (tm, &iter);
gtk_tree_selection_select_iter (sel, &iter);
@@ -493,12 +438,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_string_list_store (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_string_list_store (const void *cls, const char *section,
+ const char *option, const char *value, GObject *
widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *t;
char *w;
@@ -511,22 +453,12 @@
t = GNUNET_strdup (value);
w = strtok (t, " ");
while (w != NULL)
- {
- gtk_list_store_insert_with_values (ls,
- &iter,
- G_MAXINT,
- 0, w,
- 1, FALSE,
- -1);
- w = strtok (NULL, " ");
- }
+ {
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, w, 1, FALSE,
-1);
+ w = strtok (NULL, " ");
+ }
GNUNET_free (t);
- gtk_list_store_insert_with_values (ls,
- &iter,
- G_MAXINT,
- 0, "",
- 1, TRUE,
- -1);
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, "", 1, TRUE, -1);
return GNUNET_OK;
}
@@ -543,11 +475,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-save_string_list_store (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+save_string_list_store (const void *cls, const char *section,
+ const char *option, GObject * widget,
+ struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkTreeModel *tm;
GtkTreeIter iter;
@@ -560,37 +490,28 @@
return GNUNET_SYSERR;
value = NULL;
if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
{
- do
- {
- gtk_tree_model_get (tm,
- &iter,
- 0, &val,
- -1);
- if (value == NULL)
- {
- value = GNUNET_strdup (val);
- }
- else
- {
- GNUNET_asprintf (&n,
- "%s %s",
- value,
- val);
- GNUNET_free (value);
- value = n;
- }
- g_free (val);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ gtk_tree_model_get (tm, &iter, 0, &val, -1);
+ if (value == NULL)
+ {
+ value = GNUNET_strdup (val);
+ }
+ else
+ {
+ GNUNET_asprintf (&n, "%s %s", value, val);
+ GNUNET_free (value);
+ value = n;
+ }
+ g_free (val);
}
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
if (value == NULL)
value = GNUNET_strdup ("");
- GNUNET_CONFIGURATION_set_value_string (cfg,
- section,
- option,
- value);
- GNUNET_free (value);
+ GNUNET_CONFIGURATION_set_value_string (cfg, section, option, value);
+ GNUNET_free (value);
return GNUNET_OK;
}
@@ -613,88 +534,74 @@
char *redirect;
char *cpy;
gboolean udp;
-
+
if (NULL == section)
- {
- gtk_list_store_insert_with_values (ls,
- &iter,
- G_MAXINT,
- 0, "",
- 1, (guint) 80,
- 2, (guint) 8080,
- 3, "localhost",
- 4, "tcp",
- -1);
- return;
- }
+ {
+ gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, "", 1,
+ (guint) 80, 2, (guint) 8080, 3,
+ "localhost", 4, "tcp", -1);
+ return;
+ }
- if ( (8 > strlen (section)) ||
- (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))) )
+ if ((8 > strlen (section)) ||
+ (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))))
return;
sld = GNUNET_strdup (section);
sld[strlen (section) - 8] = '\0';
udp = FALSE;
do
+ {
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, section,
+ (TRUE ==
+ udp) ? "UDP_REDIRECTS" :
+ "TCP_REDIRECTS", &cpy))
{
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, section,
- (TRUE == udp)
- ? "UDP_REDIRECTS"
- : "TCP_REDIRECTS",
- &cpy))
- {
- for (redirect = strtok (cpy, " "); redirect != NULL;
- redirect = strtok (NULL, " "))
- {
- if (NULL == (hostname = strstr (redirect, ":")))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Option `%s' is not formatted correctly!\n"),
- redirect);
- continue;
- }
- hostname[0] = '\0';
- hostname++;
- if (NULL == (hostport = strstr (hostname, ":")))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Option `%s' is not formatted correctly!\n"),
- redirect);
- continue;
- }
- hostport[0] = '\0';
- hostport++;
-
- int local_port = atoi (redirect);
- if (!((local_port > 0) && (local_port < 65536)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("`%s' is not a valid port number!\n"),
- redirect);
- continue;
- }
- int host_port = atoi (hostport);
- if (!((host_port > 0) && (host_port < 65536)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("`%s' is not a valid port number!\n"),
- hostport);
- continue;
- }
- gtk_list_store_insert_with_values (ls,
- &iter,
- 0,
- 0, sld,
- 1, (guint) local_port,
- 2, (guint) host_port,
- 3, hostname,
- 4, (TRUE == udp) ? "udp" :
"tcp",
- -1);
- }
- GNUNET_free (cpy);
- }
- udp = !udp;
+ for (redirect = strtok (cpy, " "); redirect != NULL;
+ redirect = strtok (NULL, " "))
+ {
+ if (NULL == (hostname = strstr (redirect, ":")))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Option `%s' is not formatted correctly!\n"),
redirect);
+ continue;
+ }
+ hostname[0] = '\0';
+ hostname++;
+ if (NULL == (hostport = strstr (hostname, ":")))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Option `%s' is not formatted correctly!\n"),
redirect);
+ continue;
+ }
+ hostport[0] = '\0';
+ hostport++;
+
+ int local_port = atoi (redirect);
+
+ if (!((local_port > 0) && (local_port < 65536)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("`%s' is not a valid port number!\n"), redirect);
+ continue;
+ }
+ int host_port = atoi (hostport);
+
+ if (!((host_port > 0) && (host_port < 65536)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("`%s' is not a valid port number!\n"), hostport);
+ continue;
+ }
+ gtk_list_store_insert_with_values (ls, &iter, 0, 0, sld, 1,
+ (guint) local_port, 2,
+ (guint) host_port, 3, hostname, 4,
+ (TRUE == udp) ? "udp" : "tcp", -1);
+ }
+ GNUNET_free (cpy);
}
+ udp = !udp;
+ }
while (udp != FALSE);
GNUNET_free (sld);
}
@@ -712,26 +619,22 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there was a problem
*/
static int
-load_vpn_dns_configuration (const void *cls,
- const char *section,
- const char *option,
- const char *value,
- GObject *widget,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load_vpn_dns_configuration (const void *cls, const char *section,
+ const char *option, const char *value,
+ GObject * widget,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GtkTreeView *tv;
GtkListStore *ls;
tv = GTK_TREE_VIEW (widget);
if (tv == NULL)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
ls = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
- GNUNET_CONFIGURATION_iterate_sections (cfg,
- &add_dns_entry_to_list_store,
- ls);
+ GNUNET_CONFIGURATION_iterate_sections (cfg, &add_dns_entry_to_list_store,
ls);
/* finally, add empty entry */
add_dns_entry_to_list_store (ls, NULL);
return GNUNET_OK;
@@ -741,14 +644,14 @@
/**
* Records we use to build DNS information lists.
*/
-struct DnsInfo
+struct DnsInfo
{
struct DnsInfo *next;
char *section;
char *altnames;
char *tcpred;
char *udpred;
- unsigned long long ttl;
+ unsigned long long ttl;
};
@@ -760,14 +663,13 @@
* @param section name of a section in the configuration
*/
static void
-collect_dns_sections (void *cls,
- const char *section)
+collect_dns_sections (void *cls, const char *section)
{
struct DnsInfo **base = cls;
struct DnsInfo *pos;
- if ( (8 > strlen (section)) ||
- (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))) )
+ if ((8 > strlen (section)) ||
+ (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))))
return;
pos = GNUNET_malloc (sizeof (struct DnsInfo));
pos->section = GNUNET_strdup (section);
@@ -775,7 +677,8 @@
GNUNET_CONFIGURATION_get_value_number (cfg, section, "TTL", &pos->ttl))
pos->ttl = 3600000;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, section,
"ALTERNATIVE_NAMES", &pos->altnames))
+ GNUNET_CONFIGURATION_get_value_string (cfg, section, "ALTERNATIVE_NAMES",
+ &pos->altnames))
pos->altnames = NULL;
pos->tcpred = GNUNET_strdup ("");
pos->udpred = GNUNET_strdup ("");
@@ -792,11 +695,10 @@
* @param section name of a section in the configuration
*/
static void
-remove_dns_sections (void *cls,
- const char *section)
+remove_dns_sections (void *cls, const char *section)
{
- if ( (8 > strlen (section)) ||
- (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))) )
+ if ((8 > strlen (section)) ||
+ (0 != strcmp (".gnunet.", section + ((strlen (section) - 8)))))
return;
GNUNET_CONFIGURATION_remove_section (cfg, section);
}
@@ -809,7 +711,7 @@
* @param tm model to use
*/
static void
-update_vpn_dns_configuration (GtkTreeModel *tm)
+update_vpn_dns_configuration (GtkTreeModel * tm)
{
GtkTreeIter iter;
gchar *hostname;
@@ -822,99 +724,76 @@
struct DnsInfo *pos;
head = NULL;
- GNUNET_CONFIGURATION_iterate_sections (cfg,
- &collect_dns_sections,
- &head);
- if (TRUE ==
- gtk_tree_model_get_iter_first (tm, &iter))
+ GNUNET_CONFIGURATION_iterate_sections (cfg, &collect_dns_sections, &head);
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
do
- {
- gtk_tree_model_get (tm, &iter,
- 0, &hostname,
- 1, &srcport,
- 2, &targetport,
- 3, &targethost,
- 4, &tcpudp,
- -1);
- if (0 != strlen (hostname))
- {
- pos = head;
- GNUNET_asprintf (&tmp,
- "%s.gnunet.",
- hostname);
- while ( (NULL != pos) &&
- (0 != strcasecmp (tmp, pos->section)) )
- pos = pos->next;
- if (pos == NULL)
- {
- pos = GNUNET_malloc (sizeof (struct DnsInfo));
- pos->section = tmp;
- pos->ttl = 3600000;
- pos->altnames = NULL;
- pos->tcpred = GNUNET_strdup ("");
- pos->udpred = GNUNET_strdup ("");
- pos->next = head;
- head = pos;
- }
- else
- {
- GNUNET_free (tmp);
- }
-
- GNUNET_asprintf (&tmp,
- "%u:%s:%u %s",
- srcport,
- targethost,
- targetport,
- (0 == strcasecmp ("tcp", tcpudp)) ? pos->tcpred :
pos->udpred);
- if (0 == strcasecmp ("tcp", tcpudp))
- {
- GNUNET_free (pos->tcpred);
- pos->tcpred = tmp;
- }
- else
- {
- GNUNET_free (pos->udpred);
- pos->udpred = tmp;
- }
- }
- g_free (tcpudp);
- g_free (hostname);
- g_free (targethost);
+ {
+ gtk_tree_model_get (tm, &iter, 0, &hostname, 1, &srcport, 2, &targetport,
+ 3, &targethost, 4, &tcpudp, -1);
+ if (0 != strlen (hostname))
+ {
+ pos = head;
+ GNUNET_asprintf (&tmp, "%s.gnunet.", hostname);
+ while ((NULL != pos) && (0 != strcasecmp (tmp, pos->section)))
+ pos = pos->next;
+ if (pos == NULL)
+ {
+ pos = GNUNET_malloc (sizeof (struct DnsInfo));
+ pos->section = tmp;
+ pos->ttl = 3600000;
+ pos->altnames = NULL;
+ pos->tcpred = GNUNET_strdup ("");
+ pos->udpred = GNUNET_strdup ("");
+ pos->next = head;
+ head = pos;
+ }
+ else
+ {
+ GNUNET_free (tmp);
+ }
+
+ GNUNET_asprintf (&tmp, "%u:%s:%u %s", srcport, targethost, targetport,
+ (0 ==
+ strcasecmp ("tcp",
+ tcpudp)) ? pos->tcpred : pos->udpred);
+ if (0 == strcasecmp ("tcp", tcpudp))
+ {
+ GNUNET_free (pos->tcpred);
+ pos->tcpred = tmp;
+ }
+ else
+ {
+ GNUNET_free (pos->udpred);
+ pos->udpred = tmp;
+ }
}
+ g_free (tcpudp);
+ g_free (hostname);
+ g_free (targethost);
+ }
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
- GNUNET_CONFIGURATION_iterate_sections (cfg,
- &remove_dns_sections,
- NULL);
+ GNUNET_CONFIGURATION_iterate_sections (cfg, &remove_dns_sections, NULL);
while (NULL != head)
- {
- pos = head;
- head = pos->next;
- if (pos->altnames != NULL)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- pos->section,
- "ALTERNATIVE_NAMES",
- pos->altnames);
- if (strlen (pos->udpred) > 0)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- pos->section,
- "UDP_REDIRECTS",
- pos->udpred);
- if (strlen (pos->tcpred) > 0)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- pos->section,
- "TCP_REDIRECTS",
- pos->tcpred);
- GNUNET_CONFIGURATION_set_value_number (cfg,
- pos->section,
- "TTL",
- pos->ttl);
- GNUNET_free_non_null (pos->altnames);
- GNUNET_free (pos->tcpred);
- GNUNET_free (pos->udpred);
- GNUNET_free (pos->section);
- GNUNET_free (pos);
- }
+ {
+ pos = head;
+ head = pos->next;
+ if (pos->altnames != NULL)
+ GNUNET_CONFIGURATION_set_value_string (cfg, pos->section,
+ "ALTERNATIVE_NAMES",
+ pos->altnames);
+ if (strlen (pos->udpred) > 0)
+ GNUNET_CONFIGURATION_set_value_string (cfg, pos->section,
"UDP_REDIRECTS",
+ pos->udpred);
+ if (strlen (pos->tcpred) > 0)
+ GNUNET_CONFIGURATION_set_value_string (cfg, pos->section,
"TCP_REDIRECTS",
+ pos->tcpred);
+ GNUNET_CONFIGURATION_set_value_number (cfg, pos->section, "TTL", pos->ttl);
+ GNUNET_free_non_null (pos->altnames);
+ GNUNET_free (pos->tcpred);
+ GNUNET_free (pos->udpred);
+ GNUNET_free (pos->section);
+ GNUNET_free (pos);
+ }
}
@@ -932,10 +811,8 @@
* @param user_data NULL
*/
static void
-save_vpn_dns_service_dnsname (GtkCellRendererText *renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+save_vpn_dns_service_dnsname (GtkCellRendererText * renderer, gchar * path,
+ gchar * new_text, gpointer user_data)
{
GtkTreeModel *tm;
GtkListStore *ls;
@@ -944,44 +821,38 @@
tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object ("vpn_dns_config_liststore"));
if (NULL == tm)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
ls = GTK_LIST_STORE (tm);
if (NULL == ls)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_get_iter_from_string (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
- gtk_tree_model_get (tm, &iter,
- 0, &old,
- -1);
- if ( (0 != strlen (old)) &&
- (0 == strlen (new_text)) )
- {
- /* deletion */
- gtk_list_store_remove (ls, &iter);
- g_free (old);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_tree_model_get (tm, &iter, 0, &old, -1);
+ if ((0 != strlen (old)) && (0 == strlen (new_text)))
+ {
+ /* deletion */
+ gtk_list_store_remove (ls, &iter);
+ g_free (old);
+ return;
+ }
/* update model */
- gtk_list_store_set (ls, &iter,
- 0, new_text,
- -1);
+ gtk_list_store_set (ls, &iter, 0, new_text, -1);
/* update configuration */
update_vpn_dns_configuration (tm);
- if ( (0 == strlen (old)) &&
- (0 != strlen (new_text)) )
- {
- /* need another empty entry at the end for future expansion */
- add_dns_entry_to_list_store (GTK_LIST_STORE (tm), NULL);
- }
+ if ((0 == strlen (old)) && (0 != strlen (new_text)))
+ {
+ /* need another empty entry at the end for future expansion */
+ add_dns_entry_to_list_store (GTK_LIST_STORE (tm), NULL);
+ }
g_free (old);
}
@@ -998,23 +869,23 @@
*/
static int
vpn_dns_service_dnsname_install_edited_handler (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct
GNUNET_CONFIGURATION_Handle *cfg)
+ const char *section,
+ const char *option,
+ GObject * widget,
+ struct
+ GNUNET_CONFIGURATION_Handle
+ *cfg)
{
static int once;
GtkCellRendererText *rt;
- rt = GTK_CELL_RENDERER_TEXT(widget);
+ rt = GTK_CELL_RENDERER_TEXT (widget);
if (NULL == rt)
return GNUNET_SYSERR;
if (0 != once++)
return GNUNET_OK;
- g_signal_connect (rt,
- "edited",
- G_CALLBACK (&save_vpn_dns_service_dnsname),
- NULL);
+ g_signal_connect (rt, "edited", G_CALLBACK (&save_vpn_dns_service_dnsname),
+ NULL);
return GNUNET_OK;
}
@@ -1033,42 +904,38 @@
* @param user_data NULL
*/
static void
-save_vpn_dns_service_tcpudp (GtkCellRendererText *renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+save_vpn_dns_service_tcpudp (GtkCellRendererText * renderer, gchar * path,
+ gchar * new_text, gpointer user_data)
{
GtkTreeModel *tm;
GtkListStore *ls;
GtkTreeIter iter;
- if ( (0 != strcasecmp ("tcp", new_text)) &&
- (0 != strcasecmp ("udp", new_text)) )
- {
- /* FIXME: warn... */
- return;
- }
+ if ((0 != strcasecmp ("tcp", new_text)) &&
+ (0 != strcasecmp ("udp", new_text)))
+ {
+ /* FIXME: warn... */
+ return;
+ }
tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object ("vpn_dns_config_liststore"));
if (NULL == tm)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
ls = GTK_LIST_STORE (tm);
if (NULL == ls)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_get_iter_from_string (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* update model */
- gtk_list_store_set (ls, &iter,
- 4, new_text,
- -1);
+ gtk_list_store_set (ls, &iter, 4, new_text, -1);
/* update configuration */
update_vpn_dns_configuration (tm);
}
@@ -1086,23 +953,22 @@
*/
static int
vpn_dns_service_tcpudp_install_edited_handler (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct
GNUNET_CONFIGURATION_Handle *cfg)
+ const char *section,
+ const char *option,
+ GObject * widget,
+ struct
+ GNUNET_CONFIGURATION_Handle
*cfg)
{
static int once;
GtkCellRendererText *rt;
- rt = GTK_CELL_RENDERER_TEXT(widget);
+ rt = GTK_CELL_RENDERER_TEXT (widget);
if (NULL == rt)
return GNUNET_SYSERR;
if (0 != once++)
return GNUNET_OK;
- g_signal_connect (rt,
- "edited",
- G_CALLBACK (&save_vpn_dns_service_tcpudp),
- NULL);
+ g_signal_connect (rt, "edited", G_CALLBACK (&save_vpn_dns_service_tcpudp),
+ NULL);
return GNUNET_OK;
}
@@ -1121,10 +987,8 @@
* @param user_data NULL
*/
static void
-save_vpn_dns_service_sourceport (GtkCellRendererText *renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+save_vpn_dns_service_sourceport (GtkCellRendererText * renderer, gchar * path,
+ gchar * new_text, gpointer user_data)
{
GtkTreeModel *tm;
GtkListStore *ls;
@@ -1132,32 +996,30 @@
int port;
port = atoi (new_text);
- if ( (port < 1) || (port > UINT16_MAX) )
- {
- /* invalid port, FIXME: warn */
- return;
- }
+ if ((port < 1) || (port > UINT16_MAX))
+ {
+ /* invalid port, FIXME: warn */
+ return;
+ }
tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object ("vpn_dns_config_liststore"));
if (NULL == tm)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
ls = GTK_LIST_STORE (tm);
if (NULL == ls)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_get_iter_from_string (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* update model */
- gtk_list_store_set (ls, &iter,
- 1, (guint) port,
- -1);
+ gtk_list_store_set (ls, &iter, 1, (guint) port, -1);
/* update configuration */
update_vpn_dns_configuration (tm);
}
@@ -1175,23 +1037,23 @@
*/
static int
vpn_dns_service_sourceport_install_edited_handler (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct
GNUNET_CONFIGURATION_Handle *cfg)
+ const char *section,
+ const char *option,
+ GObject * widget,
+ struct
+ GNUNET_CONFIGURATION_Handle
+ *cfg)
{
static int once;
GtkCellRendererText *rt;
- rt = GTK_CELL_RENDERER_TEXT(widget);
+ rt = GTK_CELL_RENDERER_TEXT (widget);
if (NULL == rt)
return GNUNET_SYSERR;
if (0 != once++)
return GNUNET_OK;
- g_signal_connect (rt,
- "edited",
- G_CALLBACK (&save_vpn_dns_service_sourceport),
- NULL);
+ g_signal_connect (rt, "edited", G_CALLBACK
(&save_vpn_dns_service_sourceport),
+ NULL);
return GNUNET_OK;
}
@@ -1210,10 +1072,9 @@
* @param user_data NULL
*/
static void
-save_vpn_dns_service_targethostname (GtkCellRendererText *renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+save_vpn_dns_service_targethostname (GtkCellRendererText * renderer,
+ gchar * path, gchar * new_text,
+ gpointer user_data)
{
GtkTreeModel *tm;
GtkListStore *ls;
@@ -1221,25 +1082,23 @@
tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object ("vpn_dns_config_liststore"));
if (NULL == tm)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
ls = GTK_LIST_STORE (tm);
if (NULL == ls)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_get_iter_from_string (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* update model */
- gtk_list_store_set (ls, &iter,
- 3, new_text,
- -1);
+ gtk_list_store_set (ls, &iter, 3, new_text, -1);
/* update configuration */
update_vpn_dns_configuration (tm);
}
@@ -1257,23 +1116,23 @@
*/
static int
vpn_dns_service_targethostname_install_edited_handler (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct
GNUNET_CONFIGURATION_Handle *cfg)
+ const char *section,
+ const char *option,
+ GObject * widget,
+ struct
+
GNUNET_CONFIGURATION_Handle
+ *cfg)
{
static int once;
GtkCellRendererText *rt;
- rt = GTK_CELL_RENDERER_TEXT(widget);
+ rt = GTK_CELL_RENDERER_TEXT (widget);
if (NULL == rt)
return GNUNET_SYSERR;
if (0 != once++)
return GNUNET_OK;
- g_signal_connect (rt,
- "edited",
- G_CALLBACK (&save_vpn_dns_service_targethostname),
- NULL);
+ g_signal_connect (rt, "edited",
+ G_CALLBACK (&save_vpn_dns_service_targethostname), NULL);
return GNUNET_OK;
}
@@ -1292,10 +1151,8 @@
* @param user_data NULL
*/
static void
-save_vpn_dns_service_targetport (GtkCellRendererText *renderer,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
+save_vpn_dns_service_targetport (GtkCellRendererText * renderer, gchar * path,
+ gchar * new_text, gpointer user_data)
{
GtkTreeModel *tm;
GtkListStore *ls;
@@ -1303,32 +1160,30 @@
int port;
port = atoi (new_text);
- if ( (port < 1) || (port > UINT16_MAX) )
- {
- /* invalid port, FIXME: warn */
- return;
- }
+ if ((port < 1) || (port > UINT16_MAX))
+ {
+ /* invalid port, FIXME: warn */
+ return;
+ }
tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object ("vpn_dns_config_liststore"));
if (NULL == tm)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
ls = GTK_LIST_STORE (tm);
if (NULL == ls)
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
if (TRUE != gtk_tree_model_get_iter_from_string (tm, &iter, path))
- {
- GNUNET_break (0);
- return;
- }
+ {
+ GNUNET_break (0);
+ return;
+ }
/* update model */
- gtk_list_store_set (ls, &iter,
- 2, (guint) port,
- -1);
+ gtk_list_store_set (ls, &iter, 2, (guint) port, -1);
/* update configuration */
update_vpn_dns_configuration (tm);
}
@@ -1346,23 +1201,23 @@
*/
static int
vpn_dns_service_targetport_install_edited_handler (const void *cls,
- const char *section,
- const char *option,
- GObject *widget,
- struct
GNUNET_CONFIGURATION_Handle *cfg)
+ const char *section,
+ const char *option,
+ GObject * widget,
+ struct
+ GNUNET_CONFIGURATION_Handle
+ *cfg)
{
static int once;
GtkCellRendererText *rt;
- rt = GTK_CELL_RENDERER_TEXT(widget);
+ rt = GTK_CELL_RENDERER_TEXT (widget);
if (NULL == rt)
return GNUNET_SYSERR;
if (0 != once++)
return GNUNET_OK;
- g_signal_connect (rt,
- "edited",
- G_CALLBACK (&save_vpn_dns_service_targetport),
- NULL);
+ g_signal_connect (rt, "edited", G_CALLBACK
(&save_vpn_dns_service_targetport),
+ NULL);
return GNUNET_OK;
}
@@ -1370,47 +1225,47 @@
/**
* Hide "min connected friends" option if in F2F-only mode.
*/
-static struct GNUNET_SETUP_VisibilitySpecification
hide_min_connected_friends[] =
-{
- { "GNUNET_setup_minimum_friends_label", NULL, REX_YES },
- { "GNUNET_setup_minimum_friends_spinbutton", NULL, REX_YES },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_min_connected_friends[]
+ = {
+ {"GNUNET_setup_minimum_friends_label", NULL, REX_YES},
+ {"GNUNET_setup_minimum_friends_spinbutton", NULL, REX_YES},
+ {NULL, NULL, NULL}
};
/**
* Hide "hostlist" options if hostlist is not in use.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_hostlist_options[] =
-{
- { "GNUNET_setup_hostlist_client_enable_checkbutton", "(^| )hostlist($| )",
NULL },
- { "GNUNET_setup_hostlist_client_learn_checkbutton", "(^| )hostlist($| )",
NULL },
- { "GNUNET_setup_hostlist_options_hbox", "(^| )hostlist($| )", NULL },
- { "GNUNET_setup_hostlist_frame", "(^| )hostlist($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_hostlist_options[] = {
+ {"GNUNET_setup_hostlist_client_enable_checkbutton", "(^| )hostlist($| )",
+ NULL},
+ {"GNUNET_setup_hostlist_client_learn_checkbutton", "(^| )hostlist($| )",
+ NULL},
+ {"GNUNET_setup_hostlist_options_hbox", "(^| )hostlist($| )", NULL},
+ {"GNUNET_setup_hostlist_frame", "(^| )hostlist($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "exit" options if VPN exit is not in use.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_exit_options[] =
-{
- { "GNUNET_setup_vpn_exit_frame", "(^| )exit($| )", NULL },
- { "GNUNET_setup_vpn_service_configuration_frame", "(^| )exit($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_exit_options[] = {
+ {"GNUNET_setup_vpn_exit_frame", "(^| )exit($| )", NULL},
+ {"GNUNET_setup_vpn_service_configuration_frame", "(^| )exit($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "hostlist" server options if hostlist server is not in use.
*/
-static struct GNUNET_SETUP_VisibilitySpecification
hide_hostlist_server_options[] =
-{
- { "GNUNET_setup_hostlist_advertise_checkbutton", "(^| )-p($| )", NULL },
- { "GNUNET_setup_hostlist_port_label", "(^| )-p($| )", NULL },
- { "GNUNET_setup_hostlist_server_port_spin_button", "(^| )-p($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification
+ hide_hostlist_server_options[] = {
+ {"GNUNET_setup_hostlist_advertise_checkbutton", "(^| )-p($| )", NULL},
+ {"GNUNET_setup_hostlist_port_label", "(^| )-p($| )", NULL},
+ {"GNUNET_setup_hostlist_server_port_spin_button", "(^| )-p($| )", NULL},
+ {NULL, NULL, NULL}
};
@@ -1418,10 +1273,9 @@
/**
* Hide "fs tab" if FS not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] =
-{
- { "GNUNET_setup_fs_main_vbox", "(^| )fs($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] = {
+ {"GNUNET_setup_fs_main_vbox", "(^| )fs($| )", NULL},
+ {NULL, NULL, NULL}
};
@@ -1429,10 +1283,9 @@
/**
* Hide "vpn tab" if VPN not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] =
-{
- { "GNUNET_setup_vpn_vbox", "(^| )vpn($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = {
+ {"GNUNET_setup_vpn_vbox", "(^| )vpn($| )", NULL},
+ {NULL, NULL, NULL}
};
@@ -1440,1136 +1293,1055 @@
/**
* Hide "tcp tab" if TCP not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_tcp_tab[] =
-{
- { "GNUNET_setup_transport_tcp_vbox", "(^| )tcp($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_tcp_tab[] = {
+ {"GNUNET_setup_transport_tcp_vbox", "(^| )tcp($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "udp tab" if UDP not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_udp_tab[] =
-{
- { "GNUNET_setup_transport_udp_vbox", "(^| )udp($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_udp_tab[] = {
+ {"GNUNET_setup_transport_udp_vbox", "(^| )udp($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "http tab" if HTTP not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_http_tab[] =
-{
- { "GNUNET_setup_transport_http_vbox", "(^| )http($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_http_tab[] = {
+ {"GNUNET_setup_transport_http_vbox", "(^| )http($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "https tab" if HTTPS not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_https_tab[] =
-{
- { "GNUNET_setup_transport_https_vbox", "(^| )https($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_https_tab[] = {
+ {"GNUNET_setup_transport_https_vbox", "(^| )https($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "dv tab" if DV not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_dv_tab[] =
-{
- { "GNUNET_setup_transport_dv_vbox", "(^| )dv($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_dv_tab[] = {
+ {"GNUNET_setup_transport_dv_vbox", "(^| )dv($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "wlan tab" if WLAN not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_wlan_tab[] =
-{
- { "GNUNET_setup_transport_wlan_vbox", "(^| )wlan($| )", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_wlan_tab[] = {
+ {"GNUNET_setup_transport_wlan_vbox", "(^| )wlan($| )", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "sqlite datastore" tab if sqlite not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datastore_tab[]
=
-{
- { "GNUNET_setup_fs_datastore_sqlite_label", "^sqlite$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datastore_tab[]
= {
+ {"GNUNET_setup_fs_datastore_sqlite_label", "^sqlite$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "mysql datastore" tab if mysql not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datastore_tab[] =
-{
- { "GNUNET_setup_datastore_mysql_vbox", "^mysql$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datastore_tab[]
= {
+ {"GNUNET_setup_datastore_mysql_vbox", "^mysql$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "postgres datastore" tab if postgres not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datastore_tab[] =
-{
- { "GNUNET_setup_datastore_postgres_hbox", "^postgres$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datastore_tab[]
+ = {
+ {"GNUNET_setup_datastore_postgres_hbox", "^postgres$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "sqlite datacache" tab if sqlite not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datacache_tab[]
=
-{
- { "GNUNET_setup_fs_datacache_sqlite_label", "^sqlite$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datacache_tab[]
= {
+ {"GNUNET_setup_fs_datacache_sqlite_label", "^sqlite$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "mysql datacache" tab if mysql not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[] =
-{
- { "GNUNET_setup_datacache_mysql_vbox", "^mysql$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[]
= {
+ {"GNUNET_setup_datacache_mysql_vbox", "^mysql$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide "postgres datacache" tab if postgres not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datacache_tab[] =
-{
- { "GNUNET_setup_datacache_postgres_hbox", "^postgres$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datacache_tab[]
+ = {
+ {"GNUNET_setup_datacache_postgres_hbox", "^postgres$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide advertised TCP port if port is zero.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_all_tcp_options[] =
-{
- { "GNUNET_setup_transport_tcp_adv_port_hbox", NULL, "^0$" },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification hide_all_tcp_options[] = {
+ {"GNUNET_setup_transport_tcp_adv_port_hbox", NULL, "^0$"},
+ {NULL, NULL, NULL}
};
/**
* Hide NATed peer options.
*/
-static struct GNUNET_SETUP_VisibilitySpecification toggle_nat_options[] =
-{
- { "GNUNET_setup_transport_hole_punched_checkbutton", "^YES$", NULL },
- { "GNUNET_setup_transport_upnp_enable_checkbutton", "^YES$", NULL },
- { "GNUNET_setup_transport_icmp_server_enable_checkbutton", "^YES$", NULL },
- { "GNUNET_setup_transport_external_ip_hbox", "^YES$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification toggle_nat_options[] = {
+ {"GNUNET_setup_transport_hole_punched_checkbutton", "^YES$", NULL},
+ {"GNUNET_setup_transport_upnp_enable_checkbutton", "^YES$", NULL},
+ {"GNUNET_setup_transport_icmp_server_enable_checkbutton", "^YES$", NULL},
+ {"GNUNET_setup_transport_external_ip_hbox", "^YES$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide hole-punched NATed peer options.
*/
-static struct GNUNET_SETUP_VisibilitySpecification
toggle_nat_punched_options[] =
-{
- { "GNUNET_setup_transport_upnp_enable_checkbutton", "^NO$", NULL },
- { "GNUNET_setup_transport_icmp_server_enable_checkbutton", "^NO$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification toggle_nat_punched_options[]
+ = {
+ {"GNUNET_setup_transport_upnp_enable_checkbutton", "^NO$", NULL},
+ {"GNUNET_setup_transport_icmp_server_enable_checkbutton", "^NO$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Hide internal IP options.
*/
-static struct GNUNET_SETUP_VisibilitySpecification toggle_internal_ip[] =
-{
- { "GNUNET_setup_transport_internal_ip_hbox", "^YES$", NULL },
- { NULL, NULL, NULL }
+static struct GNUNET_SETUP_VisibilitySpecification toggle_internal_ip[] = {
+ {"GNUNET_setup_transport_internal_ip_hbox", "^YES$", NULL},
+ {NULL, NULL, NULL}
};
/**
* Option specification data.
*/
-const struct GNUNET_SETUP_OptionSpecification option_specifications[] =
+const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
+
+ /* GENERAL TAB */
+
{
+ "GNUNET_setup_friends_only_checkbutton",
+ "toggled",
+ "topology",
+ "FRIENDS-ONLY",
+ gettext_noop ("Should GNUnet exclusively connect to friends?"),
+ "https://gnunet.org/configuration-f2f";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ hide_min_connected_friends},
- /* GENERAL TAB */
+ {
+ "GNUNET_setup_friends_filechooserbutton",
+ "selection-changed",
+ "topology",
+ "FRIENDS",
+ gettext_noop ("Friends file containing the list of friendly peers"),
+ "https://gnunet.org/configuration-f2f";,
+ &load_filename,
+ &save_filename, NULL,
+ NULL},
- {
- "GNUNET_setup_friends_only_checkbutton",
- "toggled",
- "topology",
- "FRIENDS-ONLY",
- gettext_noop ("Should GNUnet exclusively connect to friends?"),
- "https://gnunet.org/configuration-f2f";,
- &load_yes_no,
- &save_yes_no, NULL,
- hide_min_connected_friends
- },
+ {
+ "GNUNET_setup_minimum_friends_spinbutton",
+ "value-changed",
+ "topology",
+ "MINIMUM-FRIENDS",
+ gettext_noop ("Minimum number of friendly connections"),
+ "https://gnunet.org/configuration-f2f";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_friends_filechooserbutton",
- "selection-changed",
- "topology",
- "FRIENDS",
- gettext_noop ("Friends file containing the list of friendly peers"),
- "https://gnunet.org/configuration-f2f";,
- &load_filename,
- &save_filename, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_general_services_topology_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Topology should always be loaded"),
+ "https://gnunet.org/configuration-topology";,
+ &load_option_list,
+ &save_option_list, "topology",
+ NULL},
- {
- "GNUNET_setup_minimum_friends_spinbutton",
- "value-changed",
- "topology",
- "MINIMUM-FRIENDS",
- gettext_noop ("Minimum number of friendly connections"),
- "https://gnunet.org/configuration-f2f";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_general_services_hostlist_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop
+ ("Should hostlist support be started automatically on startup?"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "hostlist",
+ hide_hostlist_options},
- {
- "GNUNET_setup_general_services_topology_checkbutton",
- "toggled",
- "arm",
- "DEFAULTSERVICES",
- gettext_noop ("Topology should always be loaded"),
- "https://gnunet.org/configuration-topology";,
- &load_option_list,
- &save_option_list, "topology",
- NULL
- },
- {
- "GNUNET_setup_general_services_hostlist_checkbutton",
- "toggled",
- "arm",
- "DEFAULTSERVICES",
- gettext_noop ("Should hostlist support be started automatically on
startup?"),
- "https://gnunet.org/configuration-hostlist";,
- &load_option_list,
- &save_option_list, "hostlist",
- hide_hostlist_options
- },
+ {
+ "GNUNET_setup_general_services_fs_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Should file-sharing be started automatically on startup?"),
+ "https://gnunet.org/configuration-fs";,
+ &load_option_list,
+ &save_option_list, "fs",
+ hide_fs_tab},
+ {
+ "GNUNET_setup_general_services_vpn_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Should the VPN be started automatically on startup?"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_option_list,
+ &save_option_list, "vpn",
+ hide_vpn_tab},
- {
- "GNUNET_setup_general_services_fs_checkbutton",
- "toggled",
- "arm",
- "DEFAULTSERVICES",
- gettext_noop ("Should file-sharing be started automatically on
startup?"),
- "https://gnunet.org/configuration-fs";,
- &load_option_list,
- &save_option_list, "fs",
- hide_fs_tab
- },
+ {
+ "GNUNET_setup_hostlist_client_enable_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should GNUnet learn about other peers using hostlists"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "-b",
+ NULL},
- {
- "GNUNET_setup_general_services_vpn_checkbutton",
- "toggled",
- "arm",
- "DEFAULTSERVICES",
- gettext_noop ("Should the VPN be started automatically on startup?"),
- "https://gnunet.org/configuration-vpn";,
- &load_option_list,
- &save_option_list, "vpn",
- hide_vpn_tab
- },
+ {
+ "GNUNET_setup_hostlist_client_learn_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should GNUnet learn hostlists from other peers"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "-e",
+ NULL},
- {
- "GNUNET_setup_hostlist_client_enable_checkbutton",
- "toggled",
- "hostlist",
- "OPTIONS",
- gettext_noop ("Should GNUnet learn about other peers using hostlists"),
- "https://gnunet.org/configuration-hostlist";,
- &load_option_list,
- &save_option_list, "-b",
- NULL
- },
+ {
+ "GNUNET_setup_hostlist_offer_hostlist_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should this peer offer a hostlist to other peers"),
+ "https://gnunet.org/configuration-hostlist-server";,
+ &load_option_list,
+ &save_option_list, "-p",
+ hide_hostlist_server_options},
- {
- "GNUNET_setup_hostlist_client_learn_checkbutton",
- "toggled",
- "hostlist",
- "OPTIONS",
- gettext_noop ("Should GNUnet learn hostlists from other peers"),
- "https://gnunet.org/configuration-hostlist";,
- &load_option_list,
- &save_option_list, "-e",
- NULL
- },
+ {
+ "GNUNET_setup_hostlist_advertise_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should this peer advertise its hostlist to other peers"),
+ "https://gnunet.org/configuration-hostlist-server";,
+ &load_option_list,
+ &save_option_list, "-a",
+ NULL},
- {
- "GNUNET_setup_hostlist_offer_hostlist_checkbutton",
- "toggled",
- "hostlist",
- "OPTIONS",
- gettext_noop ("Should this peer offer a hostlist to other peers"),
- "https://gnunet.org/configuration-hostlist-server";,
- &load_option_list,
- &save_option_list, "-p",
- hide_hostlist_server_options
- },
+ {
+ "GNUNET_setup_hostlist_server_port_spin_button",
+ "value-changed",
+ "hostlist",
+ "HTTPPORT",
+ gettext_noop ("Port this peers hostlist should be offered on"),
+ "https://gnunet.org/configuration-hostlist-server";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_hostlist_advertise_checkbutton",
- "toggled",
- "hostlist",
- "OPTIONS",
- gettext_noop ("Should this peer advertise its hostlist to other peers"),
- "https://gnunet.org/configuration-hostlist-server";,
- &load_option_list,
- &save_option_list, "-a",
- NULL
- },
+ {
+ "GNUNET_setup_hostlist_url_liststore",
+ "row-changed",
+ "hostlist",
+ "SERVERS",
+ NULL, NULL,
+ &load_string_list_store,
+ &save_string_list_store, NULL,
+ NULL},
- {
- "GNUNET_setup_hostlist_server_port_spin_button",
- "value-changed",
- "hostlist",
- "HTTPPORT",
- gettext_noop ("Port this peers hostlist should be offered on"),
- "https://gnunet.org/configuration-hostlist-server";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_hostlist_url_treeview",
+ NULL, NULL, NULL, /* FIXME */
+ gettext_noop ("Known hostlist URLs"),
+ "https://gnunet.org/configuration-hostlist";,
+ NULL, NULL, NULL, /* FIXME */
+ NULL},
- {
- "GNUNET_setup_hostlist_url_liststore",
- "row-changed",
- "hostlist",
- "SERVERS",
- NULL, NULL,
- &load_string_list_store,
- &save_string_list_store, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_bandwidth_out_spinbutton",
+ "value-changed",
+ "core",
+ "TOTAL_QUOTA_OUT",
+ gettext_noop ("How many bytes per second are we allowed to transmit?"),
+ "https://gnunet.org/configuration-bandwidth";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_hostlist_url_treeview",
- NULL, NULL, NULL, /* FIXME */
- gettext_noop ("Known hostlist URLs"),
- "https://gnunet.org/configuration-hostlist";,
- NULL, NULL, NULL, /* FIXME */
- NULL
- },
+ {
+ "GNUNET_setup_bandwidth_in_spinbutton",
+ "value-changed",
+ "core",
+ "TOTAL_QUOTA_IN",
+ gettext_noop ("How many bytes per second are we allowed to receive?"),
+ "https://gnunet.org/configuration-bandwidth";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_bandwidth_out_spinbutton",
- "value-changed",
- "core",
- "TOTAL_QUOTA_OUT",
- gettext_noop ("How many bytes per second are we allowed to transmit?"),
- "https://gnunet.org/configuration-bandwidth";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ /* Transport TAB */
- {
- "GNUNET_setup_bandwidth_in_spinbutton",
- "value-changed",
- "core",
- "TOTAL_QUOTA_IN",
- gettext_noop ("How many bytes per second are we allowed to receive?"),
- "https://gnunet.org/configuration-bandwidth";,
- &load_number,
- &save_number, NULL,
- NULL
- },
-
- /* Transport TAB */
+ {
+ "GNUNET_setup_transport_tcp_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via TCP"),
+ "https://gnunet.org/configuration-tcp";,
+ &load_option_list,
+ &save_option_list, "tcp",
+ hide_tcp_tab},
- {
- "GNUNET_setup_transport_tcp_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via TCP"),
- "https://gnunet.org/configuration-tcp";,
- &load_option_list,
- &save_option_list, "tcp",
- hide_tcp_tab
- },
+ {
+ "GNUNET_setup_transport_udp_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via UDP"),
+ "https://gnunet.org/configuration-udp";,
+ &load_option_list,
+ &save_option_list, "udp",
+ hide_udp_tab},
- {
- "GNUNET_setup_transport_udp_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via UDP"),
- "https://gnunet.org/configuration-udp";,
- &load_option_list,
- &save_option_list, "udp",
- hide_udp_tab
- },
+ {
+ "GNUNET_setup_transport_http_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTP"),
+ "https://gnunet.org/configuration-http";,
+ &load_option_list,
+ &save_option_list, "http",
+ hide_http_tab},
- {
- "GNUNET_setup_transport_http_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via HTTP"),
- "https://gnunet.org/configuration-http";,
- &load_option_list,
- &save_option_list, "http",
- hide_http_tab
- },
+ {
+ "GNUNET_setup_transport_https_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTPS"),
+ "https://gnunet.org/configuration-https";,
+ &load_option_list,
+ &save_option_list, "https",
+ hide_https_tab},
- {
- "GNUNET_setup_transport_https_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via HTTPS"),
- "https://gnunet.org/configuration-https";,
- &load_option_list,
- &save_option_list, "https",
- hide_https_tab
- },
+ {
+ "GNUNET_setup_transport_dv_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via DV"),
+ "https://gnunet.org/configuration-dv";,
+ &load_option_list,
+ &save_option_list, "dv",
+ hide_dv_tab},
- {
- "GNUNET_setup_transport_dv_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via DV"),
- "https://gnunet.org/configuration-dv";,
- &load_option_list,
- &save_option_list, "dv",
- hide_dv_tab
- },
+ {
+ "GNUNET_setup_transport_wlan_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via WLAN"),
+ "https://gnunet.org/configuration-wlan";,
+ &load_option_list,
+ &save_option_list, "wlan",
+ hide_wlan_tab},
- {
- "GNUNET_setup_transport_wlan_checkbutton",
- "toggled",
- "transport",
- "PLUGINS",
- gettext_noop ("Enable communication via WLAN"),
- "https://gnunet.org/configuration-wlan";,
- &load_option_list,
- &save_option_list, "wlan",
- hide_wlan_tab
- },
+ {
+ "GNUNET_setup_transport_tcp_port_spinbutton",
+ "value-changed",
+ "transport-tcp",
+ "PORT",
+ gettext_noop ("Port we bind to for TCP"),
+ "https://gnunet.org/configuration-tcp";,
+ &load_number,
+ &save_number, NULL,
+ hide_all_tcp_options},
- {
- "GNUNET_setup_transport_tcp_port_spinbutton",
- "value-changed",
- "transport-tcp",
- "PORT",
- gettext_noop ("Port we bind to for TCP"),
- "https://gnunet.org/configuration-tcp";,
- &load_number,
- &save_number, NULL,
- hide_all_tcp_options
- },
+ {
+ "GNUNET_setup_transport_tcp_adv_port_spinbutton",
+ "value-changed",
+ "transport-tcp",
+ "ADVERTISED_PORT",
+ gettext_noop ("Port visible to other peers"),
+ "https://gnunet.org/configuration-tcp";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_tcp_adv_port_spinbutton",
- "value-changed",
- "transport-tcp",
- "ADVERTISED_PORT",
- gettext_noop ("Port visible to other peers"),
- "https://gnunet.org/configuration-tcp";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_nat_checkbutton",
+ "toggled",
+ "nat",
+ "BEHIND_NAT",
+ gettext_noop ("Check if this peer is behind a NAT"),
+ "https://gnunet.org/configuration-nat";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ toggle_nat_options},
- {
- "GNUNET_setup_transport_nat_checkbutton",
- "toggled",
- "nat",
- "BEHIND_NAT",
- gettext_noop ("Check if this peer is behind a NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- toggle_nat_options
- },
+ {
+ "GNUNET_setup_transport_hole_punched_checkbutton",
+ "toggled",
+ "nat",
+ "PUNCHED_NAT",
+ gettext_noop ("Check if the NAT has been hole-punched manually"),
+ "https://gnunet.org/configuration-nat";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ toggle_nat_punched_options},
- {
- "GNUNET_setup_transport_hole_punched_checkbutton",
- "toggled",
- "nat",
- "PUNCHED_NAT",
- gettext_noop ("Check if the NAT has been hole-punched manually"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- toggle_nat_punched_options
- },
+ {
+ "GNUNET_setup_transport_upnp_enable_checkbutton",
+ "toggled",
+ "nat",
+ "ENABLE_UPNP",
+ gettext_noop ("Enable NAT traversal with UPnP/PMP"),
+ "https://gnunet.org/configuration-nat";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL,
+ },
- {
- "GNUNET_setup_transport_upnp_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_UPNP",
- gettext_noop ("Enable NAT traversal with UPnP/PMP"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL,
- },
+ {
+ "GNUNET_setup_transport_icmp_server_enable_checkbutton",
+ "toggled",
+ "nat",
+ "ENABLE_ICMP_SERVER",
+ gettext_noop ("Enable NAT traversal with ICMP as server"),
+ "https://gnunet.org/configuration-nat";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL,
+ },
- {
- "GNUNET_setup_transport_icmp_server_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_ICMP_SERVER",
- gettext_noop ("Enable NAT traversal with ICMP as server"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL,
- },
+ {
+ "GNUNET_setup_transport_external_ip_address_entry",
+ "changed",
+ "nat",
+ "EXTERNAL_ADDRESS",
+ gettext_noop ("External (public) IP address of the NAT"),
+ "https://gnunet.org/configuration-nat";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_external_ip_address_entry",
- "changed",
- "nat",
- "EXTERNAL_ADDRESS",
- gettext_noop ("External (public) IP address of the NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_icmp_client_enable_checkbutton",
+ "toggled",
+ "nat",
+ "ENABLE_ICMP_CLIENT",
+ gettext_noop ("Enable NAT traversal with ICMP as client"),
+ "https://gnunet.org/configuration-nat";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ toggle_internal_ip},
- {
- "GNUNET_setup_transport_icmp_client_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_ICMP_CLIENT",
- gettext_noop ("Enable NAT traversal with ICMP as client"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- toggle_internal_ip
- },
+ {
+ "GNUNET_setup_transport_internal_ip_entry",
+ "changed",
+ "nat",
+ "INTERNAL_ADDRESS",
+ gettext_noop ("Internal (private) IP address of the NAT"),
+ "https://gnunet.org/configuration-nat";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_internal_ip_entry",
- "changed",
- "nat",
- "INTERNAL_ADDRESS",
- gettext_noop ("Internal (private) IP address of the NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_disable_ipv6_checkbutton",
+ "toggled",
+ "nat",
+ "DISABLEV6",
+ gettext_noop ("Disable IPv6 support"),
+ "https://gnunet.org/configuration-ipv6";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL,
+ },
- {
- "GNUNET_setup_transport_disable_ipv6_checkbutton",
- "toggled",
- "nat",
- "DISABLEV6",
- gettext_noop ("Disable IPv6 support"),
- "https://gnunet.org/configuration-ipv6";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL,
- },
+ {
+ "GNUNET_setup_transport_udp_port_spinbutton",
+ "value-changed",
+ "transport-udp",
+ "PORT",
+ gettext_noop ("Port for inbound UDP packets, use 0 if behind NAT"),
+ "https://gnunet.org/configuration-udp";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_udp_port_spinbutton",
- "value-changed",
- "transport-udp",
- "PORT",
- gettext_noop ("Port for inbound UDP packets, use 0 if behind NAT"),
- "https://gnunet.org/configuration-udp";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_http_port_spinbutton",
+ "value-changed",
+ "transport-http",
+ "PORT",
+ gettext_noop ("Port for inbound HTTP connections, use 0 if behind NAT"),
+ "https://gnunet.org/configuration-http";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_http_port_spinbutton",
- "value-changed",
- "transport-http",
- "PORT",
- gettext_noop ("Port for inbound HTTP connections, use 0 if behind NAT"),
- "https://gnunet.org/configuration-http";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_https_port_spinbutton",
+ "value-changed",
+ "transport-https",
+ "PORT",
+ gettext_noop ("Port for inbound HTTPS connections, use 0 if behind NAT"),
+ "https://gnunet.org/configuration-https";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_https_port_spinbutton",
- "value-changed",
- "transport-https",
- "PORT",
- gettext_noop ("Port for inbound HTTPS connections, use 0 if behind NAT"),
- "https://gnunet.org/configuration-https";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ /* FS TAB */
- /* FS TAB */
-
- {
- "GNUNET_setup_fs_datastore_sqlite_radiobutton",
- "toggled",
- "datastore",
- "DATABASE",
- gettext_noop ("Use sqLite to store file-sharing content"),
- "https://gnunet.org/configuration-datastore";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "sqlite",
- hide_sqlite_datastore_tab
- },
+ {
+ "GNUNET_setup_fs_datastore_sqlite_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use sqLite to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "sqlite",
+ hide_sqlite_datastore_tab},
- {
- "GNUNET_setup_fs_datastore_mysql_radiobutton",
- "toggled",
- "datastore",
- "DATABASE",
- gettext_noop ("Use MySQL to store file-sharing content"),
- "https://gnunet.org/configuration-datastore";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "mysql",
- hide_mysql_datastore_tab
- },
+ {
+ "GNUNET_setup_fs_datastore_mysql_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use MySQL to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "mysql",
+ hide_mysql_datastore_tab},
- {
- "GNUNET_setup_fs_datastore_postgres_radiobutton",
- "toggled",
- "datastore",
- "DATABASE",
- gettext_noop ("Use Postgres to store file-sharing content"),
- "https://gnunet.org/configuration-datastore";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "postgres",
- hide_postgres_datastore_tab
- },
+ {
+ "GNUNET_setup_fs_datastore_postgres_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use Postgres to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "postgres",
+ hide_postgres_datastore_tab},
- {
- "GNUNET_setup_datastore_mysql_database_name_entry",
- "changed",
- "datastore-mysql",
- "DATABASE",
- gettext_noop ("Name for the MySQL database"),
- "https://gnunet.org/configuration-datastore";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_database_name_entry",
+ "changed",
+ "datastore-mysql",
+ "DATABASE",
+ gettext_noop ("Name for the MySQL database"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_mysql_config_file_filechooserbutton",
- "selection-changed",
- "datastore-mysql",
- "CONFIG",
- gettext_noop ("Configuration file for MySQL access"),
- "http://dev.mysql.com/doc/refman/5.5/en/option-files.html";,
- &load_filename,
- &save_filename, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_config_file_filechooserbutton",
+ "selection-changed",
+ "datastore-mysql",
+ "CONFIG",
+ gettext_noop ("Configuration file for MySQL access"),
+ "http://dev.mysql.com/doc/refman/5.5/en/option-files.html";,
+ &load_filename,
+ &save_filename, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_mysql_username_entry",
- "changed",
- "datastore-mysql",
- "USER",
- gettext_noop ("Username for MySQL access"),
- "https://gnunet.org/configuration-datastore";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_username_entry",
+ "changed",
+ "datastore-mysql",
+ "USER",
+ gettext_noop ("Username for MySQL access"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_mysql_password_entry",
- "changed",
- "datastore-mysql",
- "PASSWORD",
- gettext_noop ("Password for MySQL access"),
- "https://gnunet.org/configuration-datastore";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_password_entry",
+ "changed",
+ "datastore-mysql",
+ "PASSWORD",
+ gettext_noop ("Password for MySQL access"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_mysql_hostname_entry",
- "changed",
- "datastore-mysql",
- "HOST",
- gettext_noop ("Name of host running MySQL database"),
- "https://gnunet.org/configuration-datastore";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_hostname_entry",
+ "changed",
+ "datastore-mysql",
+ "HOST",
+ gettext_noop ("Name of host running MySQL database"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_mysql_port_spinbutton",
- "value-changed",
- "datastore-mysql",
- "PORT",
- gettext_noop ("Port of MySQL database"),
- "https://gnunet.org/configuration-datastore";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_mysql_port_spinbutton",
+ "value-changed",
+ "datastore-mysql",
+ "PORT",
+ gettext_noop ("Port of MySQL database"),
+ "https://gnunet.org/configuration-datastore";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_datastore_postgres_config_entry",
- "changed",
- "datastore-postgres",
- "CONFIG",
- gettext_noop ("Configuration for Postgres (passed to PQconnectdb)"),
- "http://www.postgresql.org/docs/8.1/static/libpq.html#LIBPQ-CONNECT";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datastore_postgres_config_entry",
+ "changed",
+ "datastore-postgres",
+ "CONFIG",
+ gettext_noop ("Configuration for Postgres (passed to PQconnectdb)"),
+ "http://www.postgresql.org/docs/8.1/static/libpq.html#LIBPQ-CONNECT";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
-
- {
- "GNUNET_setup_fs_migration_from_checkbutton",
- "toggled",
- "fs",
- "CONTENT_PUSHING",
- gettext_noop ("Should we try to push our content to other peers?"),
- "https://gnunet.org/configuration-fs";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL
- },
- {
- "GNUNET_setup_fs_migration_to_checkbutton",
- "toggled",
- "fs",
- "CONTENT_CACHING",
- gettext_noop ("Are we allowed to cache content received from other
peers?"),
- "https://gnunet.org/configuration-fs";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_fs_datacache_sqlite_radiobutton",
- "toggled",
- "dhtcache",
- "DATABASE",
- gettext_noop ("Use sqLite to cache DHT data"),
- "https://gnunet.org/configuration-datacache";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "sqlite",
- hide_sqlite_datacache_tab
- },
+ {
+ "GNUNET_setup_fs_migration_from_checkbutton",
+ "toggled",
+ "fs",
+ "CONTENT_PUSHING",
+ gettext_noop ("Should we try to push our content to other peers?"),
+ "https://gnunet.org/configuration-fs";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL},
- {
- "GNUNET_setup_fs_datacache_mysql_radiobutton",
- "toggled",
- "dhtcache",
- "DATABASE",
- gettext_noop ("Use MySQL to cache DHT data"),
- "https://gnunet.org/configuration-datacache";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "mysql",
- hide_mysql_datacache_tab
- },
+ {
+ "GNUNET_setup_fs_migration_to_checkbutton",
+ "toggled",
+ "fs",
+ "CONTENT_CACHING",
+ gettext_noop ("Are we allowed to cache content received from other peers?"),
+ "https://gnunet.org/configuration-fs";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL},
- {
- "GNUNET_setup_fs_datacache_postgres_radiobutton",
- "toggled",
- "dhtcache",
- "DATABASE",
- gettext_noop ("Use Postgres to cache DHT data"),
- "https://gnunet.org/configuration-datacache";,
- &load_option_list /* abuse! */,
- &save_option_list /* abuse! */, "postgres",
- hide_postgres_datacache_tab
- },
-
- {
- "GNUNET_setup_datacache_mysql_database_name_entry",
- "changed",
- "datacache-mysql",
- "DATABASE",
- gettext_noop ("Name for the MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_fs_datacache_sqlite_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use sqLite to cache DHT data"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "sqlite",
+ hide_sqlite_datacache_tab},
- {
- "GNUNET_setup_datacache_mysql_config_file_filechooserbutton",
- "selection-changed",
- "datacache-mysql",
- "CONFIG",
- gettext_noop ("Configuration file for MySQL access"),
- "http://dev.mysql.com/doc/refman/5.5/en/option-files.html";,
- &load_filename,
- &save_filename, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_fs_datacache_mysql_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use MySQL to cache DHT data"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "mysql",
+ hide_mysql_datacache_tab},
- {
- "GNUNET_setup_datacache_mysql_username_entry",
- "changed",
- "datacache-mysql",
- "USER",
- gettext_noop ("Username for MySQL access"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_fs_datacache_postgres_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use Postgres to cache DHT data"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "postgres",
+ hide_postgres_datacache_tab},
- {
- "GNUNET_setup_datacache_mysql_password_entry",
- "changed",
- "datacache-mysql",
- "PASSWORD",
- gettext_noop ("Password for MySQL access"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_mysql_database_name_entry",
+ "changed",
+ "datacache-mysql",
+ "DATABASE",
+ gettext_noop ("Name for the MySQL database"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datacache_mysql_hostname_entry",
- "changed",
- "datacache-mysql",
- "HOST",
- gettext_noop ("Name of host running MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_mysql_config_file_filechooserbutton",
+ "selection-changed",
+ "datacache-mysql",
+ "CONFIG",
+ gettext_noop ("Configuration file for MySQL access"),
+ "http://dev.mysql.com/doc/refman/5.5/en/option-files.html";,
+ &load_filename,
+ &save_filename, NULL,
+ NULL},
- {
- "GNUNET_setup_transport_wlan_interface_entry",
- "changed",
- "transport-wlan",
- "INTERFACE",
- gettext_noop ("Name of monitoring interface to use (monX)"),
- "https://gnunet.org/configuration-wlan";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_mysql_username_entry",
+ "changed",
+ "datacache-mysql",
+ "USER",
+ gettext_noop ("Username for MySQL access"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datacache_mysql_port_spinbutton",
- "value-changed",
- "datacache-mysql",
- "PORT",
- gettext_noop ("Port of MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_mysql_password_entry",
+ "changed",
+ "datacache-mysql",
+ "PASSWORD",
+ gettext_noop ("Password for MySQL access"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_datacache_postgres_config_entry",
- "changed",
- "datacache-postgres",
- "CONFIG",
- gettext_noop ("Configuration for Postgres (passed to PQconnectdb)"),
- "http://www.postgresql.org/docs/8.1/static/libpq.html#LIBPQ-CONNECT";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_master_interface_entry",
- "changed",
- "vpn",
- "IFNAME",
- gettext_noop ("Name of the virtual interface the GNUnet VPN should
create"),
- "https://gnunet.org/configuration-vpn";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_master_interface_v4_ip_entry",
- "changed",
- "vpn",
- "IPV4ADDR",
- gettext_noop ("IPv4 address to use for the VPN interface"),
- "https://gnunet.org/configuration-vpn";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_master_interface_v4_mask_entry",
- "changed",
- "vpn",
- "IPV4MASK",
- gettext_noop ("IPv4 network mask to use for the VPN interface"),
- "https://gnunet.org/configuration-vpn";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_master_interface_v6_ip_entry",
- "changed",
- "vpn",
- "IPV6ADDR",
- gettext_noop ("IPv6 address to use for the VPN interface"),
- "https://gnunet.org/configuration-vpn";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_master_interface_v6_mask_spinbutton",
- "value-changed",
- "vpn",
- "IPV6MASK",
- gettext_noop ("IPv6 network prefix length to use for the VPN interface"),
- "https://gnunet.org/configuration-vpn";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_mysql_hostname_entry",
+ "changed",
+ "datacache-mysql",
+ "HOST",
+ gettext_noop ("Name of host running MySQL database"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_master_vdns_server_entry",
- "changed",
- "vpn",
- "VIRTDNS",
- gettext_noop ("IP address of the virtual DNS server that resolves
through GNUnet (use in resolve.conf if you want to resolve through some GNUnet
DNS Exit)"),
- "https://gnunet.org/configuration-vpn";,
- &load_text,
- &save_text, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_transport_wlan_interface_entry",
+ "changed",
+ "transport-wlan",
+ "INTERFACE",
+ gettext_noop ("Name of monitoring interface to use (monX)"),
+ "https://gnunet.org/configuration-wlan";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_enable_vpn_exit_checkbutton",
- "toggled",
- "arm",
- "DEFAULTSERVICES",
- gettext_noop ("Activate the VPN exit to provide services and/or to
enable others to use your Internet connection"),
- "https://gnunet.org/configuration-exit";,
- &load_option_list,
- &save_option_list, "exit",
- hide_exit_options
- },
+ {
+ "GNUNET_setup_datacache_mysql_port_spinbutton",
+ "value-changed",
+ "datacache-mysql",
+ "PORT",
+ gettext_noop ("Port of MySQL database"),
+ "https://gnunet.org/configuration-datacache";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_enable_dns_exit_checkbutton",
- "toggled",
- "dns",
- "PROVIDE_EXIT",
- gettext_noop ("Allow other peers to perform DNS resolutions using your
Internet connection"),
- "https://gnunet.org/configuration-dns";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_datacache_postgres_config_entry",
+ "changed",
+ "datacache-postgres",
+ "CONFIG",
+ gettext_noop ("Configuration for Postgres (passed to PQconnectdb)"),
+ "http://www.postgresql.org/docs/8.1/static/libpq.html#LIBPQ-CONNECT";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_exit_interface_name_entry",
- "changed",
- "exit",
- "IFNAME",
- gettext_noop ("Name of the virtual interface the GNUnet exit service
should create for traffic exiting the VPN to the Internet"),
- "https://gnunet.org/configuration-exit";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_exit_interface_v4_ip_entry",
- "changed",
- "exit",
- "IPV4ADDR",
- gettext_noop ("IPv4 address to use for the VPN Exit interface"),
- "https://gnunet.org/configuration-exit";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_exit_interface_v4_mask_entry",
- "changed",
- "exit",
- "IPV4MASK",
- gettext_noop ("IPv4 network mask to use for the VPN Exit interface"),
- "https://gnunet.org/configuration-exit";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_exit_interface_v6_ip_entry",
- "changed",
- "exit",
- "IPV6ADDR",
- gettext_noop ("IPv6 address to use for the VPN Exit interface"),
- "https://gnunet.org/configuration-exit";,
- &load_text,
- &save_text, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton",
- "value-changed",
- "exit",
- "IPV6MASK",
- gettext_noop ("IPv6 network prefix length to use for the VPN Exit
interface"),
- "https://gnunet.org/configuration-exit";,
- &load_number,
- &save_number, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_vpn_master_interface_entry",
+ "changed",
+ "vpn",
+ "IFNAME",
+ gettext_noop ("Name of the virtual interface the GNUnet VPN should create"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
+ {
+ "GNUNET_setup_vpn_master_interface_v4_ip_entry",
+ "changed",
+ "vpn",
+ "IPV4ADDR",
+ gettext_noop ("IPv4 address to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_exit_enable_udp_checkbutton",
- "toggled",
- "exit",
- "ENABLE_UDP",
- gettext_noop ("Allow other users to use your Internet connection for UDP
traffic (via the Exit interface)"),
- "https://gnunet.org/configuration-exit";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_exit_enable_tcp_checkbutton",
- "toggled",
- "exit",
- "ENABLE_TCP",
- gettext_noop ("Allow other users to use your Internet connection for TCP
traffic (via the Exit interface)"),
- "https://gnunet.org/configuration-exit";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL
- },
+ {
+ "GNUNET_setup_vpn_master_interface_v4_mask_entry",
+ "changed",
+ "vpn",
+ "IPV4MASK",
+ gettext_noop ("IPv4 network mask to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- /* DNS treeview */
-
- {
- "GNUNET_setup_vpn_dns_service_treeview",
- NULL,
- NULL,
- NULL,
- gettext_noop ("Specification of .gnunet hostnames and services offered
by this peer"),
- "https://gnunet.org/configuration-dns";,
- &load_vpn_dns_configuration,
- NULL, NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_dns_service_dnsname_cellrenderertext",
- "editing-started",
- NULL,
- NULL,
- NULL,
- "https://gnunet.org/configuration-dns";,
- NULL,
- &vpn_dns_service_dnsname_install_edited_handler,
- NULL,
- NULL
- },
+ {
+ "GNUNET_setup_vpn_master_interface_v6_ip_entry",
+ "changed",
+ "vpn",
+ "IPV6ADDR",
+ gettext_noop ("IPv6 address to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_dns_service_tcpudp_cellrenderertext",
- "editing-started",
- NULL,
- NULL,
- NULL,
- "https://gnunet.org/configuration-dns";,
- NULL,
- &vpn_dns_service_tcpudp_install_edited_handler,
- NULL,
- NULL
- },
+ {
+ "GNUNET_setup_vpn_master_interface_v6_mask_spinbutton",
+ "value-changed",
+ "vpn",
+ "IPV6MASK",
+ gettext_noop ("IPv6 network prefix length to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
- {
- "GNUNET_setup_vpn_dns_service_sourceport_cellrenderertext",
- "editing-started",
- NULL,
- NULL,
- NULL,
- "https://gnunet.org/configuration-dns";,
- NULL,
- &vpn_dns_service_sourceport_install_edited_handler,
- NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_dns_service_targethostname_cellrenderertext",
- "editing-started",
- NULL,
- NULL,
- NULL,
- "https://gnunet.org/configuration-dns";,
- NULL,
- &vpn_dns_service_targethostname_install_edited_handler,
- NULL,
- NULL
- },
-
- {
- "GNUNET_setup_vpn_dns_service_targetport_cellrenderertext",
- "editing-started",
- NULL,
- NULL,
- NULL,
- "https://gnunet.org/configuration-dns";,
- NULL,
- &vpn_dns_service_targetport_install_edited_handler,
- NULL,
- NULL
- },
+ {
+ "GNUNET_setup_vpn_master_vdns_server_entry",
+ "changed",
+ "vpn",
+ "VIRTDNS",
+ gettext_noop
+ ("IP address of the virtual DNS server that resolves through GNUnet (use in
resolve.conf if you want to resolve through some GNUnet DNS Exit)"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
- /* END of list */
+ {
+ "GNUNET_setup_vpn_enable_vpn_exit_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop
+ ("Activate the VPN exit to provide services and/or to enable others to use
your Internet connection"),
+ "https://gnunet.org/configuration-exit";,
+ &load_option_list,
+ &save_option_list, "exit",
+ hide_exit_options},
- { NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL }
- };
+ {
+ "GNUNET_setup_vpn_enable_dns_exit_checkbutton",
+ "toggled",
+ "dns",
+ "PROVIDE_EXIT",
+ gettext_noop
+ ("Allow other peers to perform DNS resolutions using your Internet
connection"),
+ "https://gnunet.org/configuration-dns";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL},
+ {
+ "GNUNET_setup_vpn_exit_interface_name_entry",
+ "changed",
+ "exit",
+ "IFNAME",
+ gettext_noop
+ ("Name of the virtual interface the GNUnet exit service should create for
traffic exiting the VPN to the Internet"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v4_ip_entry",
+ "changed",
+ "exit",
+ "IPV4ADDR",
+ gettext_noop ("IPv4 address to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v4_mask_entry",
+ "changed",
+ "exit",
+ "IPV4MASK",
+ gettext_noop ("IPv4 network mask to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v6_ip_entry",
+ "changed",
+ "exit",
+ "IPV6ADDR",
+ gettext_noop ("IPv6 address to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton",
+ "value-changed",
+ "exit",
+ "IPV6MASK",
+ gettext_noop
+ ("IPv6 network prefix length to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_number,
+ &save_number, NULL,
+ NULL},
+
+
+ {
+ "GNUNET_setup_vpn_exit_enable_udp_checkbutton",
+ "toggled",
+ "exit",
+ "ENABLE_UDP",
+ gettext_noop
+ ("Allow other users to use your Internet connection for UDP traffic (via
the Exit interface)"),
+ "https://gnunet.org/configuration-exit";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_exit_enable_tcp_checkbutton",
+ "toggled",
+ "exit",
+ "ENABLE_TCP",
+ gettext_noop
+ ("Allow other users to use your Internet connection for TCP traffic (via
the Exit interface)"),
+ "https://gnunet.org/configuration-exit";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL},
+
+ /* DNS treeview */
+
+ {
+ "GNUNET_setup_vpn_dns_service_treeview",
+ NULL,
+ NULL,
+ NULL,
+ gettext_noop
+ ("Specification of .gnunet hostnames and services offered by this peer"),
+ "https://gnunet.org/configuration-dns";,
+ &load_vpn_dns_configuration,
+ NULL, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_dns_service_dnsname_cellrenderertext",
+ "editing-started",
+ NULL,
+ NULL,
+ NULL,
+ "https://gnunet.org/configuration-dns";,
+ NULL,
+ &vpn_dns_service_dnsname_install_edited_handler,
+ NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_dns_service_tcpudp_cellrenderertext",
+ "editing-started",
+ NULL,
+ NULL,
+ NULL,
+ "https://gnunet.org/configuration-dns";,
+ NULL,
+ &vpn_dns_service_tcpudp_install_edited_handler,
+ NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_dns_service_sourceport_cellrenderertext",
+ "editing-started",
+ NULL,
+ NULL,
+ NULL,
+ "https://gnunet.org/configuration-dns";,
+ NULL,
+ &vpn_dns_service_sourceport_install_edited_handler,
+ NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_dns_service_targethostname_cellrenderertext",
+ "editing-started",
+ NULL,
+ NULL,
+ NULL,
+ "https://gnunet.org/configuration-dns";,
+ NULL,
+ &vpn_dns_service_targethostname_install_edited_handler,
+ NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_vpn_dns_service_targetport_cellrenderertext",
+ "editing-started",
+ NULL,
+ NULL,
+ NULL,
+ "https://gnunet.org/configuration-dns";,
+ NULL,
+ &vpn_dns_service_targetport_install_edited_handler,
+ NULL,
+ NULL},
+
+ /* END of list */
+
+ {NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL}
+};
+
/* end of gnunet-setup-options.c */
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-http.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-http.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-http.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -36,10 +36,9 @@
void
GNUNET_setup_transport_http_test_button_clicked_cb ()
{
- GNUNET_setup_transport_test ("transport-http",
- GNUNET_YES,
- "GNUNET_setup_transport_http_test_success_image",
- "GNUNET_setup_transport_http_test_fail_image");
+ GNUNET_setup_transport_test ("transport-http", GNUNET_YES,
+
"GNUNET_setup_transport_http_test_success_image",
+ "GNUNET_setup_transport_http_test_fail_image");
}
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-https.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-https.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-https.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -36,10 +36,9 @@
void
GNUNET_setup_transport_https_test_button_clicked_cb ()
{
- GNUNET_setup_transport_test ("transport-https",
- GNUNET_YES,
-
"GNUNET_setup_transport_https_test_success_image",
- "GNUNET_setup_transport_https_test_fail_image");
+ GNUNET_setup_transport_test ("transport-https", GNUNET_YES,
+
"GNUNET_setup_transport_https_test_success_image",
+ "GNUNET_setup_transport_https_test_fail_image");
}
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c 2011-08-15
22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c 2011-08-15
22:37:19 UTC (rev 16585)
@@ -34,72 +34,66 @@
* @param name name of the plugin to check
*/
static void
-test_plugin (GtkWidget *widget,
- const char *name)
+test_plugin (GtkWidget * widget, const char *name)
{
- if (GNUNET_YES ==
- GNUNET_PLUGIN_test (name))
- {
- gtk_widget_set_sensitive (widget,
- TRUE);
- }
+ if (GNUNET_YES == GNUNET_PLUGIN_test (name))
+ {
+ gtk_widget_set_sensitive (widget, TRUE);
+ }
else
- {
- gtk_widget_set_sensitive (widget,
- FALSE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
- FALSE);
- }
+ {
+ gtk_widget_set_sensitive (widget, FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+ }
}
void
-GNUNET_setup_transport_tcp_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_tcp_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_tcp");
}
void
-GNUNET_setup_transport_udp_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_udp_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_udp");
}
void
-GNUNET_setup_transport_http_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_http_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_http");
}
void
-GNUNET_setup_transport_https_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_https_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_https");
}
void
-GNUNET_setup_transport_dv_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_dv_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_dv");
}
void
-GNUNET_setup_transport_wlan_checkbutton_realize_cb (GtkWidget *widget,
- gpointer user_data)
+GNUNET_setup_transport_wlan_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
test_plugin (widget, "libgnunet_plugin_transport_wlan");
}
/* end of gnunet-setup-transport-plugins.c */
-
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-tcp.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-tcp.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-tcp.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -36,10 +36,9 @@
void
GNUNET_setup_transport_tcp_test_button_clicked_cb ()
{
- GNUNET_setup_transport_test ("transport-tcp",
- GNUNET_YES,
- "GNUNET_setup_transport_tcp_test_success_image",
- "GNUNET_setup_transport_tcp_test_fail_image");
+ GNUNET_setup_transport_test ("transport-tcp", GNUNET_YES,
+ "GNUNET_setup_transport_tcp_test_success_image",
+ "GNUNET_setup_transport_tcp_test_fail_image");
}
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-test.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-test.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-test.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -48,9 +48,9 @@
/**
* Name of widget to show on success.
- */
+ */
const char *success_image;
-
+
/**
* Name of widget to show on failure.
*/
@@ -66,39 +66,38 @@
* @param result GNUNET_YES on success
*/
static void
-display_test_result (struct TestContext *tc,
- int result)
+display_test_result (struct TestContext *tc, int result)
{
GObject *w;
if (GNUNET_YES != result)
- {
- w = GNUNET_SETUP_get_object (tc->failure_image);
- if (NULL != w)
- gtk_widget_show (GTK_WIDGET (w));
- w = GNUNET_SETUP_get_object (tc->success_image);
- if (NULL != w)
- gtk_widget_hide (GTK_WIDGET (w));
- }
+ {
+ w = GNUNET_SETUP_get_object (tc->failure_image);
+ if (NULL != w)
+ gtk_widget_show (GTK_WIDGET (w));
+ w = GNUNET_SETUP_get_object (tc->success_image);
+ if (NULL != w)
+ gtk_widget_hide (GTK_WIDGET (w));
+ }
else
- {
- w = GNUNET_SETUP_get_object (tc->failure_image);
- if (NULL != w)
- gtk_widget_hide (GTK_WIDGET (w));
- w = GNUNET_SETUP_get_object (tc->success_image);
- if (NULL != w)
- gtk_widget_show (GTK_WIDGET (w));
- }
+ {
+ w = GNUNET_SETUP_get_object (tc->failure_image);
+ if (NULL != w)
+ gtk_widget_hide (GTK_WIDGET (w));
+ w = GNUNET_SETUP_get_object (tc->success_image);
+ if (NULL != w)
+ gtk_widget_show (GTK_WIDGET (w));
+ }
if (GNUNET_SCHEDULER_NO_TASK != tc->tsk)
- {
- GNUNET_SCHEDULER_cancel (tc->tsk);
- tc->tsk = GNUNET_SCHEDULER_NO_TASK;
- }
+ {
+ GNUNET_SCHEDULER_cancel (tc->tsk);
+ tc->tsk = GNUNET_SCHEDULER_NO_TASK;
+ }
if (NULL != tc->tst)
- {
- GNUNET_NAT_test_stop (tc->tst);
- tc->tst = NULL;
- }
+ {
+ GNUNET_NAT_test_stop (tc->tst);
+ tc->tst = NULL;
+ }
GNUNET_free (tc);
}
@@ -111,8 +110,7 @@
* @param success currently always GNUNET_OK
*/
static void
-result_callback (void *cls,
- int success)
+result_callback (void *cls, int success)
{
struct TestContext *tc = cls;
@@ -128,8 +126,7 @@
* @param tc scheduler callback
*/
static void
-fail_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestContext *tstc = cls;
@@ -148,10 +145,9 @@
* @param failure_image image to show on failure
*/
void
-GNUNET_setup_transport_test (const char *section_name,
- int is_tcp,
- const char *success_image,
- const char *failure_image)
+GNUNET_setup_transport_test (const char *section_name, int is_tcp,
+ const char *success_image,
+ const char *failure_image)
{
struct TestContext *tc;
unsigned long long bnd_port;
@@ -159,19 +155,15 @@
GtkWidget *w;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
- section_name,
- "PORT",
- &bnd_port))
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_CONFIGURATION_get_value_number (cfg, section_name, "PORT",
+ &bnd_port))
+ {
+ GNUNET_break (0);
+ return;
+ }
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
- section_name,
- "ADVERTISED_PORT",
- &adv_port))
+ GNUNET_CONFIGURATION_get_value_number (cfg, section_name,
+ "ADVERTISED_PORT", &adv_port))
adv_port = bnd_port;
tc = GNUNET_malloc (sizeof (struct TestContext));
tc->success_image = success_image;
@@ -180,20 +172,15 @@
gtk_widget_hide (w);
GNUNET_assert (NULL != cfg);
GNUNET_RESOLVER_connect (cfg);
- tc->tst = GNUNET_NAT_test_start (cfg,
- is_tcp,
- (uint16_t) bnd_port,
- (uint16_t) adv_port,
- &result_callback,
- tc);
+ tc->tst =
+ GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
+ (uint16_t) adv_port, &result_callback, tc);
if (NULL == tc->tst)
- {
- display_test_result (tc, GNUNET_SYSERR);
- return;
- }
- tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &fail_timeout,
- tc);
+ {
+ display_test_result (tc, GNUNET_SYSERR);
+ return;
+ }
+ tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc);
}
/* end of gnunet-setup-transport-test.c */
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-udp.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-udp.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-udp.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -37,10 +37,9 @@
GNUNET_setup_transport_udp_test_button_clicked_cb ()
{
- GNUNET_setup_transport_test ("transport-udp",
- GNUNET_NO,
- "GNUNET_setup_transport_udp_test_success_image",
- "GNUNET_setup_transport_udp_test_fail_image");
+ GNUNET_setup_transport_test ("transport-udp", GNUNET_NO,
+ "GNUNET_setup_transport_udp_test_success_image",
+ "GNUNET_setup_transport_udp_test_fail_image");
}
Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c 2011-08-15 22:36:56 UTC
(rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c 2011-08-15 22:37:19 UTC
(rev 16585)
@@ -56,14 +56,15 @@
{
GtkToggleButton *button;
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
("GNUNET_setup_transport_icmp_server_enable_checkbutton"));
+ button =
+ GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
+
("GNUNET_setup_transport_icmp_server_enable_checkbutton"));
if (button == NULL)
- {
- GNUNET_break (0);
- return;
- }
- gtk_toggle_button_set_active (button,
- on ? TRUE : FALSE);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_toggle_button_set_active (button, on ? TRUE : FALSE);
}
@@ -75,18 +76,17 @@
* @param success currently always GNUNET_OK
*/
static void
-result_callback (void *cls,
- int success)
+result_callback (void *cls, int success)
{
GNUNET_SCHEDULER_cancel (tsk);
tsk = GNUNET_SCHEDULER_NO_TASK;
GNUNET_NAT_test_stop (tst);
tst = NULL;
if (NULL != resolver)
- {
- GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
- GNUNET_OS_process_close (resolver);
- }
+ {
+ GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
+ GNUNET_OS_process_close (resolver);
+ }
update_icmp_server_enable_button (success);
}
@@ -99,8 +99,7 @@
* @param tc scheduler callback
*/
static void
-fail_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_assert (NULL != tst);
tsk = GNUNET_SCHEDULER_NO_TASK;
@@ -116,27 +115,20 @@
* @param cls the 'int*' for the result
* @param tc scheduler context
*/
-static void
-reversal_test (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+reversal_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
int *ok = cls;
GNUNET_assert (NULL != cfg);
GNUNET_RESOLVER_connect (cfg);
- tst = GNUNET_NAT_test_start (cfg,
- GNUNET_YES,
- 0, 0,
- &result_callback,
- ok);
+ tst = GNUNET_NAT_test_start (cfg, GNUNET_YES, 0, 0, &result_callback, ok);
if (NULL == tst)
- {
- *ok = GNUNET_SYSERR;
- return;
- }
- tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &fail_timeout,
- ok);
+ {
+ *ok = GNUNET_SYSERR;
+ return;
+ }
+ tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, ok);
}
/**
@@ -146,10 +138,10 @@
test_connection_reversal ()
{
if (NULL != resolver)
- return; /* test already active!? */
- resolver = GNUNET_OS_start_process (NULL, NULL,
- "gnunet-service-resolver",
- "gnunet-service-resolver", NULL);
+ return; /* test already active!? */
+ resolver =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-resolver",
+ "gnunet-service-resolver", NULL);
GNUNET_SCHEDULER_add_now (&reversal_test, NULL);
}
@@ -166,36 +158,31 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
static int
-nipo (void *cls,
- const char *name,
- int isDefault,
- const struct sockaddr *
- addr, socklen_t addrlen)
+nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
+ socklen_t addrlen)
{
const struct sockaddr_in *in;
char buf[INET_ADDRSTRLEN];
GtkEntry *entry;
- if (! isDefault)
+ if (!isDefault)
return GNUNET_OK;
if (addrlen != sizeof (struct sockaddr_in))
return GNUNET_OK;
- in = (const struct sockaddr_in*) addr;
+ in = (const struct sockaddr_in *) addr;
/* set internal IP address */
- inet_ntop (AF_INET, &in->sin_addr, buf, sizeof(buf));
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "INTERNAL_ADDRESS",
- buf);
- entry = GTK_ENTRY (GNUNET_SETUP_get_object
("GNUNET_setup_transport_internal_ip_entry"));
+ inet_ntop (AF_INET, &in->sin_addr, buf, sizeof (buf));
+ GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "INTERNAL_ADDRESS", buf);
+ entry =
+ GTK_ENTRY (GNUNET_SETUP_get_object
+ ("GNUNET_setup_transport_internal_ip_entry"));
if (entry == NULL)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- gtk_entry_set_text (entry,
- buf);
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ gtk_entry_set_text (entry, buf);
/* no need to continue iteration */
return GNUNET_SYSERR;
}
@@ -208,8 +195,7 @@
* @param addr the address, NULL on errors
*/
static void
-set_external_ipv4 (void *cls,
- const struct in_addr *addr)
+set_external_ipv4 (void *cls, const struct in_addr *addr)
{
struct in_addr ia;
char buf[INET_ADDRSTRLEN];
@@ -218,46 +204,40 @@
GtkToggleButton *button;
if (NULL != addr)
- {
- /* enable 'behind nat' */
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "BEHIND_NAT",
- "YES");
- o = GNUNET_SETUP_get_object ("GNUNET_setup_transport_nat_checkbutton");
- if (NULL != o)
- {
- button = GTK_TOGGLE_BUTTON (o);
- if (button == NULL)
- {
- GNUNET_break (0);
- return;
- }
- gtk_toggle_button_set_active (button,
- TRUE);
- }
+ {
+ /* enable 'behind nat' */
+ if (NULL != cfg)
+ GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "BEHIND_NAT", "YES");
+ o = GNUNET_SETUP_get_object ("GNUNET_setup_transport_nat_checkbutton");
+ if (NULL != o)
+ {
+ button = GTK_TOGGLE_BUTTON (o);
+ if (button == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_toggle_button_set_active (button, TRUE);
+ }
- /* set external IP address */
- inet_ntop (AF_INET, &ia, buf, sizeof(buf));
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "EXTERNAL_ADDRESS",
- buf);
- o = GNUNET_SETUP_get_object
("GNUNET_setup_transport_external_ip_address_entry");
- if (NULL != o)
- {
- entry = GTK_ENTRY (o);
- if (entry == NULL)
- {
- GNUNET_break (0);
- return;
- }
- gtk_entry_set_text (entry,
- buf);
- }
+ /* set external IP address */
+ inet_ntop (AF_INET, &ia, buf, sizeof (buf));
+ if (NULL != cfg)
+ GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
+ buf);
+ o = GNUNET_SETUP_get_object
+ ("GNUNET_setup_transport_external_ip_address_entry");
+ if (NULL != o)
+ {
+ entry = GTK_ENTRY (o);
+ if (entry == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_entry_set_text (entry, buf);
}
+ }
}
@@ -273,9 +253,7 @@
char *tmp;
/* try to detect external IP */
- (void) GNUNET_NAT_mini_get_external_ipv4 (TIMEOUT,
- &set_external_ipv4,
- NULL);
+ (void) GNUNET_NAT_mini_get_external_ipv4 (TIMEOUT, &set_external_ipv4, NULL);
/* Try to detect internal IP */
GNUNET_OS_network_interfaces_list (&nipo, NULL);
@@ -283,45 +261,38 @@
/* test gnunet-helper-nat-server */
tmp = NULL;
- hns = ( (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "nat",
- "EXTERNAL_ADDRESS",
- &tmp)) &&
- (0 < strlen (tmp)) &&
- (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "nat",
- "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server")) );
+ hns =
+ ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
+ &tmp)) && (0 < strlen (tmp)) &&
+ (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
+ (GNUNET_YES ==
+ GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server")));
GNUNET_free_non_null (tmp);
- if (hns)
- test_connection_reversal ();
+ if (hns)
+ test_connection_reversal ();
/* test gnunet-helper-nat-client */
tmp = NULL;
- hnc = ( (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "nat",
- "INTERNAL_ADDRESS",
- &tmp)) &&
- (0 < strlen (tmp)) &&
- (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "nat",
- "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary ("gnunet-helper-nat-client")) );
+ hnc =
+ ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "INTERNAL_ADDRESS",
+ &tmp)) && (0 < strlen (tmp)) &&
+ (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
+ (GNUNET_YES ==
+ GNUNET_OS_check_helper_binary ("gnunet-helper-nat-client")));
GNUNET_free_non_null (tmp);
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
("GNUNET_setup_transport_icmp_client_enable_checkbutton"));
+ button =
+ GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
+
("GNUNET_setup_transport_icmp_client_enable_checkbutton"));
if (button == NULL)
- {
- GNUNET_break (0);
- return;
- }
- gtk_toggle_button_set_active (button,
- hnc ? TRUE : FALSE);
+ {
+ GNUNET_break (0);
+ return;
+ }
+ gtk_toggle_button_set_active (button, hnc ? TRUE : FALSE);
}
/* end of gnunet-setup-transport.c */
Modified: gnunet-gtk/src/setup/gnunet-setup.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup.c 2011-08-15 22:36:56 UTC (rev 16584)
+++ gnunet-gtk/src/setup/gnunet-setup.c 2011-08-15 22:37:19 UTC (rev 16585)
@@ -77,9 +77,8 @@
static gboolean
-help_click_callback (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
+help_click_callback (GtkWidget * widget, GdkEventButton * event,
+ gpointer user_data)
{
const struct GNUNET_SETUP_OptionSpecification *os = user_data;
GtkLinkButton *help;
@@ -87,10 +86,8 @@
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
help = GTK_LINK_BUTTON (GNUNET_SETUP_get_object ("GNUNET_setup_help_text"));
- gtk_link_button_set_uri (help,
- os->help_url);
- gtk_button_set_label (GTK_BUTTON (help),
- os->help_text);
+ gtk_link_button_set_uri (help, os->help_url);
+ gtk_button_set_label (GTK_BUTTON (help), os->help_text);
return FALSE;
}
@@ -104,7 +101,7 @@
*/
static void
update_visibility (const struct GNUNET_SETUP_OptionSpecification *os,
- const char *value)
+ const char *value)
{
unsigned int i;
const struct GNUNET_SETUP_VisibilitySpecification *vs;
@@ -115,52 +112,50 @@
return;
i = 0;
while (os->visibility[i].widget_name != NULL)
+ {
+ vs = &os->visibility[i];
+ widget = GTK_WIDGET (GNUNET_SETUP_get_object (vs->widget_name));
+ if (widget == NULL)
{
- vs = &os->visibility[i];
- widget = GTK_WIDGET (GNUNET_SETUP_get_object (vs->widget_name));
- if (widget == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Widget `%s' not found\n"),
- vs->widget_name);
- }
- if (NULL != vs->show_value)
- {
- if (0 != regcomp (&r, vs->show_value, REG_EXTENDED | REG_ICASE |
REG_NOSUB))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid regular expression `%s'\n"),
- vs->show_value);
- i++;
- continue;
- }
- if (0 == regexec (&r, value, 0, NULL, 0))
- gtk_widget_show (widget);
- else
- gtk_widget_hide (widget);
- regfree (&r);
- }
- if (NULL != vs->hide_value)
- {
- if (0 != regcomp (&r, vs->hide_value, REG_ICASE | REG_NOSUB))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid regular expression `%s'\n"),
- vs->show_value);
- i++;
- continue;
- }
- if (0 == regexec (&r, value, 0, NULL, 0))
- gtk_widget_hide (widget);
- else
- gtk_widget_show (widget);
- regfree (&r);
- }
- i++;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Widget `%s' not found\n"),
+ vs->widget_name);
}
+ if (NULL != vs->show_value)
+ {
+ if (0 !=
+ regcomp (&r, vs->show_value, REG_EXTENDED | REG_ICASE | REG_NOSUB))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid regular expression `%s'\n"), vs->show_value);
+ i++;
+ continue;
+ }
+ if (0 == regexec (&r, value, 0, NULL, 0))
+ gtk_widget_show (widget);
+ else
+ gtk_widget_hide (widget);
+ regfree (&r);
+ }
+ if (NULL != vs->hide_value)
+ {
+ if (0 != regcomp (&r, vs->hide_value, REG_ICASE | REG_NOSUB))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid regular expression `%s'\n"), vs->show_value);
+ i++;
+ continue;
+ }
+ if (0 == regexec (&r, value, 0, NULL, 0))
+ gtk_widget_hide (widget);
+ else
+ gtk_widget_show (widget);
+ regfree (&r);
+ }
+ i++;
+ }
}
-
+
/**
* Function called whenever a widget changes its state.
*/
@@ -173,24 +168,18 @@
widget = GNUNET_SETUP_get_object (os->widget_name);
GNUNET_assert (NULL != os->save_function);
if (GNUNET_OK !=
- os->save_function (os->load_save_cls,
- os->section,
- os->option,
- widget,
- cfg))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to obtain option value from widget `%s'\n"),
- os->widget_name);
- return;
- }
- if ( (os->section != NULL) &&
- (os->option != NULL) )
+ os->save_function (os->load_save_cls, os->section, os->option, widget,
+ cfg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to obtain option value from widget `%s'\n"),
+ os->widget_name);
+ return;
+ }
+ if ((os->section != NULL) && (os->option != NULL))
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg,
- os->section,
- os->option,
- &value));
+ GNUNET_CONFIGURATION_get_value_string (cfg, os->section,
+ os->option, &value));
else
value = NULL;
update_visibility (os, value);
@@ -211,85 +200,71 @@
i = 0;
while (option_specifications[i].widget_name != NULL)
+ {
+ os = &option_specifications[i];
+ widget = GNUNET_SETUP_get_object (os->widget_name);
+ if (NULL == widget)
{
- os = &option_specifications[i];
- widget = GNUNET_SETUP_get_object (os->widget_name);
- if (NULL == widget)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Widget `%s' not found\n"),
- os->widget_name);
- i++;
- continue;
- }
- if (os->load_function != NULL)
- {
- if ( (NULL == os->section) ||
- (NULL == os->option) )
- {
- if (GNUNET_OK !=
- os->load_function (os->load_save_cls,
- NULL, NULL, NULL,
- widget,
- cfg))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to initialize widget `%s'\n"),
- os->widget_name);
- }
- }
- else
- {
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- os->section,
- os->option,
- &value))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("No default value known for option `%s' in
section `%s'\n"),
- os->option,
- os->section);
- }
- else
- {
- if (GNUNET_OK !=
- os->load_function (os->load_save_cls,
- os->section, os->option,
- value,
- widget,
- cfg))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to initialize widget `%s' with
value `%s'\n"),
- os->widget_name,
- value);
- }
- else
- {
- update_visibility (os, value);
- }
- GNUNET_free (value);
- }
- }
- }
- if (os->help_text != NULL)
- {
- g_signal_connect (widget,
- "button-press-event",
- G_CALLBACK (&help_click_callback),
- (void*) os);
- }
- if (os->change_signal != NULL)
- {
- GNUNET_assert (NULL != os->save_function);
- g_signal_connect_swapped (widget,
- os->change_signal,
- G_CALLBACK (&widget_state_change_callback),
- (void*) os);
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Widget `%s' not found\n"),
+ os->widget_name);
i++;
+ continue;
}
+ if (os->load_function != NULL)
+ {
+ if ((NULL == os->section) || (NULL == os->option))
+ {
+ if (GNUNET_OK !=
+ os->load_function (os->load_save_cls, NULL, NULL, NULL, widget,
+ cfg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to initialize widget `%s'\n"),
os->widget_name);
+ }
+ }
+ else
+ {
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, os->section,
os->option,
+ &value))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _
+ ("No default value known for option `%s' in section
`%s'\n"),
+ os->option, os->section);
+ }
+ else
+ {
+ if (GNUNET_OK !=
+ os->load_function (os->load_save_cls, os->section, os->option,
+ value, widget, cfg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to initialize widget `%s' with value
`%s'\n"),
+ os->widget_name, value);
+ }
+ else
+ {
+ update_visibility (os, value);
+ }
+ GNUNET_free (value);
+ }
+ }
+ }
+ if (os->help_text != NULL)
+ {
+ g_signal_connect (widget, "button-press-event",
+ G_CALLBACK (&help_click_callback), (void *) os);
+ }
+ if (os->change_signal != NULL)
+ {
+ GNUNET_assert (NULL != os->save_function);
+ g_signal_connect_swapped (widget, os->change_signal,
+ G_CALLBACK (&widget_state_change_callback),
+ (void *) os);
+ }
+ i++;
+ }
}
@@ -297,29 +272,25 @@
/**
* Callback invoked if the application is supposed to exit.
*/
-void
-GNUNET_SETUP_quit_cb (GtkObject *object,
- gpointer user_data)
+void
+GNUNET_SETUP_quit_cb (GtkObject * object, gpointer user_data)
{
struct GNUNET_CONFIGURATION_Handle *cfgDefault;
GNUNET_GTK_main_loop_quit (ml);
cfgDefault = GNUNET_CONFIGURATION_create ();
- (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_write_diffs (cfgDefault,
- cfg,
- cfgName))
- gret = 1;
+ (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only
*/
+ if (GNUNET_OK != GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, cfgName))
+ gret = 1;
GNUNET_CONFIGURATION_destroy (cfgDefault);
GNUNET_CONFIGURATION_destroy (cfg);
cfg = NULL;
if (NULL != resolver)
- {
- GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
- GNUNET_OS_process_close (resolver);
- resolver = NULL;
- }
+ {
+ GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
+ GNUNET_OS_process_close (resolver);
+ resolver = NULL;
+ }
}
@@ -330,18 +301,17 @@
* @param tc scheduler context
*/
static void
-run (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
ml = cls;
GtkWidget *main_window;
-
+
cfg = GNUNET_CONFIGURATION_create ();
(void) GNUNET_CONFIGURATION_load (cfg, cfgName);
main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
- resolver = GNUNET_OS_start_process (NULL, NULL,
- "gnunet-service-resolver",
- "gnunet-service-resolver", NULL);
+ resolver =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-resolver",
+ "gnunet-service-resolver", NULL);
load_options ();
gtk_widget_show (main_window);
gtk_window_present (GTK_WINDOW (main_window));
@@ -356,8 +326,7 @@
* @return 0 on success
*/
int
-main (int argc,
- char *const *argv)
+main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_CFG_FILE (&cfgName),
@@ -372,16 +341,12 @@
loglev = GNUNET_strdup ("WARNING");
if (GNUNET_OK ==
- GNUNET_GTK_main_loop_start ("gnunet-setup",
- "guunet-setup",
- argc,
- argv,
- options,
- "gnunet_setup_gtk_main_window.glade",
- &run))
+ GNUNET_GTK_main_loop_start ("gnunet-setup", "guunet-setup", argc, argv,
+ options,
"gnunet_setup_gtk_main_window.glade",
+ &run))
ret = gret;
else
- ret = 1;
+ ret = 1;
GNUNET_free (cfgName);
GNUNET_free (loglev);
return ret;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16585 - in gnunet-gtk: . src/fs src/lib src/peerinfo src/setup,
gnunet <=