rpms/gnome-panel/F-12 gnome-panel.spec, 1.384, 1.385 panel-padding.patch, 1.4, 1.5

Matthias Clasen mclasen at fedoraproject.org
Fri Nov 6 17:58:47 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27314

Modified Files:
	gnome-panel.spec panel-padding.patch 
Log Message:
Make padding work as intended between the first and second applet



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- gnome-panel.spec	2 Nov 2009 18:39:09 -0000	1.384
+++ gnome-panel.spec	6 Nov 2009 17:58:46 -0000	1.385
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -385,6 +385,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Nov  6 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-14
+- Revert the last change, it didn't have the desired effect
+
 * Mon Nov  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-13
 - Don't add padding before the first and after the last applet (#532410)
 

panel-padding.patch:
 panel-profile.c           |    3 ++
 panel-profile.h           |    5 +++-
 panel-toplevel.c          |   44 ++++++++++++++++++++++++++++++++++++++
 panel-toplevel.h          |    3 ++
 panel-toplevel.schemas.in |   13 +++++++++++
 panel-widget.c            |   52 +++++++++++++++++++++++++++++++++-------------
 6 files changed, 105 insertions(+), 15 deletions(-)

Index: panel-padding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/panel-padding.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- panel-padding.patch	2 Nov 2009 22:32:08 -0000	1.4
+++ panel-padding.patch	6 Nov 2009 17:58:46 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c
 --- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding	2009-09-21 12:29:33.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c	2009-11-02 11:24:47.453564521 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.c	2009-10-29 09:57:25.285484907 -0400
 @@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
  
  TOPLEVEL_GET_SET_FUNCS ("size",               toplevel,   int,  size,           int)
@@ -27,7 +27,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  	GET_BOOL ("auto_hide", auto_hide);
 diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h
 --- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h	2009-11-02 11:24:47.454552356 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.h	2009-10-29 09:57:25.285484907 -0400
 @@ -92,7 +92,10 @@ void        panel_profile_set_toplevel_e
  						       gboolean       expand);
  gboolean    panel_profile_get_toplevel_expand         (PanelToplevel *toplevel);
@@ -42,7 +42,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  gboolean    panel_profile_get_toplevel_auto_hide      (PanelToplevel *toplevel);
 diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
 --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding	2009-08-21 06:31:49.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c	2009-11-02 11:24:47.455802306 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c	2009-10-29 09:57:25.287500667 -0400
 @@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
  	gboolean                expand;
  	PanelOrientation        orientation;
@@ -131,7 +131,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  {
 diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
 --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding	2009-08-19 11:28:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h	2009-11-02 11:24:47.456802503 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h	2009-10-29 09:57:25.288484940 -0400
 @@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
  void                 panel_toplevel_set_expand             (PanelToplevel       *toplevel,
  							    gboolean             expand);
@@ -144,7 +144,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  PanelOrientation     panel_toplevel_get_orientation        (PanelToplevel       *toplevel);
 diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
 --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in	2009-11-02 11:24:47.456802503 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in	2009-10-29 09:57:25.288484940 -0400
 @@ -103,6 +103,19 @@
      </schema>
   
@@ -167,7 +167,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
        <type>int</type>
 diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c
 --- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding	2009-08-11 07:32:38.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-11-02 13:35:15.647553899 -0500
++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-10-29 10:10:43.531226534 -0400
 @@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
  {
  	AppletData *ad;
@@ -298,12 +298,7 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  		}
  	}
  
-@@ -1329,16 +1350,19 @@ static void
- panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
- {
- 	PanelWidget *panel;
--	GList *list;
-+	GList *list, *last;
+@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
  	int i;
  	int old_size;
  	gboolean ltr;
@@ -319,37 +314,30 @@ diff -up gnome-panel-2.28.0/gnome-panel/
  	old_size = panel->size;
  	ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
  	
-@@ -1405,6 +1429,8 @@ panel_widget_size_allocate(GtkWidget *wi
+@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ 			}
  			ad->min_cells  = ad->cells;
  			gtk_widget_size_allocate(ad->applet,&challoc);
- 			i += ad->cells;
-+			if (list != panel->applet_list)
-+				i += padding;
+-			i += ad->cells;
++			i += ad->cells + padding;
  		}
  
  		/* EEEEK, there might be not enough room and we don't handle
-@@ -1440,11 +1466,14 @@ panel_widget_size_allocate(GtkWidget *wi
+@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ 			if (ad->constrained < i)
  				ad->constrained = i;
  
- 			i = ad->constrained + ad->cells;
-+			if (list != panel->applet_list)
-+				i += padding;
+-			i = ad->constrained + ad->cells;
++			i = ad->constrained + ad->cells + padding;
  		}
  
  		/* Now expand from the right */
- 		i = panel->size;
--		for(list = g_list_last(panel->applet_list);
-+		last = g_list_last(panel->applet_list);
-+		for(list = last;
- 		    list!=NULL;
- 		    list = g_list_previous(list)) {
- 			AppletData *ad = list->data;
-@@ -1465,6 +1494,8 @@ panel_widget_size_allocate(GtkWidget *wi
+@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ 				ad->cells = cells;
  			}
  
- 			i = ad->constrained;
-+			if (list != last)
-+				i -= padding;
+-			i = ad->constrained;
++			i = ad->constrained - padding;
  		}
  
  		/* EEEEK, there's not enough room, so shift applets even

More information about the scm-commits mailing list