mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
Revert the g_set_prgname change
This change breaks our API and causes warnings from essentially all applications. See bug 563627.
This commit is contained in:
parent
473fd04132
commit
7db8b92b97
@ -1968,17 +1968,10 @@ g_get_prgname (void)
|
||||
void
|
||||
g_set_prgname (const gchar *prgname)
|
||||
{
|
||||
gboolean already_set = FALSE;
|
||||
|
||||
G_LOCK (g_prgname);
|
||||
if (g_prgname)
|
||||
already_set = TRUE;
|
||||
else
|
||||
g_prgname = g_strdup (prgname);
|
||||
g_free (g_prgname);
|
||||
g_prgname = g_strdup (prgname);
|
||||
G_UNLOCK (g_prgname);
|
||||
|
||||
if (already_set)
|
||||
g_warning ("g_set_prgname() called multiple times");
|
||||
}
|
||||
|
||||
G_LOCK_DEFINE_STATIC (g_application_name);
|
||||
|
@ -1770,13 +1770,11 @@ main (int argc,
|
||||
g_test_add_func ("/context/add", add_test1);
|
||||
|
||||
/* Test parsing empty args */
|
||||
#if 0
|
||||
/* This test relies on the ability to call g_set_prgname() more
|
||||
* than once (without incurring a g_warning), which is no longer
|
||||
* the case.
|
||||
*/
|
||||
g_test_add_func ("/context/empty1", empty_test1);
|
||||
#endif
|
||||
g_test_add_func ("/context/empty2", empty_test2);
|
||||
g_test_add_func ("/context/empty3", empty_test3);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user