callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chain up in buildable_finish()

Browse Source 
* gtk/gtkwindow.c: Chain up in buildable_finish()

	* gtk/gtkbuilder.c: _gtk_builder_get_absolute_filename() handle
	cases where g_path_get_dirname() returns "."

	* docs/reference/gtk/tmpl/gtklabel.sgml, 
	docs/reference/gtk/tmpl/gtkbuilder.sgml: Added documentation
	for the <attributes> tags on GtkLabel


svn path=/trunk/; revision=20008
This commit is contained in:
Tristan Van Berkom
2008-04-16 16:35:17 +00:00
parent 7b93b76efa
commit b1542fe913
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkbuilder.c
View File

@ -1460,8 +1460,16 @@ _gtk_builder_get_absolute_filename (GtkBuilder *builder, const gchar *string)
return g_strdup (string);
if (builder->priv->filename &&
strcmp (builder->priv->filename, ".") != 0)
dirname = g_path_get_dirname (builder->priv->filename);
strcmp (builder->priv->filename, ".") != 0)
{
dirname = g_path_get_dirname (builder->priv->filename);
if (strcmp (dirname, ".") == 0)
{
g_free (dirname);
dirname = g_get_current_dir ();
}
}
else
dirname = g_get_current_dir ();