[gtkhtml] Killing libgnome by removing libgnome function by equivalent glib functions
- From: Fridrich Strba <strba src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtkhtml] Killing libgnome by removing libgnome function by equivalent glib functions
- Date: Wed, 3 Jun 2009 09:17:01 -0400 (EDT)
commit 9150f4c93122644a937c9eec093dcb9a7eeedb69
Author: Fridrich Strba <fstrba strbadell localdomain>
Date: Wed Jun 3 15:15:48 2009 +0200
Killing libgnome by removing libgnome function by equivalent glib functions
---
gtkhtml/dllmain.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gtkhtml/dllmain.c b/gtkhtml/dllmain.c
index 18310a9..500b211 100644
--- a/gtkhtml/dllmain.c
+++ b/gtkhtml/dllmain.c
@@ -22,8 +22,6 @@
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-init.h>
-
/* localedir uses system codepage as it is passed to the non-UTF8ified
* gettext library
*/
@@ -58,15 +56,16 @@ replace_prefix (const gchar *runtime_prefix,
static void
setup (void)
{
- gchar *cp_prefix;
+ gchar *cp_prefix;
G_LOCK (mutex);
if (localedir != NULL) {
G_UNLOCK (mutex);
return;
}
-
- gnome_win32_get_prefixes (hmodule, &prefix, &cp_prefix);
+
+ prefix = g_win32_get_package_installation_directory_of_module(hmodule);
+ cp_prefix = g_win32_locale_filename_from_utf8(prefix);
localedir = replace_prefix (cp_prefix, GNOMELOCALEDIR);
g_free (cp_prefix);
@@ -74,9 +73,9 @@ setup (void)
libdir = replace_prefix (prefix, LIBDIR);
datadir = replace_prefix (prefix, DATADIR);
sysconfdir = replace_prefix (prefix, SYSCONFDIR);
- icondir = replace_prefix (prefix, ICONDIR);
- gtkhtml_datadir = replace_prefix (prefix, GTKHTML_DATADIR);
- glade_datadir = replace_prefix (prefix, GLADE_DATADIR);
+ icondir = replace_prefix (prefix, ICONDIR);
+ gtkhtml_datadir = replace_prefix (prefix, GTKHTML_DATADIR);
+ glade_datadir = replace_prefix (prefix, GLADE_DATADIR);
G_UNLOCK (mutex);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]