rpms/gnome-panel/devel gnome-panel.spec, 1.258, 1.259 localtime.patch, 1.2, 1.3
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Mon Feb 18 00:30:20 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27957
Modified Files:
gnome-panel.spec localtime.patch
Log Message:
try again
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- gnome-panel.spec 17 Feb 2008 23:57:28 -0000 1.258
+++ gnome-panel.spec 18 Feb 2008 00:29:34 -0000 1.259
@@ -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- localtime.patch 17 Feb 2008 23:57:28 -0000 1.2
+++ localtime.patch 18 Feb 2008 00:29:34 -0000 1.3
@@ -1,17 +1,16 @@
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
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 19:26:15.000000000 -0500
+@@ -28,7 +28,7 @@ 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
+@@ -40,7 +40,8 @@ ClockLocation *clock_location_tile_get_l
void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
@@ -23,7 +22,7 @@
#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
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 19:25:23.000000000 -0500
@@ -508,7 +508,7 @@ update_location_tiles (ClockData *cd)
ClockLocationTile *tile;
@@ -64,7 +63,7 @@
GTK_WIDGET (city),
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
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 19:26:03.000000000 -0500
@@ -11,6 +11,7 @@
#include "clock-face.h"
#include "clock-location-tile.h"
@@ -73,18 +72,27 @@
#include "clock-marshallers.h"
#include "set-timezone.h"
-@@ -21,6 +22,7 @@ enum {
+@@ -20,7 +21,7 @@ enum {
+ TILE_PRESSED,
TIMEZONE_SET,
WEATHER_UPDATED,
- NEED_FORMATTED_TIME,
+- NEED_FORMATTED_TIME,
+ NEED_CLOCK_FORMAT,
LAST_SIGNAL
};
-@@ -130,6 +132,15 @@ clock_location_tile_class_init (ClockLoc
- NULL,
- _clock_marshal_STRING__VOID,
- G_TYPE_STRING, 0);
+@@ -122,14 +123,15 @@ clock_location_tile_class_init (ClockLoc
+ G_TYPE_NONE, 2,
+ G_TYPE_OBJECT,
+ G_TYPE_STRING);
+- signals[NEED_FORMATTED_TIME] = g_signal_new ("need-formatted-time",
+- G_TYPE_FROM_CLASS (g_obj_class),
+- G_SIGNAL_RUN_LAST,
+- G_STRUCT_OFFSET (ClockLocationTileClass, need_formatted_time),
+- NULL,
+- NULL,
+- _clock_marshal_STRING__VOID,
+- G_TYPE_STRING, 0);
+
+ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
+ G_TYPE_FROM_CLASS (g_obj_class),
@@ -97,7 +105,7 @@
}
static void
-@@ -310,7 +321,7 @@ clock_location_tile_fill (ClockLocationT
+@@ -310,7 +312,7 @@ clock_location_tile_fill (ClockLocationT
gtk_container_add (GTK_CONTAINER (priv->box), alignment);
gtk_container_add (GTK_CONTAINER (this), priv->box);
@@ -106,7 +114,7 @@
}
static gboolean
-@@ -378,13 +389,72 @@ emit_weather_updated (ClockLocationTile
+@@ -378,13 +380,72 @@ emit_weather_updated (ClockLocationTile
g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
}
@@ -181,7 +189,7 @@
g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-@@ -411,7 +481,7 @@ clock_location_tile_refresh (ClockLocati
+@@ -411,7 +472,7 @@ clock_location_tile_refresh (ClockLocati
clock_face_refresh (CLOCK_FACE (priv->clock_face));
}
@@ -190,7 +198,7 @@
return;
}
-@@ -426,26 +496,15 @@ clock_location_tile_refresh (ClockLocati
+@@ -426,26 +487,15 @@ clock_location_tile_refresh (ClockLocati
gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
g_free (tmp);
@@ -221,8 +229,8 @@
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
+--- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-11 16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17 19:25:23.000000000 -0500
@@ -3,4 +3,4 @@ VOID:OBJECT
VOID:POINTER
POINTER:VOID
More information about the fedora-extras-commits
mailing list