From 82f14be305cc7e5593362cf142afcf7bd79d7572 Mon Sep 17 00:00:00 2001
From: Seth Nickell <seth@src.gnome.org>
Date: Sat, 11 May 2002 05:01:07 +0000
Subject: [PATCH] Hook titlebar font into GConf key.

	* gnome-window-properties.c: (setup_dialog), (main):

	Hook titlebar font into GConf key.

	* window-properties.desktop.in:

	Set title in .desktop file.
---
 capplets/windows/ChangeLog                    | 10 ++++++++++
 capplets/windows/gnome-window-properties.c    | 13 +++++++++++++
 capplets/windows/window-properties.desktop.in |  4 ++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 44666d41e..c0c7e22ae 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-10  Seth Nickell  <snickell@stanford.edu>
+
+	* gnome-window-properties.c: (setup_dialog), (main):
+
+	Hook titlebar font into GConf key.
+
+	* window-properties.desktop.in:
+
+	Set title in .desktop file.
+	
 2002-05-10  Seth Nickell  <snickell@stanford.edu>
 
 	* gnome-window-properties.c: (set_wm_change_pending),
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index ca6e67032..b3205efc0 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -19,6 +19,8 @@
 
 //#include "gnome-startup.h"
 
+#define TITLEBAR_FONT_KEY "/desktop/gnome/applications/window_manager/titlebar_font"
+
 /* prototypes */
 static void restart         (gboolean force);
 static void revert_callback (void);
@@ -748,6 +750,16 @@ create_dialog (void)
         return dialog;
 }
 
+static void
+setup_dialog (GladeXML *dialog)
+{  
+        GObject *peditor;
+
+        peditor = gconf_peditor_new_font (NULL, TITLEBAR_FONT_KEY,
+                                          WID ("titlebar_font"),
+                                          PEDITOR_FONT_COMBINED, NULL);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -773,6 +785,7 @@ main (int argc, char **argv)
 	{
                 init_session();
                 dialog = create_dialog ();
+                setup_dialog (dialog);
 
                 dialog_win = gtk_dialog_new_with_buttons 
                         (_("Window Preferences"), NULL, -1,
diff --git a/capplets/windows/window-properties.desktop.in b/capplets/windows/window-properties.desktop.in
index 51293f59e..c9b980dfc 100644
--- a/capplets/windows/window-properties.desktop.in
+++ b/capplets/windows/window-properties.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Mouse
+_Name=Windows
 _Comment=Window Properties
-Exec=gnome2-window-properties
+Exec=gnome-window-properties
 Icon=window-capplet.png
 Terminal=0
 Type=Application