gnome-panel r10982 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Thu Apr  3 22:05:09 2008
New Revision: 10982
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10982&view=rev

Log:
2008-04-03  Vincent Untz  <vuntz gnome org>

	Fix initial visibility of the appointments to actually follow the state
	of the expander. Fix bug #524296.

	* calendar-window.c: (create_task_list): add comment
	(create_list_for_appointment_model): add comment and change order of
	gtk_widget_show() and gtk_container_add() to fix the bug
	(add_child): simplify by calling expand_collapse_child()
	(calendar_window_pack_locations): add comment
	* clock.c: (locations_changed): add FIXME about a runtime warning


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/calendar-window.c
   trunk/applets/clock/clock.c

Modified: trunk/applets/clock/calendar-window.c
==============================================================================
--- trunk/applets/clock/calendar-window.c	(original)
+++ trunk/applets/clock/calendar-window.c	Thu Apr  3 22:05:09 2008
@@ -772,6 +772,9 @@
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
                                         GTK_POLICY_NEVER,
                                         GTK_POLICY_AUTOMATIC);
+	/* we show the widget before adding to the container, since adding to
+	 * the container changes the visibility depending on the state of the
+	 * expander */
         gtk_widget_show (scrolled);
         gtk_container_add (GTK_CONTAINER (list), scrolled);
 
@@ -943,8 +946,11 @@
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
                                         GTK_POLICY_NEVER,
                                         GTK_POLICY_AUTOMATIC);
-        gtk_container_add (GTK_CONTAINER (list), scrolled);
+	/* we show the widget before adding to the container, since adding to
+	 * the container changes the visibility depending on the state of the
+	 * expander */
         gtk_widget_show (scrolled);
+        gtk_container_add (GTK_CONTAINER (list), scrolled);
 
 	g_assert (calwin->priv->appointments_model != NULL);
 
@@ -1472,10 +1478,7 @@
                        GtkWidget    *child,
                        GtkExpander  *expander)
 {
-        gboolean expanded;
-
-        expanded = gtk_expander_get_expanded (expander);
-        g_object_set (child, "visible", expanded, NULL);
+	expand_collapse_child (child, expander);
 }
 
 static GtkWidget *
@@ -1555,6 +1558,9 @@
 							 KEY_LOCATIONS_EXPANDED,
 							 G_CALLBACK (edit_locations));
 
+	/* we show the widget before adding to the container, since adding to
+	 * the container changes the visibility depending on the state of the
+	 * expander */
 	gtk_widget_show (calwin->priv->locations_list);
 	gtk_container_add (GTK_CONTAINER (vbox), calwin->priv->locations_list);
 

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Thu Apr  3 22:05:09 2008
@@ -2096,6 +2096,7 @@
 			id = g_signal_connect (loc, "weather-updated",
 						G_CALLBACK (location_weather_updated_cb), cd);
 			g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER (id));
+			/* FIXME: there's no such signal? */
 			g_signal_connect (loc, "set-current", 
 					  G_CALLBACK (location_set_current_cb), cd);
 		}