summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-02-22 11:32:10 +0100
committerStefano Karapetsas <[email protected]>2014-02-22 11:32:10 +0100
commit838555a41dc08a870b408628f529b66e2c8c4054 (patch)
tree6be25b6ce5cc28e4303ebd1b6e8b5552c4d38d26
parentce82ba10c09a96dc5388f06ecb2891826a15272d (diff)
parentd1920da2d961deca7052f8b4e508c7621895de71 (diff)
downloadmate-panel-838555a41dc08a870b408628f529b66e2c8c4054.tar.bz2
mate-panel-838555a41dc08a870b408628f529b66e2c8c4054.tar.xz
Merge pull request #171 from dnk/transient_parent_xid
transient_parent_xid is not used
-rw-r--r--applets/clock/clock-location-tile.c17
-rw-r--r--applets/clock/clock-location.c1
-rw-r--r--applets/clock/clock-location.h1
-rw-r--r--applets/clock/clock.c7
4 files changed, 1 insertions, 25 deletions
diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c
index 1ff428ab..1dd8d23b 100644
--- a/applets/clock/clock-location-tile.c
+++ b/applets/clock/clock-location-tile.c
@@ -194,25 +194,8 @@ static void
make_current (GtkWidget *widget, ClockLocationTile *tile)
{
ClockLocationTilePrivate *priv = PRIVATE (tile);
- GtkWidget *toplevel;
- guint xid;
-
- xid = 0;
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tile));
-
- if (toplevel) {
- GdkWindow *window = gtk_widget_get_window (toplevel);
-
- if (window)
-#if GTK_CHECK_VERSION (3, 0, 0)
- xid = GDK_WINDOW_XID (window);
-#else
- xid = GDK_WINDOW_XWINDOW (window);
-#endif
- }
clock_location_make_current (priv->location,
- xid,
(GFunc)make_current_cb, tile, NULL);
}
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
index efbc5939..ca785889 100644
--- a/applets/clock/clock-location.c
+++ b/applets/clock/clock-location.c
@@ -537,7 +537,6 @@ free_make_current_data (gpointer data)
void
clock_location_make_current (ClockLocation *loc,
- guint transient_parent_xid,
GFunc callback,
gpointer data,
GDestroyNotify destroy)
diff --git a/applets/clock/clock-location.h b/applets/clock/clock-location.h
index ae2275aa..7b59d359 100644
--- a/applets/clock/clock-location.h
+++ b/applets/clock/clock-location.h
@@ -67,7 +67,6 @@ void clock_location_localtime (ClockLocation *loc, struct tm *tm);
gboolean clock_location_is_current (ClockLocation *loc);
void clock_location_make_current (ClockLocation *loc,
- guint transient_parent_xid,
GFunc callback,
gpointer data,
GDestroyNotify destroy);
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 347dfefc..ef35eff4 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -2118,12 +2118,7 @@ location_start_element (GMarkupParseContext *context,
latitude, longitude, code, &prefs);
if (current && clock_location_is_current_timezone (loc))
-#if GTK_CHECK_VERSION (3, 0, 0)
- clock_location_make_current (loc, GDK_WINDOW_XID (gtk_widget_get_window (cd->applet)),
-#else
- clock_location_make_current (loc, GDK_WINDOW_XWINDOW (gtk_widget_get_window (cd->applet)),
-#endif
- NULL, NULL, NULL);
+ clock_location_make_current (loc, NULL, NULL, NULL);
data->cities = g_list_append (data->cities, loc);
}