Merge commit 'upstream/master' into mc5

[empathy.git] / libempathy-gtk / empathy-ui-utils.c

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index e91ac62913c50e6b473e4c7c3cb144bee180eeaa..b697b4d0b92d5c26002cfbf5bacb0ff7a05b6101 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -38,8 +38,6 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include <libmissioncontrol/mc-profile.h>
-
 #include "empathy-ui-utils.h"
 #include "empathy-images.h"
 #include "empathy-conf.h"
@@ -182,16 +180,6 @@ empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
        return widget;
 }
 
-const gchar *
-empathy_icon_name_from_account (EmpathyAccount *account)
-{
-       McProfile *profile;
-
-       profile = empathy_account_get_profile (account);
-
-       return mc_profile_get_icon_name (profile);
-}
-
 const gchar *
 empathy_icon_name_for_presence (TpConnectionPresenceType presence)
 {
@@ -1341,6 +1329,8 @@ empathy_get_toplevel_window (GtkWidget *widget)
 static gchar *
 fixup_url (const gchar *url)
 {
+       g_return_val_if_fail (url != NULL, NULL);
+
        if (g_str_has_prefix (url, "ghelp:") ||
            g_str_has_prefix (url, "mailto:") ||
            strstr (url, ":/")) {
@@ -1361,6 +1351,9 @@ empathy_url_show (GtkWidget *parent,
        gchar  *real_url;
        GError *error = NULL;
 
+       g_return_if_fail (GTK_IS_WIDGET (parent));
+       g_return_if_fail (url != NULL);
+
        real_url = fixup_url (url);
        if (real_url) {
                url = real_url;
@@ -1539,4 +1532,4 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
                G_CALLBACK (file_manager_receive_file_response_cb), handler);
 
        gtk_widget_show (widget);
-}
\ No newline at end of file
+}