Attachment #91818 for bug #140553

Lines 90-97 Link Here

(-)sfi/glib-extra.h.old (-2 lines)
90	gchar* g_strdup_rstrip (const gchar *string);	90	gchar* g_strdup_rstrip (const gchar *string);
91	gchar* g_strdup_lstrip (const gchar *string);	91	gchar* g_strdup_lstrip (const gchar *string);
92		92
93	const gchar* g_intern_string (const gchar *string);
94	const gchar* g_intern_static_string (const gchar *string);
95	const gchar* g_intern_strconcat (const gchar *first_string,	93	const gchar* g_intern_strconcat (const gchar *first_string,
96	...);	94	...);
97	const gchar* g_intern_printf (const gchar *format,	95	const gchar* g_intern_printf (const gchar *format,




  return NULL;
}

const gchar*
g_intern_string (const gchar *string)
{
  return string ? g_quark_to_string (g_quark_from_string (string)) : NULL;
}

const gchar*
g_intern_static_string (const gchar   *string)
{
  return string ? g_quark_to_string (g_quark_from_static_string (string)) : NULL;
}

static gchar*
delim_concat_varargs (const gchar *first_string,
                      gchar        delim,

Return to bug 140553

Lines 170-187 Link Here

(-)sfi/glib-extra.c.old (-12 lines)
170	return NULL;	170	return NULL;
171	}	171	}
172		172
173	const gchar*
174	g_intern_string (const gchar *string)
175	{
176	return string ? g_quark_to_string (g_quark_from_string (string)) : NULL;
177	}
178
179	const gchar*
180	g_intern_static_string (const gchar *string)
181	{
182	return string ? g_quark_to_string (g_quark_from_static_string (string)) : NULL;
183	}
184
185	static gchar*	173	static gchar*
186	delim_concat_varargs (const gchar *first_string,	174	delim_concat_varargs (const gchar *first_string,
187	gchar delim,	175	gchar delim,