diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2008-04-16 16:35:17 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2008-04-16 16:35:17 +0000 |
| commit | b1542fe9138f7a8ecc0d30fa59ba046685f45c9b (patch) | |
| tree | ff9920894e460dda44d6550f73aa4f6f7a49b817 /gtk/gtkbuilder.c | |
| parent | 7b93b76efab33166b2e088460e9df44bdcbfd937 (diff) | |
| download | gdk-pixbuf-b1542fe9138f7a8ecc0d30fa59ba046685f45c9b.tar.gz | |
Chain up in buildable_finish()
* 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
Diffstat (limited to 'gtk/gtkbuilder.c')
| -rw-r--r-- | gtk/gtkbuilder.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index dcea63284..77f416447 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -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 (); |