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

Add common, background, keyboard, mouse back in

Browse source 
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/Makefile.am (always_built_SUBDIRS): Add common,
	background, keyboard, mouse back in

	* configure.in (PKG_CHECK_MODULES): Remove lines pertaining to the
	archiver, add line for gnome settings daemon

	* background-properties-capplet.c (dialog_button_clicked_cb):
	Remove call to apply_settings
	(apply_settings): Remove
	(main): Remove apply_only support

	* default-application-properties.c (main): Call gtk_main, not
	capplet_gtk_main

	* interface.c: Don't #include capplet-widget.h

	* main.c: Don't #include capplet-widget.h or the archiver stuff
	(main): Call gtk_main rather than capplet_gtk_main
	Remove archiver stuff
	(setup_capplet_widget): Don't connect to state_changed_cb
	(state_changed_cb): Remove
	(main): Don't pass cap_options

	* gnome-settings-daemon/Makefile.am
	(gnome_settings_daemon_SOURCES): Add
	gnome-settings-{keyboard|background}.[ch]
	(INCLUDES): Add -I$(top_srcdir)/libbackground
	(gnome_settings_daemon_LDADD): Add
	$(top_builddir)/libbackground/libbackground.a

	* gnome-settings-daemon.c (main): Initialize keyboard and
	background subsystems

	* Added gnome-settings-{keyboard|background}.[ch],
	gnome-settings-daemon/ChangeLog
This commit is contained in:
Bradford Hovinen 2001-12-20 14:11:59 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent f812516058
commit b65967ac90
20 changed files with 328 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

38
capplets/background/background-properties-capplet.c
View file

@ -34,27 +34,6 @@
#include "gconf-property-editor.h"
#include "applier.h"
/* Apply settings to the root window. This will be moved to
* gnome-settings-daemon shortly.
*/
static void
apply_settings ()
{
GObject *prefs;
Applier *applier;
applier = APPLIER (applier_new (APPLIER_ROOT));
prefs = preferences_new ();
preferences_load (PREFERENCES (prefs));
applier_apply_prefs (applier, PREFERENCES (prefs));
g_object_unref (G_OBJECT (prefs));
g_object_unref (G_OBJECT (applier));
}
/* Retrieve legacy gnome_config settings and store them in the GConf
* database. This involves some translation of the settings' meanings.
*/
@ -288,13 +267,10 @@ create_dialog (Applier *applier)
static void
dialog_button_clicked_cb (GnomeDialog *dialog, gint button_number, GConfChangeSet *changeset)
{
if (button_number == 0) {
if (button_number == 0)
gconf_client_commit_change_set (gconf_client_get_default (), changeset, TRUE, NULL);
apply_settings ();
}
else if (button_number == 1) {
else if (button_number == 1)
gnome_dialog_close (dialog);
}
}
int
@ -306,13 +282,8 @@ main (int argc, char **argv)
GtkWidget *dialog_win;
GObject *applier;
static gboolean apply_only;
static gboolean get_legacy;
static struct poptOption cap_options[] = {
{ "apply", '\0', POPT_ARG_NONE, &apply_only, 0,
N_("Just apply settings and quit"), NULL },
{ "init-session-settings", '\0', POPT_ARG_NONE, &apply_only, 0,
N_("Just apply settings and quit"), NULL },
{ "get-legacy", '\0', POPT_ARG_NONE, &get_legacy, 0,
N_("Retrieve and store legacy settings"), NULL },
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
@ -331,10 +302,7 @@ main (int argc, char **argv)
client = gconf_client_get_default ();
gconf_client_add_dir (client, "/desktop/gnome/background", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
if (apply_only) {
apply_settings ();
}
else if (get_legacy) {
if (get_legacy) {
get_legacy_settings ();
} else {
changeset = gconf_change_set_new ();