diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-12-07 09:57:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-12-07 09:57:09 +0000 |
| commit | 269fd523d848c25339c8b47f9a86713911ac804e (patch) | |
| tree | 9a6d449dc8c7ba14e2e8d7a9e5320fac7fb219bb /shell/source | |
| parent | 053790db7332784444d8ae0b3f5dd1a2232237eb (diff) | |
INTEGRATION: CWS bettermaker (1.3.20); FILE MERGED
2004/12/06 09:18:18 obr 1.3.20.1: #i38385# initialize glib object registry
Diffstat (limited to 'shell/source')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfbackend.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index afe01ca29d55..a9db4c41411a 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gconfbackend.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-09-17 13:00:27 $ + * last change: $Author: rt $ $Date: 2004-12-07 10:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,10 +151,11 @@ GConfClient* GconfBackend::getGconfClient() if (mClient == NULL) { - int argc =0; - sal_Char ** argv; + /* initialize glib object type library */ + g_type_init(); + GError* aError = NULL; - if (!gconf_init(argc, argv, &aError)) + if (!gconf_init(0, NULL, &aError)) { rtl::OUStringBuffer msg; msg.appendAscii("GconfBackend:GconfLayer: Cannot Initialize Gconf connection - " ); @@ -163,11 +164,8 @@ GConfClient* GconfBackend::getGconfClient() g_error_free(aError); aError = NULL; throw uno::RuntimeException(msg.makeStringAndClear(),NULL); - } - - mClient = gconf_client_get_default(); if (!mClient) { |