rpms/gnome-panel/devel gnome-panel.spec, 1.263, 1.264 less-resizing.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1219

Modified Files:
	gnome-panel.spec less-resizing.patch 
Log Message:
fix the last patch



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- gnome-panel.spec	20 Feb 2008 05:12:54 -0000	1.263
+++ gnome-panel.spec	20 Feb 2008 17:22:14 -0000	1.264
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.21.91
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
@@ -365,6 +365,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Feb 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-7
+- Make the last patch work 
+
 * Wed Feb 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-6
 - Try harder to avoid resizing the popup 
 

less-resizing.patch:

Index: less-resizing.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/less-resizing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- less-resizing.patch	20 Feb 2008 05:12:54 -0000	1.1
+++ less-resizing.patch	20 Feb 2008 17:22:14 -0000	1.2
@@ -1,6 +1,7 @@
---- gnome-panel-2.21.91/applets/clock/clock.c	2008-02-20 00:06:57.000000000 -0500
-+++ hacked/applets/clock/clock.c	2008-02-19 23:05:48.000000000 -0500
-@@ -1074,6 +1074,7 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.less-resizing gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.less-resizing	2008-02-20 11:46:30.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock.c	2008-02-20 11:46:30.000000000 -0500
+@@ -1074,6 +1074,7 @@ location_tile_timezone_set_cb (ClockLoca
          ClockData *cd = data;
  
          clock_map_refresh (CLOCK_MAP (cd->map_widget));
@@ -8,9 +9,10 @@
  }
  
  static void
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c	2008-02-20 00:06:57.000000000 -0500
-+++ hacked/applets/clock/clock-location-tile.c	2008-02-20 00:03:52.000000000 -0500
-@@ -42,6 +42,8 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing	2008-02-20 11:46:30.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c	2008-02-20 12:03:00.000000000 -0500
+@@ -42,6 +42,8 @@ typedef struct {
          GtkWidget *current_button;
          GtkWidget *current_label;
          GtkWidget *current_marker;
@@ -19,7 +21,7 @@
          GtkSizeGroup *button_group;
  
          GtkWidget *weather_icon;
-@@ -157,6 +159,11 @@
+@@ -157,6 +159,11 @@ clock_location_tile_finalize (GObject *g
                  priv->button_group = NULL;
          }
  
@@ -31,7 +33,7 @@
          G_OBJECT_CLASS (clock_location_tile_parent_class)->finalize (g_obj);
  }
  
-@@ -213,25 +220,43 @@
+@@ -213,25 +220,43 @@ enter_or_leave_tile (GtkWidget          
  	if (event->mode != GDK_CROSSING_NORMAL) {
  		return TRUE;
  	}
@@ -85,7 +87,7 @@
  }
  
  static void
-@@ -241,6 +266,7 @@
+@@ -241,6 +266,7 @@ clock_location_tile_fill (ClockLocationT
  	GtkWidget *align;
          GtkWidget *strut;
          GtkWidget *box;
@@ -93,7 +95,7 @@
  
          priv->box = gtk_event_box_new ();
  
-@@ -278,8 +304,16 @@
+@@ -278,8 +304,16 @@ clock_location_tile_fill (ClockLocationT
          gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
          gtk_box_pack_start (GTK_BOX (box), priv->time_label, FALSE, FALSE, 0);
  
@@ -110,7 +112,7 @@
          gtk_widget_show (priv->current_label);
          gtk_widget_set_no_show_all (priv->current_button, TRUE);
          gtk_container_add (GTK_CONTAINER (priv->current_button), priv->current_label);
-@@ -289,15 +323,25 @@
+@@ -289,15 +323,29 @@ clock_location_tile_fill (ClockLocationT
  	gtk_misc_set_alignment (GTK_MISC (priv->current_marker), 1.0, 0.5);
  	gtk_widget_set_no_show_all (priv->current_marker, TRUE);
  
@@ -133,10 +135,14 @@
 +        gtk_size_group_add_widget (priv->current_group, priv->current_marker);
 +        gtk_size_group_add_widget (priv->current_group, priv->current_spacer);
 +	
++	gtk_widget_show (priv->current_button);
++	gtk_widget_show (priv->current_marker);
++	gtk_widget_show (priv->current_spacer);
++
          g_signal_connect (priv->current_button, "clicked",
                            G_CALLBACK (make_current), this);
  
-@@ -443,11 +487,18 @@
+@@ -443,11 +491,16 @@ clock_location_tile_refresh (ClockLocati
  	g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
  
          if (clock_location_is_current (priv->location)) {
@@ -145,11 +151,9 @@
 -        }
 -        else {
 -                gtk_widget_hide (priv->current_marker);
-+		if (!GTK_WIDGET_VISIBLE (priv->current_marker)) {
-+			gtk_widget_hide (priv->current_spacer);
-+			gtk_widget_hide (priv->current_button);
-+			gtk_widget_show (priv->current_marker);
-+		}
++		gtk_widget_hide (priv->current_spacer);
++		gtk_widget_hide (priv->current_button);
++		gtk_widget_show (priv->current_marker);
 +	}
 +	else {
 +		if (GTK_WIDGET_VISIBLE (priv->current_marker)) {