Use gnome_vfs_url_show() instead of gnome_url_show() to avoid libgnomeui

2007-06-02  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/gossip-ui-utils.c:
	* libempathy-gtk/gossip-ui-utils.h:
	* configure.ac: Use gnome_vfs_url_show() instead of gnome_url_show()
	to avoid libgnomeui dependency (Ross Burton).

svn path=/trunk/; revision=112

diff --git a/ChangeLog b/ChangeLog
index 2cf1449d98d4b1afb643332056133e1b62c76437..d2a9fb20d8a44563ac7abdbe7eb327bacf6ff02c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-02  Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/gossip-ui-utils.c:
+       * libempathy-gtk/gossip-ui-utils.h:
+       * configure.ac: Use gnome_vfs_url_show() instead of gnome_url_show()
+       to avoid libgnomeui dependency (Ross Burton).
+
 2007-06-01  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/gossip-chatrooms-window.c:

diff --git a/configure.ac b/configure.ac
index b166120a701bf26b73c3979661e4102af8a41e6e..7a6ade7a49911fce88a14bd9fd4c96d2e45ee24e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,12 +65,14 @@ PKG_CHECK_MODULES(EMPATHY,
 [
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
-   gtk+-2.0 >= $GTK_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
-   libglade-2.0 >= $LIBGLADE_REQUIRED
-   libgnomeui-2.0
+   libxml-2.0
+   gnome-vfs-2.0
    libtelepathy >= $TELEPATHY_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+   gtk+-2.0 >= $GTK_REQUIRED
+   libglade-2.0 >= $LIBGLADE_REQUIRED
+   libgnomeui-2.0
 ])
 
 PKG_CHECK_MODULES(MISSION_CONTROL_PLUGINS,

diff --git a/libempathy-gtk/gossip-ui-utils.c b/libempathy-gtk/gossip-ui-utils.c
index cf12a51bb00e867427e0e7abbd10bab71a5fc3fb..e211bf169aed2d19610c4e9bd164da76cc37e757 100644 (file)
--- a/libempathy-gtk/gossip-ui-utils.c
+++ b/libempathy-gtk/gossip-ui-utils.c
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnome/libgnome.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
 
 #include <libmissioncontrol/mc-profile.h>
 
@@ -1279,14 +1279,15 @@ fixup_url (const gchar *url)
 void
 gossip_url_show (const char *url)
 {
-       gchar  *real_url;
-       GError *error = NULL;
+       gchar          *real_url;
+       GnomeVFSResult  res;
 
        real_url = fixup_url (url);
-       gnome_url_show (real_url, &error);
-       if (error) {
-               g_warning ("Couldn't show URL:'%s'", real_url);
-               g_error_free (error);
+       res = gnome_vfs_url_show (real_url);
+       if (res != GNOME_VFS_OK) {
+               gossip_debug (DEBUG_DOMAIN, "Couldn't show URL %s: %s",
+                             real_url,
+                             gnome_vfs_result_to_string (res));
        }
 
        g_free (real_url);
@@ -1314,13 +1315,6 @@ gossip_link_button_new (const gchar *url,
        return gtk_link_button_new_with_label (url, title);
 }
 
-/* FIXME: Do this in a proper way at some point, probably in GTK+? */
-void
-gossip_window_set_default_icon_name (const gchar *name)
-{
-       gtk_window_set_default_icon_name (name);
-}
-
 void
 gossip_toggle_button_set_state_quietly (GtkWidget *widget,
                                        GCallback  callback,

diff --git a/libempathy-gtk/gossip-ui-utils.h b/libempathy-gtk/gossip-ui-utils.h
index d1625cfe3247a75cc21e8f2cab3b89b35b338d29..9879937986ae2ce2d7b48dbc043445c688359f29 100644 (file)
--- a/libempathy-gtk/gossip-ui-utils.h
+++ b/libempathy-gtk/gossip-ui-utils.h
@@ -98,10 +98,7 @@ gboolean   gossip_text_iter_backward_search         (const GtkTextIter   *iter,
 gboolean   gossip_window_get_is_visible             (GtkWindow           *window);
 void       gossip_window_present                    (GtkWindow           *window,
                                                     gboolean             steal_focus);
-void       gossip_window_set_default_icon_name      (const gchar         *name);
-
 void       gossip_url_show                          (const char          *url);
-
 void       gossip_toggle_button_set_state_quietly   (GtkWidget           *widget,
                                                     GCallback            callback,
                                                     gpointer             user_data,