4 files changed, 28 insertions, 5 deletions
diff --git a/tp-account-widgets/tpaw-avatar-chooser.c b/tp-account-widgets/tpaw-avatar-chooser.c
index 6813cb673..6a5b83b42 100644
--- a/tp-account-widgets/tpaw-avatar-chooser.c
+++ b/tp-account-widgets/tpaw-avatar-chooser.c
@@ -950,7 +950,7 @@ choose_avatar_from_webcam (GtkWidget *widget,
   window = cheese_avatar_chooser_new ();
 
   gtk_window_set_transient_for (GTK_WINDOW (window),
-      GTK_WINDOW (empathy_get_toplevel_window (GTK_WIDGET (self))));
+      GTK_WINDOW (tpaw_get_toplevel_window (GTK_WIDGET (self))));
   gtk_window_set_modal (GTK_WINDOW (window), TRUE);
   g_signal_connect (G_OBJECT (window), "response",
       G_CALLBACK (webcam_response_cb), self);
@@ -1023,7 +1023,7 @@ avatar_chooser_clicked_cb (GtkWidget *button,
 
   self->priv->chooser_dialog = GTK_FILE_CHOOSER (
       gtk_file_chooser_dialog_new (_("Select Your Avatar Image"),
-        empathy_get_toplevel_window (GTK_WIDGET (self)),
+        tpaw_get_toplevel_window (GTK_WIDGET (self)),
         GTK_FILE_CHOOSER_ACTION_OPEN,
         NULL, NULL));
 
diff --git a/tp-account-widgets/tpaw-irc-network-chooser.c b/tp-account-widgets/tpaw-irc-network-chooser.c
index 7a01a56f0..6e6aeb73b 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser.c
@@ -24,6 +24,7 @@
 
 #include "tpaw-irc-network-chooser-dialog.h"
 #include "tpaw-irc-network-manager.h"
+#include "tpaw-utils.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
@@ -322,7 +323,7 @@ clicked_cb (GtkButton *button,
   if (priv->dialog != NULL)
     goto out;
 
-  window = empathy_get_toplevel_window (GTK_WIDGET (button));
+  window = tpaw_get_toplevel_window (GTK_WIDGET (button));
 
   priv->dialog = tpaw_irc_network_chooser_dialog_new (priv->settings,
       priv->network, window);
diff --git a/tp-account-widgets/tpaw-utils.c b/tp-account-widgets/tpaw-utils.c
index b373dac9c..7c0a03082 100644
--- a/tp-account-widgets/tpaw-utils.c
+++ b/tp-account-widgets/tpaw-utils.c
@@ -1,9 +1,11 @@
 /*
- * Copyright (C) 2009-2013 Collabora Ltd.
+ * Copyright (C) 2007-2013 Collabora Ltd.
+ * Copyright (C) 2006 Xavier Claessens <xavier.claessens@gmail.com>
  *
  * Authors: Marco Barisione <marco.barisione@collabora.co.uk>
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  *          Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+ *          Xavier Claessens <xavier.claessens@collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -166,3 +168,18 @@ tpaw_make_color_whiter (GdkRGBA *color)
   color->green = (color->green + white.green) / 2;
   color->blue = (color->blue + white.blue) / 2;
 }
+
+GtkWindow *
+tpaw_get_toplevel_window (GtkWidget *widget)
+{
+  GtkWidget *toplevel;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  toplevel = gtk_widget_get_toplevel (widget);
+  if (GTK_IS_WINDOW (toplevel) &&
+      gtk_widget_is_toplevel (toplevel))
+    return GTK_WINDOW (toplevel);
+
+  return NULL;
+}
diff --git a/tp-account-widgets/tpaw-utils.h b/tp-account-widgets/tpaw-utils.h
index c648ae804..106c3b4e4 100644
--- a/tp-account-widgets/tpaw-utils.h
+++ b/tp-account-widgets/tpaw-utils.h
@@ -1,9 +1,11 @@
 /*
- * Copyright (C) 2009-2013 Collabora Ltd.
+ * Copyright (C) 2007-2013 Collabora Ltd.
+ * Copyright (C) 2006 Xavier Claessens <xavier.claessens@gmail.com>
  *
  * Authors: Marco Barisione <marco.barisione@collabora.co.uk>
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  *          Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+ *          Xavier Claessens <xavier.claessens@collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,6 +40,9 @@ const gchar *tpaw_service_name_to_display_name (const gchar *proto_name);
 
 void  tpaw_make_color_whiter (GdkRGBA *color);
 
+/* Windows */
+GtkWindow * tpaw_get_toplevel_window (GtkWidget *widget);
+
 /* Copied from wocky/wocky-utils.h */
 
 #define tpaw_implement_finish_void(source, tag) \