rpms/gnome-panel/devel gnome-panel.spec, 1.257, 1.258 localtime.patch, 1.1, 1.2
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sun Feb 17 23:58:17 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20518
Modified Files:
gnome-panel.spec localtime.patch
Log Message:
fix patch
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- gnome-panel.spec 17 Feb 2008 20:56:40 -0000 1.257
+++ gnome-panel.spec 17 Feb 2008 23:57:28 -0000 1.258
@@ -163,8 +163,8 @@
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
%patch15 -p1 -b .localtime
-%patch16 -p1 -b .pref-dialogs
-%patch17 -p1 -b .set-button
+#%patch16 -p1 -b .pref-dialogs
+#%patch17 -p1 -b .set-button
. %{SOURCE6}
localtime.patch:
Index: localtime.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/localtime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- localtime.patch 17 Feb 2008 20:56:40 -0000 1.1
+++ localtime.patch 17 Feb 2008 23:57:28 -0000 1.2
@@ -1,6 +1,30 @@
---- gnome-panel-2.21.91/applets/clock/clock.c 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/clock.c 2008-02-16 01:23:14.000000000 -0500
-@@ -508,7 +508,7 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime gnome-panel-2.21.91/applets/clock/clock-location-tile.h
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime 2008-02-11 16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 18:50:25.000000000 -0500
+@@ -28,7 +28,8 @@ typedef struct
+ void (* tile_pressed) (ClockLocationTile *tile);
+ void (* timezone_set) (ClockLocationTile *tile);
+ void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char *temperature);
+- char *(* need_formatted_time) (ClockLocationTile *tile);
++ char *(* need_formatted_time) (ClockLocationTile *tile);
++ int (* need_clock_format) (ClockLocationTile *tile);
+ } ClockLocationTileClass;
+
+ GType clock_location_tile_get_type (void);
+@@ -40,7 +41,8 @@ ClockLocation *clock_location_tile_get_l
+
+ void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
+
+-void clock_location_tile_refresh (ClockLocationTile *this);
++void clock_location_tile_refresh (ClockLocationTile *this,
++ gboolean force_refresh);
+
+ G_END_DECLS
+ #endif /* __CLOCK_H__ */
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.localtime gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.localtime 2008-02-11 16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 18:50:25.000000000 -0500
+@@ -508,7 +508,7 @@ update_location_tiles (ClockData *cd)
ClockLocationTile *tile;
tile = CLOCK_LOCATION_TILE (l->data);
@@ -9,7 +33,7 @@
}
}
-@@ -1084,12 +1084,12 @@
+@@ -1084,12 +1084,12 @@ location_tile_weather_updated_cb (ClockL
gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temperature);
}
@@ -25,7 +49,7 @@
}
static void
-@@ -1133,8 +1133,10 @@
+@@ -1133,8 +1133,10 @@ create_cities_section (ClockData *cd)
G_CALLBACK (location_tile_timezone_set_cb), cd);
g_signal_connect (city, "weather-updated",
G_CALLBACK (location_tile_weather_updated_cb), cd);
@@ -38,30 +62,9 @@
gtk_box_pack_start (GTK_BOX (cd->cities_section),
GTK_WIDGET (city),
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/clock-location-tile.h 2008-02-16 23:42:35.000000000 -0500
-@@ -28,7 +28,8 @@
- void (* tile_pressed) (ClockLocationTile *tile);
- void (* timezone_set) (ClockLocationTile *tile);
- void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char *temperature);
-- char *(* need_formatted_time) (ClockLocationTile *tile);
-+ char *(* need_formatted_time) (ClockLocationTile *tile);
-+ int (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
-
- GType clock_location_tile_get_type (void);
-@@ -40,7 +41,8 @@
-
- void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
-
--void clock_location_tile_refresh (ClockLocationTile *this);
-+void clock_location_tile_refresh (ClockLocationTile *this,
-+ gboolean force_refresh);
-
- G_END_DECLS
- #endif /* __CLOCK_H__ */
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/clock-location-tile.c 2008-02-16 01:24:40.000000000 -0500
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime 2008-02-11 16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 18:57:08.000000000 -0500
@@ -11,6 +11,7 @@
#include "clock-face.h"
#include "clock-location-tile.h"
@@ -70,7 +73,7 @@
#include "clock-marshallers.h"
#include "set-timezone.h"
-@@ -21,6 +22,7 @@
+@@ -21,6 +22,7 @@ enum {
TIMEZONE_SET,
WEATHER_UPDATED,
NEED_FORMATTED_TIME,
@@ -78,7 +81,7 @@
LAST_SIGNAL
};
-@@ -130,6 +132,15 @@
+@@ -130,6 +132,15 @@ clock_location_tile_class_init (ClockLoc
NULL,
_clock_marshal_STRING__VOID,
G_TYPE_STRING, 0);
@@ -94,7 +97,7 @@
}
static void
-@@ -310,7 +321,7 @@
+@@ -310,7 +321,7 @@ clock_location_tile_fill (ClockLocationT
gtk_container_add (GTK_CONTAINER (priv->box), alignment);
gtk_container_add (GTK_CONTAINER (this), priv->box);
@@ -103,7 +106,7 @@
}
static gboolean
-@@ -378,13 +389,72 @@
+@@ -378,13 +389,72 @@ emit_weather_updated (ClockLocationTile
g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
}
@@ -149,10 +152,10 @@
+ minutes = labs (offset % 3600) / 60;
+
+ if (hours != 0 && minutes != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+d:%d</small>", buf, tzname, hours, minutes);
++ tmp = g_strdup_printf ("%s <small>%s %+ld:%ld</small>", buf, tzname, hours, minutes);
+ }
+ else if (hours != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+d</small>", buf, tzname, hours);
++ tmp = g_strdup_printf ("%s <small>%s %+ld</small>", buf, tzname, hours);
+ }
+ else {
+ tmp = g_strdup_printf ("%s <small>%s</small>", buf, tzname);
@@ -178,7 +181,7 @@
g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-@@ -411,7 +481,7 @@
+@@ -411,7 +481,7 @@ clock_location_tile_refresh (ClockLocati
clock_face_refresh (CLOCK_FACE (priv->clock_face));
}
@@ -187,7 +190,7 @@
return;
}
-@@ -426,26 +496,15 @@
+@@ -426,26 +496,15 @@ clock_location_tile_refresh (ClockLocati
gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
g_free (tmp);
@@ -217,3 +220,12 @@
}
void
+diff -up gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime gnome-panel-2.21.91/applets/clock/clock-marshallers.list
+--- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-17 18:51:58.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17 18:51:26.000000000 -0500
+@@ -3,4 +3,4 @@ VOID:OBJECT
+ VOID:POINTER
+ POINTER:VOID
+ VOID:OBJECT,STRING
+-STRING:VOID
++INT:VOID
More information about the fedora-extras-commits
mailing list