tpaw-utils: move empathy_get_toplevel_window 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

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 8fe7af727c398a9cd5868b3e786d1b94404a2b9d..4344840e4f72564895c9700864c268aa3d286c50 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -28,6 +28,7 @@
 #include "empathy-individual-view.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-cell-renderer-expander.h"
@@ -2359,7 +2360,7 @@ individual_view_group_remove_activate_cb (GtkMenuItem *menuitem,
       text =
           g_strdup_printf (_("Do you really want to remove the group '%s'?"),
           group);
-      parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+      parent = tpaw_get_toplevel_window (GTK_WIDGET (view));
       if (individual_view_remove_dialog_show (parent, _("Removing group"),
               text) == REMOVE_DIALOG_RESPONSE_DELETE)
         {

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index cd7462081a6c235f2778624e8ac7085c6cc854db..c230324bb9a90e874d7ac99b3632905e9f06ec3e 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -851,21 +851,6 @@ empathy_window_present (GtkWindow *window)
   empathy_window_present_with_time (window, gtk_get_current_event_time ());
 }
 
-GtkWindow *
-empathy_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;
-}
-
 /** empathy_make_absolute_url_len:
  * @url: an url
  * @len: a length

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 13559d80b03bd6ba70ae610227cd3b16011d9b93..f9627f7fe901a3fd89b7d0de5cc03c5aa47dce47 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -98,7 +98,6 @@ gchar * empathy_filename_from_icon_name (const gchar *icon_name,
 void empathy_window_present (GtkWindow *window);
 void empathy_window_present_with_time (GtkWindow *window,
     guint32 timestamp);
-GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
 
 void empathy_move_to_window_desktop (GtkWindow *window,
     guint32 timestamp);

diff --git a/tp-account-widgets/tpaw-avatar-chooser.c b/tp-account-widgets/tpaw-avatar-chooser.c
index 6813cb673f40f189b193fe1221e33ddee89e17c2..6a5b83b427a07e570e5ae3306a85522c23fc255f 100644 (file)
--- 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 7a01a56f0a5250076fcd85440de607ff17baf178..6e6aeb73b1d6c9e71bfcc32296b4d0f409d401df 100644 (file)
--- 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 b373dac9cd9085a4a26bb43c1b6ac480ead4c60b..7c0a03082d77b39bb2e82b0a1d2e776be97d537a 100644 (file)
--- 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 c648ae804c3c8e8df927e3f54bcf3d4c9120f583..106c3b4e4facbb5d3718faf104e03e69c98c46f9 100644 (file)
--- 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) \