charles has proposed merging lp:~charlesk/indicator-datetime/refix-844741 into
lp:indicator-datetime.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~charlesk/indicator-datetime/refix-844741/+merge/93145
This re-fixes bug #844741 for trunk. It looks like 11.10 fixed it with an
add-on patch to remove the g_free() call.
Changing get_version()'s signature to return const makes the function's intent
clearer -- the return value is owned by get_version() and shouldn't be freed by
client code.
--
https://code.launchpad.net/~charlesk/indicator-datetime/refix-844741/+merge/93145
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'src/timezone-completion.c'
--- src/timezone-completion.c 2011-09-06 12:47:37 +0000
+++ src/timezone-completion.c 2012-02-15 06:52:16 +0000
@@ -311,7 +311,7 @@
return locale;
}
-static gchar *
+static const gchar *
get_version (void)
{
static gchar *version = NULL;
@@ -351,11 +351,10 @@
priv->request_text = g_strdup (text);
gchar * escaped = g_uri_escape_string (text, NULL, FALSE);
- gchar * version = get_version ();
+ const gchar * version = get_version ();
gchar * locale = get_locale ();
gchar * url = g_strdup_printf (GEONAME_URL, escaped, version, locale);
g_free (locale);
- g_free (version);
g_free (escaped);
GFile * file = g_file_new_for_uri (url);
_______________________________________________
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
