luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert the g_set_prgname change

Browse Source 
This change breaks our API and causes warnings from essentially all applications.
See bug 563627.
This commit is contained in:
Matthias Clasen 2009-12-21 09:11:23 -05:00
parent 473fd04132
commit 7db8b92b97
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/gutils.c
View File

@ -1968,17 +1968,10 @@ g_get_prgname (void)
void void
g_set_prgname (const gchar *prgname) g_set_prgname (const gchar *prgname)
{ {
gboolean already_set = FALSE;
G_LOCK (g_prgname); G_LOCK (g_prgname);
if (g_prgname) g_free (g_prgname);
already_set = TRUE;
else
g_prgname = g_strdup (prgname); g_prgname = g_strdup (prgname);
G_UNLOCK (g_prgname); G_UNLOCK (g_prgname);
if (already_set)
g_warning ("g_set_prgname() called multiple times");
} }
G_LOCK_DEFINE_STATIC (g_application_name); G_LOCK_DEFINE_STATIC (g_application_name);

2
glib/tests/option-context.c
View File

@ -1770,13 +1770,11 @@ main (int argc,
g_test_add_func ("/context/add", add_test1); g_test_add_func ("/context/add", add_test1);
/* Test parsing empty args */ /* Test parsing empty args */
#if 0
/* This test relies on the ability to call g_set_prgname() more /* This test relies on the ability to call g_set_prgname() more
* than once (without incurring a g_warning), which is no longer * than once (without incurring a g_warning), which is no longer
* the case. * the case.
*/ */
g_test_add_func ("/context/empty1", empty_test1); g_test_add_func ("/context/empty1", empty_test1);
#endif
g_test_add_func ("/context/empty2", empty_test2); g_test_add_func ("/context/empty2", empty_test2);
g_test_add_func ("/context/empty3", empty_test3); g_test_add_func ("/context/empty3", empty_test3);