empathy r738 - trunk/libempathy-gtk
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r738 - trunk/libempathy-gtk
- Date: Tue, 11 Mar 2008 09:27:34 +0000 (GMT)
Author: xclaesse
Date: Tue Mar 11 09:27:34 2008
New Revision: 738
URL: http://svn.gnome.org/viewvc/empathy?rev=738&view=rev
Log:
Avoid dup the url string if not needed.
Modified:
trunk/libempathy-gtk/empathy-ui-utils.c
Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c (original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c Tue Mar 11 09:27:34 2008
@@ -1303,38 +1303,34 @@
static gchar *
fixup_url (const gchar *url)
{
- gchar *real_url;
-
if (!g_str_has_prefix (url, "http://") &&
!strstr (url, ":/") &&
!strstr (url, "@")) {
- real_url = g_strdup_printf ("http://%s", url);
+ return g_strdup_printf ("http://%s", url);
} else {
- real_url = g_strdup (url);
+ return NULL;
}
-
- return real_url;
}
void
empathy_url_show (const char *url)
{
- gchar *real_url;
- gboolean res;
- GError *err;
+ gchar *real_url;
+ gboolean res;
+ GError *error;
real_url = fixup_url (url);
+ if (real_url) {
+ url = real_url;
+ }
/* FIXME: this does not work for multihead, we should use
* GdkAppLaunchContext for that, when we can depend on GTK+ trunk
*/
- res = g_app_info_launch_default_for_uri (real_url,
- NULL,
- &err);
+ res = g_app_info_launch_default_for_uri (url, NULL, &error);
if (!res) {
empathy_debug (DEBUG_DOMAIN, "Couldn't show URL %s: %s",
- real_url,
- err->message);
- g_error_free (err);
+ url, error->message);
+ g_clear_error (error);
}
g_free (real_url);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]