diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-15 12:57:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-15 12:57:35 +0000 |
commit | 4ba15c3b7b47ed62c5f09785dd091c42dff2bb33 (patch) | |
tree | 01a741f0eb9277cb7087da08c9ac2e86f58ae9a8 | |
parent | d905c9bbc11fd9223a1d3bb71ef25dfad73280c0 (diff) | |
download | gnunet-gtk-4ba15c3b7b47ed62c5f09785dd091c42dff2bb33.tar.gz gnunet-gtk-4ba15c3b7b47ed62c5f09785dd091c42dff2bb33.zip |
-gads to gnu
-rw-r--r-- | contrib/gnunet_setup_gtk_main_window.glade | 7 | ||||
-rw-r--r-- | src/setup/gnunet-setup-options.c | 4 | ||||
-rw-r--r-- | src/setup/gnunet-setup.c | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade index d1d29bfb..f62bccd8 100644 --- a/contrib/gnunet_setup_gtk_main_window.glade +++ b/contrib/gnunet_setup_gtk_main_window.glade | |||
@@ -4236,7 +4236,7 @@ | |||
4236 | </packing> | 4236 | </packing> |
4237 | </child> | 4237 | </child> |
4238 | <child> | 4238 | <child> |
4239 | <object class="GtkVBox" id="GNUNET_setup_gads_vbox"> | 4239 | <object class="GtkVBox" id="GNUNET_setup_gns_vbox"> |
4240 | <property name="can_focus">False</property> | 4240 | <property name="can_focus">False</property> |
4241 | <child> | 4241 | <child> |
4242 | <object class="GtkHBox" id="GNUNET_setup_gns_top_hbox"> | 4242 | <object class="GtkHBox" id="GNUNET_setup_gns_top_hbox"> |
@@ -4601,11 +4601,10 @@ | |||
4601 | </packing> | 4601 | </packing> |
4602 | </child> | 4602 | </child> |
4603 | <child type="tab"> | 4603 | <child type="tab"> |
4604 | <object class="GtkLabel" id="GNUNET_setup_gads_label"> | 4604 | <object class="GtkLabel" id="GNUNET_setup_gnu_label"> |
4605 | <property name="visible">True</property> | 4605 | <property name="visible">True</property> |
4606 | <property name="can_focus">False</property> | 4606 | <property name="can_focus">False</property> |
4607 | <property name="label" translatable="yes">GAD_S</property> | 4607 | <property name="label" translatable="yes">GNU</property> |
4608 | <property name="use_underline">True</property> | ||
4609 | </object> | 4608 | </object> |
4610 | <packing> | 4609 | <packing> |
4611 | <property name="position">7</property> | 4610 | <property name="position">7</property> |
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c index f376961e..fd3e2252 100644 --- a/src/setup/gnunet-setup-options.c +++ b/src/setup/gnunet-setup-options.c | |||
@@ -781,10 +781,10 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = { | |||
781 | 781 | ||
782 | 782 | ||
783 | /** | 783 | /** |
784 | * Hide "gads" and "namestore" tabs if GNS not active. | 784 | * Hide "gnu" and "namestore" tabs if GNS not active. |
785 | */ | 785 | */ |
786 | static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tabs[] = { | 786 | static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tabs[] = { |
787 | {"GNUNET_setup_gads_vbox", "(^| )gns($| )", NULL}, | 787 | {"GNUNET_setup_gnu_vbox", "(^| )gns($| )", NULL}, |
788 | {"GNUNET_setup_namestore_vbox", "(^| )gns($| )", NULL}, | 788 | {"GNUNET_setup_namestore_vbox", "(^| )gns($| )", NULL}, |
789 | {NULL, NULL, NULL} | 789 | {NULL, NULL, NULL} |
790 | }; | 790 | }; |
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c index 1acd6237..5aa0a6b5 100644 --- a/src/setup/gnunet-setup.c +++ b/src/setup/gnunet-setup.c | |||
@@ -134,11 +134,11 @@ GNUNET_setup_notebook_switch_page_cb (GtkNotebook *notebook, | |||
134 | gpointer user_data) | 134 | gpointer user_data) |
135 | { | 135 | { |
136 | GtkWidget *help; | 136 | GtkWidget *help; |
137 | GtkWidget *gads; | 137 | GtkWidget *gnu; |
138 | 138 | ||
139 | help = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_help_text")); | 139 | help = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_help_text")); |
140 | gads = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gads_vbox")); | 140 | gnu = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gnu_vbox")); |
141 | if (gads == page) | 141 | if (gnu == page) |
142 | gtk_widget_hide (help); | 142 | gtk_widget_hide (help); |
143 | else | 143 | else |
144 | gtk_widget_show (help); | 144 | gtk_widget_show (help); |