[GNUnet-SVN] r18549 - in gnunet-gtk: contrib src/lib

[gnunet]

Author: grothoff
Date: 2011-12-11 12:02:37 +0100 (Sun, 11 Dec 2011)
New Revision: 18549

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade.in
   gnunet-gtk/src/lib/about.c
Log:
-LRN: Simplify visibility management

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade.in
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade.in      2011-12-11 
11:01:54 UTC (rev 18548)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade.in      2011-12-11 
11:02:37 UTC (rev 18549)
@@ -208,10 +208,11 @@
         <child>
           <object class="GtkScrolledWindow" id="about_license_scroller">
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">out</property>
             <child>
               <object class="GtkTextView" id="about_license_textview">
+                <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="editable">False</property>
                 <property name="wrap_mode">word</property>

Modified: gnunet-gtk/src/lib/about.c
===================================================================
--- gnunet-gtk/src/lib/about.c  2011-12-11 11:01:54 UTC (rev 18548)
+++ gnunet-gtk/src/lib/about.c  2011-12-11 11:02:37 UTC (rev 18549)
@@ -39,26 +39,21 @@
 about_window_show_exclusively (GtkBuilder *builder, gchar *name)
 {
   GtkWidget *about_credits_notebook;
-  GtkWidget *about_license_textview;
   GtkWidget *about_license_scroller;
   about_credits_notebook = GTK_WIDGET (gtk_builder_get_object (builder, 
"about_credits_notebook"));
-  about_license_textview = GTK_WIDGET (gtk_builder_get_object (builder, 
"about_license_textview"));
   about_license_scroller = GTK_WIDGET (gtk_builder_get_object (builder, 
"about_license_scroller"));
   if (name == NULL)
   {
     gtk_widget_hide (about_credits_notebook);
-    gtk_widget_hide (about_license_textview);
     gtk_widget_hide (about_license_scroller);
   }
   else if (strcmp ("about_credits_notebook", name) == 0)
   {
     gtk_widget_show (about_credits_notebook);
-    gtk_widget_hide (about_license_textview);
     gtk_widget_hide (about_license_scroller);
   }
-  else if (strcmp ("about_license_textview", name) == 0)
+  else if (strcmp ("about_license_scroller", name) == 0)
   {
-    gtk_widget_show (about_license_textview);
     gtk_widget_show (about_license_scroller);
     gtk_widget_hide (about_credits_notebook);
   }
@@ -76,7 +71,6 @@
     gtk_text_buffer_set_text (license_contents, license, -1);
     g_free (license);
   }
-  about_window_show_exclusively (builder, NULL);
 }
 
 G_MODULE_EXPORT void
@@ -106,7 +100,7 @@
 GNUNET_GTK_about_license_button_clicked (GtkButton *widget, gpointer user_data)
 {
   GtkBuilder *builder = GTK_BUILDER (user_data);
-  about_window_show_exclusively (builder, "about_license_textview");
+  about_window_show_exclusively (builder, "about_license_scroller");
 }
 
 /**