[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24807 - in gnunet-gtk: contrib src/setup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24807 - in gnunet-gtk: contrib src/setup |
|
Date: |
Tue, 6 Nov 2012 15:28:24 +0100 |
Author: grothoff
Date: 2012-11-06 15:28:23 +0100 (Tue, 06 Nov 2012)
New Revision: 24807
Modified:
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
gnunet-gtk/src/setup/gnunet-setup-options.c
gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c
Log:
fix setup with respect to http server/client split
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-11-06
14:12:04 UTC (rev 24806)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-11-06
14:28:23 UTC (rev 24807)
@@ -1144,8 +1144,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_http_checkbutton">
- <property name="label"
translatable="yes">_HTTP</property>
+ <object class="GtkCheckButton"
id="GNUNET_setup_transport_http_client_checkbutton">
+ <property name="label"
translatable="yes">_HTTP Client</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -1154,7 +1154,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="realize"
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
+ <signal name="realize"
handler="GNUNET_setup_transport_http_client_checkbutton_realize_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1164,8 +1164,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_https_checkbutton">
- <property name="label"
translatable="yes">HTTP_S</property>
+ <object class="GtkCheckButton"
id="GNUNET_setup_transport_http_server_checkbutton">
+ <property name="label"
translatable="yes">HTT_P Server</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -1174,7 +1174,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="realize"
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
+ <signal name="realize"
handler="GNUNET_setup_transport_http_server_checkbutton_realize_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1184,6 +1184,46 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_transport_https_client_checkbutton">
+ <property name="label"
translatable="yes">HTTPS _Client</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_https_client_checkbutton_realize_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_transport_https_server_checkbutton">
+ <property name="label"
translatable="yes">HTTPS _Server</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_https_server_checkbutton_realize_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton"
id="GNUNET_setup_transport_dv_checkbutton">
<property name="label"
translatable="yes">D_V</property>
<property name="can_focus">True</property>
@@ -1198,7 +1238,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
- <property name="position">5</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -1217,7 +1257,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
- <property name="position">6</property>
+ <property name="position">8</property>
</packing>
</child>
</object>
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2012-11-06 14:12:04 UTC (rev
24806)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2012-11-06 14:28:23 UTC (rev
24807)
@@ -357,11 +357,11 @@
gettext_noop ("the TCP transport plugin"),},
{
"GNUNET_setup_transport_http_port_spinbutton",
- "GNUNET_setup_transport_http_checkbutton",
+ "GNUNET_setup_transport_http_server_checkbutton",
gettext_noop ("the HTTP transport plugin"),},
{
"GNUNET_setup_transport_https_port_spinbutton",
- "GNUNET_setup_transport_https_checkbutton",
+ "GNUNET_setup_transport_https_server_checkbutton",
gettext_noop ("the HTTPS transport plugin"),},
{NULL, NULL}
};
@@ -812,7 +812,7 @@
* Hide "http" tab if HTTP not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_http_tab[] = {
- {"GNUNET_setup_transport_http_vbox", "(^| )http($| )", NULL},
+ {"GNUNET_setup_transport_http_vbox", "(^| )http_server($| )", NULL},
{NULL, NULL, NULL}
};
@@ -821,7 +821,7 @@
* Hide "https" tab if HTTPS not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_https_tab[] = {
- {"GNUNET_setup_transport_https_vbox", "(^| )https($| )", NULL},
+ {"GNUNET_setup_transport_https_vbox", "(^| )https_server($| )", NULL},
{NULL, NULL, NULL}
};
@@ -1181,30 +1181,54 @@
hide_udp_tab},
{
- "GNUNET_setup_transport_http_checkbutton",
+ "GNUNET_setup_transport_http_server_checkbutton",
"toggled",
"transport",
"PLUGINS",
- gettext_noop ("Enable communication via HTTP"),
+ gettext_noop ("Enable communication via HTTP as a server"),
"https://gnunet.org/configuration-http";,
&load_option_list,
- &save_option_list, "http",
+ &save_option_list, "http_server",
&highlight_port_collisions, NULL,
hide_http_tab},
{
- "GNUNET_setup_transport_https_checkbutton",
+ "GNUNET_setup_transport_http_client_checkbutton",
"toggled",
"transport",
"PLUGINS",
- gettext_noop ("Enable communication via HTTPS"),
+ gettext_noop ("Enable communication via HTTP as a client"),
+ "https://gnunet.org/configuration-http";,
+ &load_option_list,
+ &save_option_list, "http_client",
+ &highlight_port_collisions, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_transport_https_server_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTPS as a server"),
"https://gnunet.org/configuration-https";,
&load_option_list,
- &save_option_list, "https",
+ &save_option_list, "https_server",
&highlight_port_collisions, NULL,
hide_https_tab},
{
+ "GNUNET_setup_transport_https_client_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTPS as a client"),
+ "https://gnunet.org/configuration-https";,
+ &load_option_list,
+ &save_option_list, "https_client",
+ &highlight_port_collisions, NULL,
+ NULL},
+
+ {
"GNUNET_setup_transport_dv_checkbutton",
"toggled",
"transport",
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c 2012-11-06
14:12:04 UTC (rev 24806)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-plugins.c 2012-11-06
14:28:23 UTC (rev 24807)
@@ -66,22 +66,38 @@
void
-GNUNET_setup_transport_http_checkbutton_realize_cb (GtkWidget * widget,
- gpointer user_data)
+GNUNET_setup_transport_http_server_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
- test_plugin (widget, "libgnunet_plugin_transport_http");
+ test_plugin (widget, "libgnunet_plugin_transport_http_server");
}
void
-GNUNET_setup_transport_https_checkbutton_realize_cb (GtkWidget * widget,
- gpointer user_data)
+GNUNET_setup_transport_http_client_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
{
- test_plugin (widget, "libgnunet_plugin_transport_https");
+ test_plugin (widget, "libgnunet_plugin_transport_http_client");
}
void
+GNUNET_setup_transport_https_server_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_https_server");
+}
+
+
+void
+GNUNET_setup_transport_https_client_checkbutton_realize_cb (GtkWidget * widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_https_client");
+}
+
+
+void
GNUNET_setup_transport_dv_checkbutton_realize_cb (GtkWidget * widget,
gpointer user_data)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24807 - in gnunet-gtk: contrib src/setup,
gnunet <=