applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+Fri Oct 24 19:16:46 2008 Søren Sandmann <sandmann@redhat.com>

Browse source 
+
+	* gnome-about-me.c (main): Remove unused GnomeProgram variable
+
+Fri Oct 24 19:19:46 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* sound-properties-capplet.c (setup_dialog): Delete code for
+	legacy config options
+	
+Fri Oct 24 19:18:37 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* capplet-util.c: Include <stdlib.h>
+	* capplet-util.h: Delete COPY_FROM_LEGACY macro
+
+Fri Oct 24 19:16:10 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-keyboard-properties.c (main): Remove copying of legacy settings
+


svn path=/trunk/; revision=9112
This commit is contained in:
Søren Sandmann Pedersen 2008-10-24 23:22:41 +00:00
parent d552cfc0f3
commit 3a227fbc66
11 changed files with 60 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/about-me/ChangeLog
View file

@ -1,3 +1,7 @@
Fri Oct 24 19:16:46 2008 Søren Sandmann <sandmann@redhat.com>
* gnome-about-me.c (main): Remove unused GnomeProgram variable
==================== 2.24.0.1 ==================== ==================== 2.24.0.1 ====================
==================== 2.23.2 ==================== ==================== 2.23.2 ====================

1
capplets/about-me/gnome-about-me.c
View file

@ -1024,7 +1024,6 @@ about_me_setup_dialog (void)
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
GnomeProgram *program;
int rc = 0; int rc = 0;
capplet_init (NULL, &argc, &argv); capplet_init (NULL, &argc, &argv);

1
capplets/accessibility/at-properties/main.c
View file

@ -2,6 +2,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h> #include <glade/glade.h>
#include <gnome.h>
#include "capplet-util.h" #include "capplet-util.h"
#include "gconf-property-editor.h" #include "gconf-property-editor.h"

1
capplets/appearance/theme-util.c
View file

@ -26,6 +26,7 @@
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h> #include <dbus/dbus-glib-bindings.h>
#include "capplet-util.h"
#include "theme-util.h" #include "theme-util.h"
gboolean gboolean

5
capplets/common/ChangeLog
View file

@ -1,3 +1,8 @@
Fri Oct 24 19:18:37 2008 Søren Sandmann <sandmann@redhat.com>
* capplet-util.c: Include <stdlib.h>
* capplet-util.h: Delete COPY_FROM_LEGACY macro
Fri Oct 24 19:04:38 2008 Søren Sandmann <sandmann@redhat.com> Fri Oct 24 19:04:38 2008 Søren Sandmann <sandmann@redhat.com>
* gconf-property-editor.c: Delete unused function * gconf-property-editor.c: Delete unused function

1
capplets/common/capplet-util.c
View file

@ -32,6 +32,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <stdlib.h>
#include "capplet-util.h" #include "capplet-util.h"

11
capplets/common/capplet-util.h
View file

@ -25,7 +25,8 @@
#define __CAPPLET_UTIL_H #define __CAPPLET_UTIL_H
#include <gio/gio.h> #include <gio/gio.h>
#include <gnome.h> #include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gconf/gconf.h> #include <gconf/gconf.h>
#include <gconf/gconf-changeset.h> #include <gconf/gconf-changeset.h>
@ -35,14 +36,6 @@
#define WID(s) glade_xml_get_widget (dialog, s) #define WID(s) glade_xml_get_widget (dialog, s)
/* Copy a setting from the legacy gnome-config settings to the ConfigDatabase */
#define COPY_FROM_LEGACY(type, key, legacy_key) \
val_##type = gnome_config_get_##type##_with_default (legacy_key, &def); \
\
if (!def) \
gconf_client_set_##type (client, key, val_##type, NULL);
/* Some miscellaneous functions useful to all capplets */ /* Some miscellaneous functions useful to all capplets */
void capplet_help (GtkWindow *parent, char const *section); void capplet_help (GtkWindow *parent, char const *section);

4
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,7 @@
Fri Oct 24 19:16:10 2008 Søren Sandmann <sandmann@redhat.com>
* gnome-keyboard-properties.c (main): Remove copying of legacy settings
2008-10-24 Sergey Udaltsov <svu@gnome.org> 2008-10-24 Sergey Udaltsov <svu@gnome.org>
* gnome-keyboard-properties-xkbot.c: Small fix - remember sorted list * gnome-keyboard-properties-xkbot.c: Small fix - remember sorted list

43
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -192,42 +192,6 @@ setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
setup_a11y_tabs (dialog, changeset); setup_a11y_tabs (dialog, changeset);
} }
static void
get_legacy_settings (void)
{
GConfClient *client;
gboolean val_bool, def;
gulong val_int;
client = gconf_client_get_default ();
COPY_FROM_LEGACY (bool,
"/gnome/desktop/peripherals/keyboard/repeat",
"/Desktop/Keyboard/repeat=true");
COPY_FROM_LEGACY (bool,
"/gnome/desktop/peripherals/keyboard/click",
"/Desktop/Keyboard/click=true");
COPY_FROM_LEGACY (int, "/gnome/desktop/peripherals/keyboard/rate",
"/Desktop/Keyboard/rate=30");
COPY_FROM_LEGACY (int, "/gnome/desktop/peripherals/keyboard/delay",
"/Desktop/Keyboard/delay=500");
COPY_FROM_LEGACY (int,
"/gnome/desktop/peripherals/keyboard/volume",
"/Desktop/Keyboard/clickvolume=0");
#if 0
COPY_FROM_LEGACY (int,
"/gnome/desktop/peripherals/keyboard/bell_volume",
"/Desktop/Bell/percent=50");
#endif
COPY_FROM_LEGACY (int,
"/gnome/desktop/peripherals/keyboard/bell_pitch",
"/Desktop/Bell/pitch=50");
COPY_FROM_LEGACY (int,
"/gnome/desktop/peripherals/keyboard/bell_duration",
"/Desktop/Bell/duration=100");
g_object_unref (G_OBJECT (client));
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -237,7 +201,6 @@ main (int argc, char **argv)
GOptionContext *context; GOptionContext *context;
static gboolean apply_only = FALSE; static gboolean apply_only = FALSE;
static gboolean get_legacy = FALSE;
static gboolean switch_to_typing_break_page = FALSE; static gboolean switch_to_typing_break_page = FALSE;
static gboolean switch_to_a11y_page = FALSE; static gboolean switch_to_a11y_page = FALSE;
@ -251,8 +214,6 @@ main (int argc, char **argv)
N_ N_
("Just apply settings and quit (compatibility only; now handled by daemon)"), ("Just apply settings and quit (compatibility only; now handled by daemon)"),
NULL}, NULL},
{"get-legacy", 0, 0, G_OPTION_ARG_NONE, &get_legacy,
N_("Retrieve and store legacy settings"), NULL},
{"typing-break", 0, 0, G_OPTION_ARG_NONE, {"typing-break", 0, 0, G_OPTION_ARG_NONE,
&switch_to_typing_break_page, &switch_to_typing_break_page,
N_ N_
@ -283,9 +244,6 @@ main (int argc, char **argv)
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
g_object_unref (client); g_object_unref (client);
if (get_legacy) {
get_legacy_settings ();
} else {
changeset = NULL; changeset = NULL;
dialog = create_dialog (); dialog = create_dialog ();
setup_dialog (dialog, changeset); setup_dialog (dialog, changeset);
@ -307,7 +265,6 @@ main (int argc, char **argv)
"preferences-desktop-keyboard"); "preferences-desktop-keyboard");
gtk_widget_show (WID ("keyboard_dialog")); gtk_widget_show (WID ("keyboard_dialog"));
gtk_main (); gtk_main ();
}
return 0; return 0;
} }

7
capplets/sound/ChangeLog
View file

@ -1,4 +1,9 @@
Fri Oct 24 18:59:34 2008 Søren Sandmann <sandmann@redhat.com> Fri Oct 24 19:19:46 2008 Søren Sandmann <sandmann@redhat.com>
* sound-properties-capplet.c (setup_dialog): Delete code for
legacy config options
Fri Oct 24 19:19:29 2008 Søren Sandmann <sandmann@redhat.com>
* sound-properties-capplet.c: Get rid of gnome include * sound-properties-capplet.c: Get rid of gnome include

27
capplets/sound/sound-properties-capplet.c
View file

@ -1138,26 +1138,6 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
setup_sound_theme_custom (dialog, CheckXKB()); setup_sound_theme_custom (dialog, CheckXKB());
} }
/* get_legacy_settings
*
* Retrieve older gnome_config -style settings and store them in the
* configuration database.
*
* In most cases, it's best to use the COPY_FROM_LEGACY macro defined in
* capplets/common/capplet-util.h.
*/
static void
get_legacy_settings (void)
{
GConfClient *client;
gboolean val_bool, def;
client = gconf_client_get_default ();
COPY_FROM_LEGACY (bool, "/desktop/gnome/sound/event_sounds", "/sound/system/settings/event_sounds=false");
g_object_unref (G_OBJECT (client));
}
static void static void
dialog_response_cb (GtkWidget *dialog, gint response_id, GConfChangeSet *changeset) dialog_response_cb (GtkWidget *dialog, gint response_id, GConfChangeSet *changeset)
{ {
@ -1177,14 +1157,11 @@ main (int argc, char **argv)
GladeXML *dialog; GladeXML *dialog;
GOptionContext *context; GOptionContext *context;
gboolean apply_only = FALSE; gboolean apply_only = FALSE;
gboolean get_legacy = FALSE;
GOptionEntry cap_options[] = { GOptionEntry cap_options[] = {
{ "apply", 0, 0, G_OPTION_ARG_NONE, &apply_only, { "apply", 0, 0, G_OPTION_ARG_NONE, &apply_only,
N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL }, N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
{ "init-session-settings", 0, 0, G_OPTION_ARG_NONE, &apply_only, { "init-session-settings", 0, 0, G_OPTION_ARG_NONE, &apply_only,
N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL }, N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
{ "get-legacy", 0, 0, G_OPTION_ARG_NONE, &get_legacy,
N_("Retrieve and store legacy settings"), NULL },
{ NULL } { NULL }
}; };
@ -1205,9 +1182,6 @@ main (int argc, char **argv)
gconf_client_add_dir (gconf_client, "/desktop/gnome/sound", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (gconf_client, "/desktop/gnome/sound", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
gconf_client_add_dir (gconf_client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (gconf_client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
if (get_legacy) {
get_legacy_settings ();
} else {
dialog = create_dialog (); dialog = create_dialog ();
if (dialog) { if (dialog) {
@ -1225,7 +1199,6 @@ main (int argc, char **argv)
gconf_change_set_unref (changeset); gconf_change_set_unref (changeset);
g_object_unref (dialog); g_object_unref (dialog);
} }
}
g_object_unref (gconf_client); g_object_unref (gconf_client);