Merge pull request #171 from dnk/transient_parent_xid

transient_parent_xid is not used

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);
 }