From 4598bce7db6276a9f1f9e21adef8723b646bf44b Mon Sep 17 00:00:00 2001
From: Marco Barisione <marco.barisione@collabora.co.uk>
Date: Fri, 10 May 2013 15:09:02 +0100
Subject: tpaw-utils: move empathy_window_present* to tp-aw and rename it

This commit also changes the licence of the moved code from GPL to LGPL.
See GOSSIP-RELICENSING.txt for details.

https://bugzilla.gnome.org/show_bug.cgi?id=699492
---
 src/empathy-call-window.c | 3 ++-
 src/empathy-call.c        | 3 ++-
 src/empathy-chat-window.c | 2 +-
 src/empathy-status-icon.c | 3 ++-
 src/empathy.c             | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5f10d919e..6c215b53b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -28,6 +28,7 @@
 #include <tp-account-widgets/tpaw-builder.h>
 #include <tp-account-widgets/tpaw-camera-monitor.h>
 #include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-about-dialog.h"
 #include "empathy-audio-sink.h"
@@ -2464,7 +2465,7 @@ empathy_call_window_new_handler (EmpathyCallWindow *self,
   g_return_if_fail (EMPATHY_IS_CALL_HANDLER (handler));
 
   if (present)
-    empathy_window_present_with_time (GTK_WINDOW (self), x11_time);
+    tpaw_window_present_with_time (GTK_WINDOW (self), x11_time);
 
   if (self->priv->call_state == DISCONNECTED)
     {
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 2b944552b..3d3ae80cf 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef CLUTTER_WINDOWING_X11
 #include <X11/Xlib.h>
@@ -162,7 +163,7 @@ new_call_handler_cb (EmpathyCallFactory *factory,
       gtk_widget_show (GTK_WIDGET (window));
 
       if (present)
-        empathy_window_present_with_time (GTK_WINDOW (window), x11_time);
+        tpaw_window_present_with_time (GTK_WINDOW (window), x11_time);
     }
 }
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 5f23b6a47..aa9811ef8 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -2854,7 +2854,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
 
   empathy_chat_window_switch_to_chat (self, chat);
 
-  /* Don't use empathy_window_present_with_time () which would move the window
+  /* Don't use tpaw_window_present_with_time () which would move the window
    * to our current desktop but move to the window's desktop instead. This is
    * more coherent with Shell's 'app is ready' notication which moves the view
    * to the app desktop rather than moving the app itself. */
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index e000f32e1..6d273cc03 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -23,6 +23,7 @@
 #include "empathy-status-icon.h"
 
 #include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-event-manager.h"
 #include "empathy-gsettings.h"
@@ -210,7 +211,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
 	if (!visible) {
 		gtk_widget_hide (priv->window);
 	} else {
-		empathy_window_present (GTK_WINDOW (priv->window));
+		tpaw_window_present (GTK_WINDOW (priv->window));
 	}
 }
 
diff --git a/src/empathy.c b/src/empathy.c
index 5cfe9f38b..4a36da61c 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -24,6 +24,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <clutter-gtk/clutter-gtk.h>
@@ -342,7 +343,7 @@ empathy_app_activate (GApplication *app)
   else
     {
       if (!self->start_hidden)
-        empathy_window_present (GTK_WINDOW (self->window));
+        tpaw_window_present (GTK_WINDOW (self->window));
     }
 
   /* Display the accounts dialog if needed */
-- 
cgit v1.2.3