summaryrefslogtreecommitdiff
path: root/gtk/gtkrc.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-05-14 20:55:22 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-05-14 20:55:22 +0000
commit11aed263b7e9ec7a02bb5ad610732969bc87073d (patch)
tree90730288b0d16ba178eb4757ca9dad846cfef508 /gtk/gtkrc.c
parent1dd8a1453ff45d26e9c8c497e58070da5043eb7f (diff)
downloadgtk+-11aed263b7e9ec7a02bb5ad610732969bc87073d.tar.gz
Set the width of the layout to the actual wrap width (our requisition) not
Tue May 14 16:44:09 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtklabel.c (gtk_label_ensure_layout): Set the width of the layout to the actual wrap width (our requisition) not the width we set when calculating the width. This results in the lines being justified within the correct area. (#79157, Anders Carlsson) * gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected registered parameter types of "accel_activate" and "accel_changed" signals. (Patch from Murray Cumming, #78798) * gtk/gtkrc.c (gtk_rc_make_default_dir): Switch binary-version and type to correspond to the current ordering in _gtk_get_module_path. (#78746, Sergey Kuzminov) * gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs pointing to the GTK_PATH documentation. * gtk/Makefile.am (uninstall-local): Delete key themes as well. (#81286, Kristian Rietveld.)
Diffstat (limited to 'gtk/gtkrc.c')
-rw-r--r--gtk/gtkrc.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index a44c526ce1..91b398483d 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -299,9 +299,9 @@ gtk_rc_make_default_dir (const gchar *type)
var = g_getenv ("GTK_EXE_PREFIX");
if (var)
- path = g_build_filename (var, "lib", "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
+ path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
else
- path = g_build_filename (GTK_LIBDIR, "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
+ path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
return path;
}
@@ -367,6 +367,16 @@ gtk_rc_get_theme_dir (void)
return path;
}
+/**
+ * gtk_rc_get_module_dir:
+ *
+ * Returns a directory in which GTK+ looks for theme engines.
+ * For full information about the search for theme engines,
+ * see the docs for <envvar>GTK_PATH</envvar> in
+ * <xref linkend="gtk-running">.
+ *
+ * return value: the directory. (Must be freed with g_free())
+ **/
gchar *
gtk_rc_get_module_dir (void)
{