From f172baa55a856b2a3acfa63d45b63250fd2ca8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 24 Oct 2008 20:57:16 +0000 Subject: [PATCH] =?UTF-8?q?+Fri=20Oct=2024=2016:56:50=202008=20=20S=C3=B8r?= =?UTF-8?q?en=20Sandmann=20=20=20+=20+=09*=20gnome-wi?= =?UTF-8?q?ndow-properties.c:=20Use=20gtk=5Finit()=20instead=20of=20+=09gn?= =?UTF-8?q?ome=5Fprogram=5Finit().=20+=20+Fri=20Oct=2024=2016:56:23=202008?= =?UTF-8?q?=20=20S=C3=B8ren=20Sandmann=20=20=20+=20+?= =?UTF-8?q?=09*=20gnome-wm-manager.c=20(gnome=5Fwm=5Fmanager=5Finit):=20Us?= =?UTF-8?q?e=20correct=20path=20for=20+=09window=20manager=20properties=20?= =?UTF-8?q?+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=9096 --- capplets/windows/ChangeLog | 5 +++++ capplets/windows/gnome-window-properties.c | 9 ++++----- libwindow-settings/ChangeLog | 5 +++++ libwindow-settings/gnome-wm-manager.c | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index 4a4061c26..bea384826 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 24 16:56:50 2008 Søren Sandmann + + * gnome-window-properties.c: Use gtk_init() instead of + gnome_program_init(). + ==================== 2.24.0.1 ==================== 2008-09-12 Christian Persch diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c index 59379a934..940642799 100644 --- a/capplets/windows/gnome-window-properties.c +++ b/capplets/windows/gnome-window-properties.c @@ -27,6 +27,9 @@ #include #endif +#include +#include +#include #include #include @@ -373,7 +376,6 @@ try_spawn_config_tool (GdkScreen *screen) int main (int argc, char **argv) { - GnomeProgram *program; GdkScreen *screen; GnomeWMSettings new_settings; int rc = 0; @@ -383,9 +385,7 @@ main (int argc, char **argv) bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - program = gnome_program_init ("gnome-window-properties", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - NULL); + gtk_init (&argc, &argv); gnome_wm_manager_init (); @@ -474,7 +474,6 @@ main (int argc, char **argv) g_object_unref (dialog); out: - g_object_unref (program); return rc; } diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog index f70ddb0cd..a4a692a9f 100644 --- a/libwindow-settings/ChangeLog +++ b/libwindow-settings/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 24 16:56:23 2008 Søren Sandmann + + * gnome-wm-manager.c (gnome_wm_manager_init): Use correct path for + window manager properties + Fri Oct 24 16:08:17 2008 Søren Sandmann * gnome-wm-manager.c (gnome_wm_manager_init): Use glib path diff --git a/libwindow-settings/gnome-wm-manager.c b/libwindow-settings/gnome-wm-manager.c index 6f17174ee..012fb3ac4 100644 --- a/libwindow-settings/gnome-wm-manager.c +++ b/libwindow-settings/gnome-wm-manager.c @@ -223,7 +223,7 @@ gnome_wm_manager_init (void) done_scan = TRUE; - tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, "gnome", "wm-properties", NULL); + tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, NULL); scan_wm_directory (tempdir, FALSE); g_free (tempdir);