diff options
| author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
| commit | 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98 (patch) | |
| tree | ccd09bc3f224492e9d8c360c0b903e11f8b593ab /libempathy-gtk/empathy-ui-utils.c | |
| parent | 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (diff) | |
| parent | c62744a26535b8778e6053e5d7c544ca9ccc1e5f (diff) | |
| download | gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.gz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.bz2 gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.lz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.xz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.zst gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.zip | |
Merge branch 'master' into mc5
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index b697b4d0b..3dcefdcfb 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1351,7 +1351,7 @@ empathy_url_show (GtkWidget *parent, gchar *real_url; GError *error = NULL; - g_return_if_fail (GTK_IS_WIDGET (parent)); + g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent)); g_return_if_fail (url != NULL); real_url = fixup_url (url); @@ -1359,7 +1359,7 @@ empathy_url_show (GtkWidget *parent, url = real_url; } - gtk_show_uri (gtk_widget_get_screen (parent), url, + gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, url, gtk_get_current_event_time (), &error); if (error) { |