diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | libempathy-gtk/gossip-ui-utils.c | 22 | ||||
| -rw-r--r-- | libempathy-gtk/gossip-ui-utils.h | 3 |
4 files changed, 20 insertions, 20 deletions
@@ -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 b166120a7..7a6ade7a4 100644 --- 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 cf12a51bb..e211bf169 100644 --- 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 d1625cfe3..987993798 100644 --- 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, |