[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7163 - GNUnet/src/setup/gtk
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7163 - GNUnet/src/setup/gtk |
Date: |
Thu, 12 Jun 2008 13:03:01 -0600 (MDT) |
Author: grothoff
Date: 2008-06-12 13:03:01 -0600 (Thu, 12 Jun 2008)
New Revision: 7163
Modified:
GNUnet/src/setup/gtk/gnunet-setup.glade
GNUnet/src/setup/gtk/wizard_gtk.c
Log:
fixing crash and UI issues
Modified: GNUnet/src/setup/gtk/gnunet-setup.glade
===================================================================
--- GNUnet/src/setup/gtk/gnunet-setup.glade 2008-06-12 18:52:19 UTC (rev
7162)
+++ GNUnet/src/setup/gtk/gnunet-setup.glade 2008-06-12 19:03:01 UTC (rev
7163)
@@ -197,8 +197,7 @@
If your provider always assigns the same IP-Address to you (a "static"
IP-Address), enter it into the "IP-Address" field. If your IP-Address changes
every now and then ("dynamic" IP-Address) but there's a hostname that always
points to your actual IP-Address ("Dynamic DNS"), you can also enter it here.
If in doubt, leave the field empty. GNUnet will then try to determine your
IP-Address.
-
-If you are connected to the internet through another computer doing SNAT, a
router or a "hardware firewall" and other computers on the internet cannot
connect to this computer, check the last option on this page. Leave it
unchecked on direct connections through modems, ISDN cards and DNAT (also known
as "port forwarding").</property>
+</property>
</widget>
</child>
</widget>
@@ -223,7 +222,7 @@
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="border_width">5</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -244,24 +243,6 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chkFW">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Computer cannot receive inbound connections
(SNAT/Firewall)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_chkFW_toggled" object="chkFW"/>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkEntry" id="entIP">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -581,7 +562,6 @@
<property
name="use_underline">True</property>
<property name="response_id">0</property>
<property
name="draw_indicator">True</property>
- <property name="group">radShare</property>
<signal name="toggled"
handler="on_radGNUnet_toggled" object="radGNUnet"/>
</widget>
<packing>
@@ -1524,11 +1504,13 @@
<widget class="GtkAboutDialog" id="aboutdialog">
<property name="visible">True</property>
<property name="title" translatable="yes">About gnunet-setup</property>
+ <property name="icon">gnunet-logo-color.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="name">gnunet-setup</property>
- <property name="copyright" translatable="yes">(C) 2001-2007 Christian
Grothoff (and other contributing authors)</property>
+ <property name="program_name">gnunet-setup</property>
+ <property name="version">0.8.0</property>
+ <property name="copyright" translatable="yes">(C) 2001-2008 Christian
Grothoff (and other contributing authors)</property>
<property name="comments" translatable="yes">This is the configuration
tool for GNUnet.</property>
<property name="website">http://gnunet.org/</property>
<property name="website_label">http://gnunet.org/</property>
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-12 18:52:19 UTC (rev 7162)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-12 19:03:01 UTC (rev 7163)
@@ -152,7 +152,6 @@
load_step2setup_gtk (GtkButton * button, gpointer prev_window)
{
GtkWidget *entIP;
- GtkWidget *chkFW;
GtkTreeIter iter;
GtkListStore *model;
struct insert_nic_cls cls;
@@ -191,17 +190,6 @@
&val);
gtk_entry_set_text (GTK_ENTRY (entIP), val);
GNUNET_free (val);
-
- chkFW = lookup_widget ("chkFW");
-#if 0
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkFW),
- GNUNET_GC_get_configuration_value_yesno
- (editCfg, "NAT", "LIMITED",
- GNUNET_NO) == GNUNET_YES);
-#else
- gtk_widget_hide (chkFW);
-#endif
-
gtk_widget_show (curwnd);
}
@@ -280,16 +268,22 @@
#ifndef MINGW
if (NULL == uname || strlen (uname) == 0)
{
- if ((geteuid () == 0) || (NULL != getpwnam ("gnunet")))
- user_name = GNUNET_strdup ("gnunet");
+ struct passwd * pwd;
+
+ if ( (geteuid() == 0) && (NULL != getpwnam ("gnunet")))
+ user_name = GNUNET_strdup ("gnunet");
else
- {
- GNUNET_free_non_null (uname);
- uname = getenv ("USER");
- if (uname != NULL)
- user_name = GNUNET_strdup (uname);
- else
- user_name = NULL;
+ {
+ pwd = getpwuid(geteuid());
+ if (pwd != NULL)
+ user_name = GNUNET_strdup (pwd->pw_name);
+ else
+ {
+ if (NULL != getenv ("USER"))
+ user_name = GNUNET_strdup (getenv("USER"));
+ else
+ user_name = NULL;
+ }
}
}
else
@@ -525,17 +519,6 @@
void
-on_chkFW_toggledsetup_gtk (GtkToggleButton * togglebutton, gpointer user_data)
-{
-#if 0
- GNUNET_GC_set_configuration_value_choice (editCfg, err_ctx, "NAT",
- "LIMITED",
- gtk_toggle_button_get_active
- (togglebutton) ? "YES" : "NO");
-#endif
-}
-
-void
on_entUp_changedsetup_gtk (GtkEditable * editable, gpointer user_data)
{
gchar *ret;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7163 - GNUnet/src/setup/gtk,
gnunet <=