summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-02-11 07:42:40 +0100
committerWolfgang Ulbrich <[email protected]>2016-02-12 07:04:31 +0100
commit2ce33ca53bc8b56f4cab9160197df44cc36082d4 (patch)
tree036d8aabdfeadbedac8886cf9c16072baf0b47bd
parentefd39dff439de0d4d1c112f994f0d80d9de541f4 (diff)
downloadmate-panel-2ce33ca53bc8b56f4cab9160197df44cc36082d4.tar.bz2
mate-panel-2ce33ca53bc8b56f4cab9160197df44cc36082d4.tar.xz
GTK+-3 clock: don't subclass deprecated GtkAlignment
taken from: https://git.gnome.org/browse/gnome-panel/commit/?id=c7ea765
-rw-r--r--applets/clock/clock-location-tile.c4
-rw-r--r--applets/clock/clock-location-tile.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c
index 73c9ca87..f759596c 100644
--- a/applets/clock/clock-location-tile.c
+++ b/applets/clock/clock-location-tile.c
@@ -22,7 +22,11 @@
#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
#endif
+#if GTK_CHECK_VERSION (3, 0, 0)
+G_DEFINE_TYPE (ClockLocationTile, clock_location_tile, GTK_TYPE_BIN)
+#else
G_DEFINE_TYPE (ClockLocationTile, clock_location_tile, GTK_TYPE_ALIGNMENT)
+#endif
enum {
TILE_PRESSED,
diff --git a/applets/clock/clock-location-tile.h b/applets/clock/clock-location-tile.h
index 00ccb5a8..28dea2bf 100644
--- a/applets/clock/clock-location-tile.h
+++ b/applets/clock/clock-location-tile.h
@@ -21,12 +21,20 @@ extern "C" {
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBin parent;
+#else
GtkAlignment parent;
+#endif
} ClockLocationTile;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBinClass parent_class;
+#else
GtkAlignmentClass parent_class;
+#endif
void (* tile_pressed) (ClockLocationTile *tile);
int (* need_clock_format) (ClockLocationTile *tile);