change all gconf keys to use underscore instead of hypen. This is theGNOME_PANEL_1_5_15

2002-03-22  Mark McLoughlin  <mark@skynet.ie>

        * panel-global-config.schemas:
        * panel-per-panel-config.schemas: change all gconf keys to
        use underscore instead of hypen. This is the gconf convention.

        * applet.[ch]: (panel_applet_create_menu): kill panel submenu
        from the applet popup menu. Also make static.
        Update for gconf key changes.

        * basep-widget.c: don't include gnome-windo-icon.h

        * foobar-widget.c: ditto.
        (append_format_items): upd for gconf key change.

        * gnome-panel-properties.c: ditto.

        * gnome-panel-properties.glade2: keep widget names in sync
        with gconf keys.

        * gnome-run.c: (run_dialog_response), (toggle_contents),
        (update_contents), (show_run_dialog): store the 'advanced' flag
        in gconf.

        * launcher.c: (launcher_save_to_gconf), (launcher_load_from_gconf):
        gconf key changes.

        * menu.[ch]: (make_panel_submenu): make static

        * panel-applet-frame.c: (panel_applet_frame_save_to_gconf),
        (panel_applet_frame_load_from_gconf): gconf key changes.

        * panel-config-global.c: (panel_global_config_set_entry): ditto.

        * panel-gconf.c: (panel_gconf_setup_profile): ditto.

        * panel-widget.c: (panel_widget_focus_in_event),
        (panel_widget_focus_out_event): kill prelight.

        * panel.c: (panel_save_global_config),
        (panel_load_panels_from_gconf), (panel_save_to_gconf),
        (panel_remove_from_gconf): gconf key changes.

2002-03-22  Mark McLoughlin  <mark@skynet.ie>

        * fish.schemas: use underscore instead of hypen
        for all gconf keys ... this the gconf convention.

        * fish.c:
        (load_image_file): initialise pixbuf.
        (fish_applet_fill): upd for gconf key changes.

2002-03-22  Mark McLoughlin  <mark@skynet.ie>

        * clock.schemas, mailcheck.schemas, pager.schemas,
          tasklist.schemas: use underscore instead of hyphen
        for all gconf keys ... this is te gconf convention.

        * clock.c,mailcheck.c, pager.c, tasklist.c: upd for
        gconf key changes.

3 files changed, 56 insertions, 47 deletions

diff --git a/mailcheck/ChangeLog b/mailcheck/ChangeLog
index 76360ff96..ddfd78914 100644
--- a/mailcheck/ChangeLog
+++ b/mailcheck/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-22  Mark McLoughlin  <mark@skynet.ie>
+
+	* clock.schemas, mailcheck.schemas, pager.schemas,
+	  tasklist.schemas: use underscore instead of hyphen
+	for all gconf keys ... this is te gconf convention.
+
+	* clock.c,mailcheck.c, pager.c, tasklist.c: upd for 
+	gconf key changes.
+
 2002-03-09  Johan Dahlin  <jdahlin@telia.com>
 
 	reviewed by Mark McLoughlin <mark@skynet.ie>
diff --git a/mailcheck/mailcheck.c b/mailcheck/mailcheck.c
index 74886616b..ed73bf330 100644
--- a/mailcheck/mailcheck.c
+++ b/mailcheck/mailcheck.c
@@ -734,7 +734,7 @@ animation_selected (GtkMenuItem *item, gpointer data)
 	mc->selected_pixmap_name = data;
 	
 	load_new_pixmap (mc);
-	panel_applet_gconf_set_string(mc->applet, "animation-file", 
+	panel_applet_gconf_set_string(mc->applet, "animation_file", 
 				      mc->animation_file ? mc->animation_file : "", NULL);
 }
 
@@ -852,7 +852,7 @@ mail_file_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->mail_file);
 		
 	mc->mail_file = text;
-	panel_applet_gconf_set_string(mc->applet, "mail-file", mc->mail_file, NULL);
+	panel_applet_gconf_set_string(mc->applet, "mail_file", mc->mail_file, NULL);
 }
 
 static void
@@ -869,7 +869,7 @@ remote_server_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->remote_server);
 		
 	mc->remote_server = text;
-	panel_applet_gconf_set_string(mc->applet, "remote-server", 
+	panel_applet_gconf_set_string(mc->applet, "remote_server", 
 				      mc->remote_server, NULL);
 }
 
@@ -887,7 +887,7 @@ remote_username_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->remote_username);
 		
 	mc->remote_username = text;
-	panel_applet_gconf_set_string(mc->applet, "remote-username", 
+	panel_applet_gconf_set_string(mc->applet, "remote_username", 
 				      mc->remote_username, NULL);
 }
 
@@ -905,7 +905,7 @@ remote_password_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->remote_password);
 		
 	mc->remote_password = text;
-	panel_applet_gconf_set_string(mc->applet, "remote-password", 
+	panel_applet_gconf_set_string(mc->applet, "remote_password", 
 				      mc->remote_password, NULL);
 }
 
@@ -923,7 +923,7 @@ remote_folder_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->remote_folder);
 		
 	mc->remote_folder = text;
-	panel_applet_gconf_set_string(mc->applet, "remote-folder", 
+	panel_applet_gconf_set_string(mc->applet, "remote_folder", 
 				      mc->remote_folder, NULL);
 }
 
@@ -941,7 +941,7 @@ pre_remote_command_changed (GtkEntry *entry, gpointer data)
 		g_free (mc->pre_remote_command);
 		
 	mc->pre_remote_command = text;
-	panel_applet_gconf_set_string(mc->applet, "pre-remote-command", 
+	panel_applet_gconf_set_string(mc->applet, "pre_remote_command", 
 				      mc->pre_remote_command, NULL);
 }	
 
@@ -950,7 +950,7 @@ set_mailbox_selection (GtkWidget *widget, gpointer data)
 {
 	MailCheck *mc = g_object_get_data(G_OBJECT(widget), "MailCheck");
 	mc->mailbox_type = GPOINTER_TO_INT(data);
-        panel_applet_gconf_set_int(mc->applet, "mailbox-type", 
+        panel_applet_gconf_set_int(mc->applet, "mailbox_type", 
         			  (gint)mc->mailbox_type, NULL);
         make_remote_widgets_sensitive(mc);
         
@@ -968,7 +968,7 @@ pre_check_toggled (GtkToggleButton *button, gpointer data)
 	MailCheck *mc = data;
 	
 	mc->pre_check_enabled = gtk_toggle_button_get_active (button);
-	panel_applet_gconf_set_bool(mc->applet, "exec-enabled", 
+	panel_applet_gconf_set_bool(mc->applet, "exec_enabled", 
 				    mc->pre_check_enabled, NULL);
 				    
 }
@@ -986,7 +986,7 @@ pre_check_changed (GtkEntry *entry, gpointer data)
 	if (mc->pre_check_cmd)
 		g_free (mc->pre_check_cmd);	
 	mc->pre_check_cmd = g_strdup (text);
-	panel_applet_gconf_set_string(mc->applet, "exec-command", 
+	panel_applet_gconf_set_string(mc->applet, "exec_command", 
 				      mc->pre_check_cmd, NULL);
 	g_free (text);
 	
@@ -998,7 +998,7 @@ newmail_toggled (GtkToggleButton *button, gpointer data)
 	MailCheck *mc = data;
 	
 	mc->newmail_enabled = gtk_toggle_button_get_active (button);
-	panel_applet_gconf_set_bool(mc->applet, "newmail-enabled", 
+	panel_applet_gconf_set_bool(mc->applet, "newmail_enabled", 
 				    mc->newmail_enabled, NULL);
 				    
 }
@@ -1016,7 +1016,7 @@ newmail_changed (GtkEntry *entry, gpointer data)
 	if (mc->newmail_cmd)
 		g_free (mc->newmail_cmd);	
 	mc->newmail_cmd = g_strdup (text);
-	panel_applet_gconf_set_string(mc->applet, "newmail-command", 
+	panel_applet_gconf_set_string(mc->applet, "newmail_command", 
 				      mc->newmail_cmd, NULL);
 	g_free (text);
 	
@@ -1028,7 +1028,7 @@ clicked_toggled (GtkToggleButton *button, gpointer data)
 	MailCheck *mc = data;
 	
 	mc->clicked_enabled = gtk_toggle_button_get_active (button);
-	panel_applet_gconf_set_bool(mc->applet, "clicked-enabled", 
+	panel_applet_gconf_set_bool(mc->applet, "clicked_enabled", 
 				    mc->clicked_enabled, NULL);
 				    
 }
@@ -1046,7 +1046,7 @@ clicked_changed (GtkEntry *entry, gpointer data)
 	if (mc->clicked_cmd)
 		g_free (mc->clicked_cmd);	
 	mc->clicked_cmd = g_strdup (text);
-	panel_applet_gconf_set_string(mc->applet, "clicked-command", mc->clicked_cmd, NULL);
+	panel_applet_gconf_set_string(mc->applet, "clicked_command", mc->clicked_cmd, NULL);
 	g_free (text);
 	
 }
@@ -1066,7 +1066,7 @@ update_spin_changed (GtkSpinButton *spin, gpointer data)
 	if(mc->mail_timeout != 0)
 		gtk_timeout_remove (mc->mail_timeout);
 	mc->mail_timeout = gtk_timeout_add (mc->update_freq, mail_check_timeout, mc);
-	panel_applet_gconf_set_int(mc->applet, "update-frequency", mc->update_freq, NULL);
+	panel_applet_gconf_set_int(mc->applet, "update_frequency", mc->update_freq, NULL);
 }
 
 static void
@@ -1075,7 +1075,7 @@ sound_toggled (GtkToggleButton *button, gpointer data)
 	MailCheck *mc = data;
 	
 	mc->play_sound = gtk_toggle_button_get_active (button);
-	panel_applet_gconf_set_bool(mc->applet, "play-sound", mc->play_sound, NULL);
+	panel_applet_gconf_set_bool(mc->applet, "play_sound", mc->play_sound, NULL);
 }
 
 static GtkWidget *
@@ -1463,29 +1463,29 @@ check_callback (BonoboUIComponent *uic, gpointer data, const gchar *verbname)
 static void
 applet_load_prefs(MailCheck *mc)
 {
-	mc->animation_file = panel_applet_gconf_get_string(mc->applet, "animation-file", NULL);
+	mc->animation_file = panel_applet_gconf_get_string(mc->applet, "animation_file", NULL);
 	if(!mc->animation_file) {
 		g_free(mc->animation_file);
 		mc->animation_file = NULL;
 	}
-	mc->update_freq = panel_applet_gconf_get_int(mc->applet, "update-frequency", NULL);
-	mc->pre_check_cmd = panel_applet_gconf_get_string(mc->applet, "exec-command", NULL);
-	mc->pre_check_enabled = panel_applet_gconf_get_bool(mc->applet, "exec-enabled", NULL);
-	mc->newmail_cmd = panel_applet_gconf_get_string(mc->applet, "newmail-command", NULL);
-	mc->newmail_enabled = panel_applet_gconf_get_bool(mc->applet, "newmail-enabled", NULL);
-	mc->clicked_cmd = panel_applet_gconf_get_string(mc->applet, "clicked-command", NULL);
-	mc->clicked_enabled = panel_applet_gconf_get_bool(mc->applet, "clicked-enabled", NULL);
-	mc->remote_server = panel_applet_gconf_get_string(mc->applet, "remote-server", NULL);
-	mc->pre_remote_command = panel_applet_gconf_get_string(mc->applet, "pre-remote-command", NULL);
-	mc->remote_username = panel_applet_gconf_get_string(mc->applet, "remote-username", NULL);
+	mc->update_freq = panel_applet_gconf_get_int(mc->applet, "update_frequency", NULL);
+	mc->pre_check_cmd = panel_applet_gconf_get_string(mc->applet, "exec_command", NULL);
+	mc->pre_check_enabled = panel_applet_gconf_get_bool(mc->applet, "exec_enabled", NULL);
+	mc->newmail_cmd = panel_applet_gconf_get_string(mc->applet, "newmail_command", NULL);
+	mc->newmail_enabled = panel_applet_gconf_get_bool(mc->applet, "newmail_enabled", NULL);
+	mc->clicked_cmd = panel_applet_gconf_get_string(mc->applet, "clicked_command", NULL);
+	mc->clicked_enabled = panel_applet_gconf_get_bool(mc->applet, "clicked_enabled", NULL);
+	mc->remote_server = panel_applet_gconf_get_string(mc->applet, "remote_server", NULL);
+	mc->pre_remote_command = panel_applet_gconf_get_string(mc->applet, "pre_remote_command", NULL);
+	mc->remote_username = panel_applet_gconf_get_string(mc->applet, "remote_username", NULL);
 	if(!mc->remote_username) {
 		g_free(mc->remote_username);
 		mc->remote_username = g_strdup(g_getenv("USER"));
 	}
-	mc->remote_password = panel_applet_gconf_get_string(mc->applet, "remote-password", NULL);
-	mc->remote_folder = panel_applet_gconf_get_string(mc->applet, "remote-folder", NULL);
-	mc->mailbox_type = panel_applet_gconf_get_int(mc->applet, "mailbox-type", NULL);
-	mc->play_sound = panel_applet_gconf_get_bool(mc->applet, "play-sound", NULL);
+	mc->remote_password = panel_applet_gconf_get_string(mc->applet, "remote_password", NULL);
+	mc->remote_folder = panel_applet_gconf_get_string(mc->applet, "remote_folder", NULL);
+	mc->mailbox_type = panel_applet_gconf_get_int(mc->applet, "mailbox_type", NULL);
+	mc->play_sound = panel_applet_gconf_get_bool(mc->applet, "play_sound", NULL);
 }
 
 static void
@@ -1613,7 +1613,7 @@ fill_mailcheck_applet(PanelApplet *applet)
 			mc->mail_file = g_strdup (mail_file);
 	}
 
-	panel_applet_add_preferences (applet, "/schemas/apps/mailcheck-applet/prefs", NULL);
+	panel_applet_add_preferences (applet, "/schemas/apps/mailcheck_applet/prefs", NULL);
 	applet_load_prefs(mc);
 
 	mc->mailcheck_text_only = _("Text only");
diff --git a/mailcheck/mailcheck.schemas.in b/mailcheck/mailcheck.schemas.in
index c205a1642..420a454a6 100644
--- a/mailcheck/mailcheck.schemas.in
+++ b/mailcheck/mailcheck.schemas.in
@@ -1,7 +1,7 @@
 <gconfschemafile>
     <schemalist>    
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/animation-file</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/animation_file</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -11,7 +11,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/update-frequency</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/update_frequency</key>
             <owner>mailcheck-applet</owner>
             <type>int</type>
             <default>120000</default>
@@ -21,7 +21,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/exec-command</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/exec_command</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -31,7 +31,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/exec-enabled</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/exec_enabled</key>
             <owner>mailcheck-applet</owner>
             <type>bool</type>
             <default>false</default>
@@ -41,7 +41,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/newmail-command</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/newmail_command</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -51,7 +51,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/newmail-enabled</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/newmail_enabled</key>
             <owner>mailcheck-applet</owner>
             <type>bool</type>
             <default>false</default>
@@ -61,7 +61,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/clicked-command</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/clicked_command</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -71,7 +71,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/clicked-enabled</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/clicked_enabled</key>
             <owner>mailcheck-applet</owner>
             <type>bool</type>
             <default>false</default>
@@ -81,7 +81,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/remote-server</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/remote_server</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default>mail</default>
@@ -91,7 +91,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/pre-remote-command</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/pre_remote_command</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -101,7 +101,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/remote-username</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/remote_username</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -111,7 +111,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/remote-password</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/remote_password</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -121,7 +121,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/remote-folder</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/remote_folder</key>
             <owner>mailcheck-applet</owner>
             <type>string</type>
             <default></default>
@@ -131,7 +131,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/mailbox-type</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/mailbox_type</key>
             <owner>mailcheck-applet</owner>
             <type>int</type>
             <default>0</default>
@@ -141,7 +141,7 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/mailcheck-applet/prefs/play-sound</key>
+            <key>/schemas/apps/mailcheck_applet/prefs/play_sound</key>
             <owner>mailcheck-applet</owner>
             <type>bool</type>
             <default>false</default>