diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-07-25 17:31:05 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-07-25 17:31:05 +0000 |
| commit | 5ac61d3eeebe1947c4a3c5fbab3a89bb4d124a59 (patch) | |
| tree | 752f2e7fc56b5ec78bac30d5dd1792cf0b3fd9f5 /gtk/gtkrc.c | |
| parent | 37e809867ef943dbfd407875f6c182b9a4ce2d9b (diff) | |
| download | gtk+-5ac61d3eeebe1947c4a3c5fbab3a89bb4d124a59.tar.gz | |
Include the build directory.
2000-07-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
* gdk/win32: Compiles, but no doubt doesn't work at all.
* gdk/win32/makefile.mingw.in: Define GDK_COMPILATION.
* gdk/win32/gdkinput.c: New file, temporarily.
* gdk/win32/gdkinput-win32.h: New file
* gdk/win32/gdkinputprivate.h: Remove.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 9fbaa444cd..b6b3c82034 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -255,35 +255,35 @@ static GtkImageLoader image_loader = NULL; #ifdef G_OS_WIN32 gchar * -get_gtk_sysconf_directory (void) +gtk_win32_get_installation_directory (void) { static gboolean been_here = FALSE; - static gchar gtk_sysconf_dir[200]; + static gchar gtk_installation_dir[200]; gchar win_dir[100]; HKEY reg_key = NULL; DWORD type; - DWORD nbytes = sizeof (gtk_sysconf_dir); + DWORD nbytes = sizeof (gtk_installation_dir); if (been_here) - return gtk_sysconf_dir; + return gtk_installation_dir; been_here = TRUE; if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\GNU\\GTk+", 0, KEY_QUERY_VALUE, ®_key) != ERROR_SUCCESS || RegQueryValueEx (reg_key, "InstallationDirectory", 0, - &type, gtk_sysconf_dir, &nbytes) != ERROR_SUCCESS + &type, gtk_installation_dir, &nbytes) != ERROR_SUCCESS || type != REG_SZ) { /* Uh oh. Use the old hard-coded %WinDir%\GTk+ value */ GetWindowsDirectory (win_dir, sizeof (win_dir)); - sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir); + sprintf (gtk_installation_dir, "%s\\gtk+", win_dir); } if (reg_key != NULL) RegCloseKey (reg_key); - return gtk_sysconf_dir; + return gtk_installation_dir; } static gchar * @@ -291,7 +291,7 @@ get_themes_directory (void) { static gchar themes_dir[200]; - sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ()); + sprintf (themes_dir, "%s\\themes", gtk_win32_get_installation_directory ()); return themes_dir; } @@ -398,7 +398,7 @@ gtk_rc_add_initial_default_files (void) #ifndef G_OS_WIN32 str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); #else - str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); + str = g_strdup_printf ("%s\\gtkrc", gtk_win32_get_installation_directory ()); #endif gtk_rc_add_default_file (str); |