Commit d8dd345e authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Make sure not to get a double directory separator in case the home

2000-10-28  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
	to get a double directory separator in case the home directory
	ends with one. This would cause trouble especially on Windows,
	where the path will be confused with the syntax for an an UNC
	(network share) path \\server\share\path.
	(gtk_rc_add_initial_default_files): Ditto.
parent f2d6705f
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): Make sure not
to get a double directory separator in case the home directory
ends with one. This would cause trouble especially on Windows,
where the path will be confused with the syntax for an an UNC
(network share) path \\server\share\path.
(gtk_rc_add_initial_default_files): Ditto.
Sat Oct 28 02:33:09 2000 Robert Brady <robert@suse.co.uk>
* gtk/gtkmarshal.list: add new marshallers for GtkTextView.
......
......@@ -364,11 +364,19 @@ gtk_rc_append_default_module_path(void)
var = g_get_home_dir ();
if (var)
{
#ifndef G_OS_WIN32
path = g_strdup_printf ("%s%s", var, "/.gtk-2.0/" GTK_VERSION "/engines");
#else
path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines");
#endif
gchar *sep;
/* Don't duplicate the directory separator, causes trouble at
* least on Windows.
*/
if (var[strlen (var) -1] != G_DIR_SEPARATOR)
sep = G_DIR_SEPARATOR_S;
else
sep = "";
/* This produces something like ~/.gtk-2.0/2.0/engines */
path = g_strdup_printf ("%s%s%s", var, sep,
".gtk-2.0" G_DIR_SEPARATOR_S
GTK_VERSION G_DIR_SEPARATOR_S
"engines");
module_path[n++] = path;
}
module_path[n] = NULL;
......@@ -414,7 +422,12 @@ gtk_rc_add_initial_default_files (void)
var = g_get_home_dir ();
if (var)
{
str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc-2.0", var);
gchar *sep;
if (var[strlen (var) -1] != G_DIR_SEPARATOR)
sep = G_DIR_SEPARATOR_S;
else
sep = "";
str = g_strdup_printf ("%s%s.gtkrc-2.0", var, sep);
gtk_rc_add_default_file (str);
g_free (str);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment