Commit graph

44 commits

Author SHA1 Message Date
Bradford Hovinen
7953e8085a Eliminate compiler warnings
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c: Eliminate compiler warnings
2001-12-20 20:22:37 +00:00
Bradford Hovinen
fb0d289855 Fold the callback back in; accept variable argument list with extra
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* gconf-property-editor.c (gconf_peditor_new): Fold the callback
	back in; accept variable argument list with extra parameters
	(gconf_peditor_new_filename): Return the property editor
	(gconf_peditor_new_string_valist): Split this out
	(gconf_peditor_new_string): Call _valist variant
	(gconf_peditor_new*): Update

	* */*-properties*.c: Update according to above
2001-12-20 20:14:59 +00:00
Bradford Hovinen
30389610b4 Add parameter GNOME_PARAM_APP_DATADIR
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/screensaver/main.c (main): Add parameter
	GNOME_PARAM_APP_DATADIR

	* mouse-properties-capplet.c (main): Add parameter
	GNOME_PARAM_APP_DATADIR

	* configure.in (GNOMECC_DESKTOP_DIR): Define
	(GNOMECC_DATA_DIR): Define
	Remove AC_DEFINE_UNQUOTED for the rest of the directories

	* All: Update to reflect above
2001-12-20 18:52:39 +00:00
Bradford Hovinen
2dd5ccf964 Update (main): Use a GtkDialog rather than a GnomeDialog; don't place a
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* *-properties*.c (dialog_button_clicked_cb): Update
	(main): Use a GtkDialog rather than a GnomeDialog; don't place a
	weak ref on gtk_main_quit
2001-12-20 18:21:12 +00:00
Bradford Hovinen
02397e55aa Put gnome-settings-daemon after libbackgrounds
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* Makefile.am (SUBDIRS): Put gnome-settings-daemon after
	libbackgrounds

	* background-properties-capplet.c: Update

	* capplets/background/Makefile.am: Update

	* background.desktop.in.in (Exec): Update

	* mouse.desktop.in.in (Exec): Update

	* capplets/keyboard/Makefile.am: Update

	* keyboard.desktop.in.in (Exec): Update

	* mouse.desktop.in.in (Exec): Update

	* gnome-settings-background.c: Update

	* applier.[ch]: Rename applier to bg_applier to avoid possible
	namespace collision
2001-12-20 15:46:08 +00:00
Bradford Hovinen
a2b2b7932a Rename preferences to bg_preferences to avoid possible namespace collision
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* libbackground/preferences.[ch]: Rename preferences to
	bg_preferences to avoid possible namespace collision

	* All: Update to reflect the above
2001-12-20 14:24:56 +00:00
Bradford Hovinen
b65967ac90 Add common, background, keyboard, mouse back in
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
2001-12-20 14:11:59 +00:00
Bradford Hovinen
cb0a97e5a3 Don't #include bonobo.h
2001-12-18  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c: Don't #include bonobo.h
2001-12-18 19:46:26 +00:00
Bradford Hovinen
66f47e6a78 Use gconf_client rather than gconf_engine (setup_dialog): Use correct path
2001-12-18  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c: Use gconf_client rather than
	gconf_engine
	(setup_dialog): Use correct path for enabled
	(main): Preload the background settings directory for performance
2001-12-18 16:39:30 +00:00
Bradford Hovinen
1279ed6dcf Update keys to use /desktop/gnome/background
2001-12-18  Bradford Hovinen  <hovinen@ximian.com>

	* background.schema: Update keys to use /desktop/gnome/background

	* background-properties-capplet.c: Update GConf keys to use
	/desktop/gnome/background
2001-12-18 16:17:44 +00:00
Bradford Hovinen
82a6d01255 Remove (create_dialog): Return GladeXML, not GtkWidget (setup_dialog): Put
2001-12-18  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (property_change_cb): Remove
	(create_dialog): Return GladeXML, not GtkWidget
	(setup_dialog): Put GladeXML in the signature rather than
	GtkWidget
	(peditor_value_changed): Retrieve color_frame directory rather
	than through Glade
	(real_realize_cb): Ditto
	(setup_dialog): Set color-frame rather than glade-data
	(main): Construct the preview applier here rather than in
	create_dialog
	(main): Unref the applier object when the dialog is destroyed
	(setup_dialog, create_dialog): Put the applier in the signature
	Use weak_ref rather than the destroy signal for all relevant
	objects
2001-12-18 16:01:47 +00:00
Bradford Hovinen
0fb231b7d0 Set the sensitivity of the color frame depending on the settings
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (peditor_value_changed): Set
	the sensitivity of the color frame depending on the settings
	(peditor_value_changed): Use correct keys
2001-12-17 20:01:22 +00:00
Bradford Hovinen
27097008ce Enabled set_guard call
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Enabled
	set_guard call
2001-12-17 19:33:12 +00:00
Bradford Hovinen
7b408b24fc Connect missing signal
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Connect
	missing signal
2001-12-17 18:33:12 +00:00
Bradford Hovinen
7241f04206 Retrieve the applier from the preferences object and use it to apply
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (peditor_value_changed):
	Retrieve the applier from the preferences object and use it to
	apply settings on the preview widget
2001-12-17 18:17:57 +00:00
Bradford Hovinen
756102ee52 Apply settings after commiting the change set
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (dialog_button_clicked_cb):
	Apply settings after commiting the change set
2001-12-17 17:34:38 +00:00
Bradford Hovinen
f8dbd8090f Don't hide opacity controls
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Don't hide
	opacity controls

	* background-properties.glade: Remove opacity controls
2001-12-17 17:28:23 +00:00
Bradford Hovinen
fd0119b1e9 Use prefs_widget rather than preview placeholder widget
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (create_dialog): Use
	prefs_widget rather than preview placeholder widget

	* background-properties.glade: Remove the preview placeholder
2001-12-17 16:23:10 +00:00
Gediminas Paulauskas
9f8ed1254f retrieve translation in utf-8 codeset. Do not setlocale (). remove intl.
2001-12-09  Gediminas Paulauskas <menesis@delfi.lt>

	* *.c (main): retrieve translation in utf-8 codeset. Do not
	setlocale ().
	* some Makefile.am (INCLUDES): remove intl.
	(..._LDADD): remove INTLLIBS
2001-12-09 12:23:40 +00:00
Bradford Hovinen
bf475e9374 Connect the destroy signal
2001-12-07  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (main): Connect the destroy
	signal

	* background.schema: Fix type on opacity schema
2001-12-07 19:56:23 +00:00
Bradford Hovinen
8133132cd2 NULL-terminate the dialog construction parameters
2001-12-07  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (main): NULL-terminate the
	dialog construction parameters
2001-12-07 19:35:11 +00:00
Bradford Hovinen
a52a434f78 Remove use of capplet_init, instead do the initialization ourselves (note:
2001-12-07  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (main): Remove use of
	capplet_init, instead do the initialization ourselves (note: this
	means we are no longer a Bonobo control)
	(dialog_button_clicked_cb): Implement

	* background-properties.glade: libglade-convert
2001-12-07 17:29:43 +00:00
Bradford Hovinen (Gdict maintainer)
669a1e2f3a Removed background rendering code from the background capplet and moved it
to a separate static library.
2001-12-06 23:53:58 +00:00
Bradford Hovinen (Gdict maintainer)
467b92037d GNOME 2.0 port. Changes too numerous to mention. 2001-11-10 20:51:12 +00:00
Bradford Hovinen
90e4bac6ed Create the root pixmap after we know about the gradient geometry
2001-09-22  Bradford Hovinen  <hovinen@ximian.com>

	* applier.c (run_render_pipeline): Create the root pixmap after we
	know about the gradient geometry
	(place_pixbuf):
	(tile_pixbuf): Fix calls to gdk_pixbuf_composite[_color]
	(render_wallpaper): Fix setting of pixbuf_xlate
	(render_background): Fix pixbuf_render_geom here in case the
	gradient geometry is small
2001-09-24 02:10:21 +00:00
Bradford Hovinen
ee3356381a Total reorganization
2001-09-21  Bradford Hovinen  <hovinen@ximian.com>

	* applier.c: Total reorganization

2001-09-17  Bradford Hovinen  <hovinen@ximian.com>

	* preferences.c (preferences_save): Move from
	applier.c:output_compat_prefs; it really belongs here
	(preferences_class_init): Don't construct an applier here

	* background-properties-capplet.c (setup_dialog): Create a new
	applier for every dialog
	(create_dialog): Create applier locally, just for this one widget
	(apply_settings): Create applier locally and destroy on exit
	(main): Remove call to gnome_window_set_...
2001-09-22 02:25:59 +00:00
Bradford Hovinen
b90a84da60 Create a new applier for every dialog (create_dialog): Create applier
2001-09-17  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Create a new
	applier for every dialog
	(create_dialog): Create applier locally, just for this one widget
	(apply_settings): Create applier locally and destroy on exit
	(main): Remove call to gnome_window_set_...
2001-09-17 13:31:43 +00:00
Bradford Hovinen
5c31978a28 Use applier_render_color_p (real_realize_cb): Ditto (get_legacy_settings):
2001-09-14  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (property_change_cb): Use
	applier_render_color_p
	(real_realize_cb): Ditto
	(get_legacy_settings): Set the wallpaper_enabled flag based on the
	value of wallpaper_filename; use (none) as the default for
	wallpaper_filename
2001-09-14 16:52:52 +00:00
Bradford Hovinen
862ce9a11b Use applier_render_color_p (real_realize_cb): Ditto
2001-09-14  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (property_change_cb): Use
	applier_render_color_p
	(real_realize_cb): Ditto

	* applier.c (applier_render_color_p): Renamed from
	applier_render_gradient_p; check both solid color and gradient

	* preferences.c (preferences_need_color_opts): Removed; use
	applier_render_color_p instead
2001-09-14 14:26:47 +00:00
Bradford Hovinen
84cbbbff3e Default to TRUE on enabled; check value of wallpaper_filename to set
2001-09-13  Bradford Hovinen  <hovinen@ximian.com>

	* preferences.c (preferences_load_from_bonobo_db):
	(preferences_load_from_bonobo_pbag): Default to TRUE on enabled;
	check value of wallpaper_filename to set wallpaper_enabled if
	wallpaper_enabled could not be found

	* background-properties-capplet.c (setup_dialog):
	(apply_settings): Check for error condition after creating
	preferences object

	* preferences.c (preferences_destroy): Make this static
	(read_color_from_string): Made argument const
	(bonobo_color_to_gdk): Made argument const
	(DB_GET_VALUE): Removed
	(PB_GET_VALUE): Removed
	(preferences_load_from_bonobo_pbag): Use
	local_bonobo_property_bag_client_get_value_{color|filename}
	(preferences_new_from_bonobo_db):
	(preferences_new_from_bonobo_pbag): Deallocate object and return
	NULL if there was an error
	(local_bonobo_property_bag_client_get_value_color):
	(local_bonobo_property_bag_client_get_value_filename): Implement
	(MAKE_GET_SIMPLE): Implement (copy from bonobo-conf)
	(preferences_load_from_bonobo_pbag): Read enabled property
	(preferences_load_from_bonobo_pbag): Forgive wallpaper_enabled and
	enabled not being found

	* applier.c (applier_render_gradient_p): Implement
	(applier_destroy): Make this static

	* preferences.c (preferences_load_from_bonobo_db): Use
	bonobo_config_get_boolean rather than BONOBO_ARG_GET_BOOLEAN
	(DB_GET_VALUE ()). Ditto bonobo_config_get_long
	(preferences_load_from_bonobo_db): Pass ev pointer to each call to
	bonobo_config_get_*
	(preferences_load_from_bonobo_db): Check ev pointer after each
	call to bonobo_config_get_* and return if an exception is set
	(preferences_load_from_bonobo_db): Allow the enabled flag not to
	be present in the database since some older configurations don't
	have it included
	(all): Remove support for compiling without bonobo-conf
2001-09-14 13:36:50 +00:00
Bradford Hovinen
c0f0664680 Apply preferences now if the preview widget is already realized
2001-09-03  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (setup_dialog): Apply
	preferences now if the preview widget is already realized
2001-09-12 15:35:23 +00:00
Richard Hestilow
f29d4a9502 Redid UI a bit to add new enabled checkbox.
2001-09-07  Richard Hestilow  <hestilow@ximian.com>

	* background-properties.glade: Redid UI a bit to add new enabled
	checkbox.

	* background-properties.xml: Add default for "wallpaper_enabled".

	* preferences.[ch]: New function preferences_need_color_opts.
	(preferences_load_from_bonobo_db): Load wallpaper_enabled from
	bonobo-conf.
	(preferences_load_from_bonobo_pbag): Ditto.

	* applier.[ch]: New function applier_get_wallpaper_pixbuf
	(needed by preferences_need_color_opts, else pixbuf gets created
	twice).

	* background-properties-capplet.c (real_realize_cb): Set
	color frame sensitivity based on preferences_need_color_opts.
	(property_change_cb): Ditto.
	(setup_dialog): Add peditor/guard for wallpaper_enabled. Also,
	set glade object data on the preferences structure as well.
2001-09-08 00:42:11 +00:00
Bradford Hovinen
2d85752882 Retrieve the correct value for wallpaper_types
2001-08-28  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (get_legacy_settings): Retrieve
	the correct value for wallpaper_types
2001-08-28 13:45:20 +00:00
Bradford Hovinen
a82ec1573c Don't add the location to the list if it is marked deleted
2001-08-27  Bradford Hovinen  <hovinen@ximian.com>

	* archive.c (foreach_build_list_cb): Don't add the location to the
	list if it is marked deleted
	(impl_ConfigArchiver_Archive_createLocation): Do
	CORBA_Object_duplicate rather than bonobo_object_dup_ref

	* location.c (location_is_deleted): Implement

	* background-properties-capplet.c (setup_dialog): Initialize/free
	the CORBA environment structure
	(real_realize_cb): Put into an idle handler, called by
	realize_2_cb, the new timeout handler

	* preferences.c (preferences_load_from_bonobo_pbag):
	(preferences_load_from_bonobo_db): Extract from preferences_new_*

	* background-properties-capplet.c (property_change_cb):
	(realize_cb): Accept prefs structure in lieu of
	Bonobo_PropertyBag; don't reload the preferences structure from
	the property bag
	(property_change_cb): Call preferences_apply_event to modify the
	preferences structure appropriately
	(property_change_cb):
	(realize_cb): If the preferences structure is marked destroyed,
	just return
	(setup_dialog): Create a preferences structure from the property
	bag given and use that as the extra data passed to callbacks
	(realize_cb): Put into an idle handler real_realize_cb

	* preferences.c (preferences_apply_event): Implement

	* applier.c (output_compat_prefs): Make prefs const

	* applier.[ch]: Have applier_apply_prefs take a const Preferences
	structure

	* preferences.[ch]: Make preferences_clone take a const
	Preferences structure
2001-08-28 13:01:54 +00:00
Richard Hestilow
803f8907e8 Really override enabled this time. Really.
2001-08-13  Richard Hestilow  <hestilow@ximian.com>

	* background-properties-capplet.c (setup_dialog): Really
	override enabled this time. Really.
2001-08-13 19:35:41 +00:00
Richard Hestilow
199846f5c0 Only draw disabled message if do_preview. Actually, the user will never
2001-08-13  Richard Hestilow  <hestilow@ximian.com>

 	* applier.c (applier_apply_prefs): Only draw disabled message
 	if do_preview. Actually, the user will never see this because
 	the correct behavior (which is done) is to assume if they're
 	running capplet, prefs->enable should be TRUE. This is because
 	we are only honoring enable as a hacker-only setting.
 	(output_compat_prefs): Output the correct "Enable" setting.

 	* background-properties-capplet.c (get_legacy_settings): Support
 	the "Enabled" flag.

 	* preferences.c (preferences_new_from_bonobo_db): Import the
 	"enabled" flag. Note that this is not bothered with in the _pbag
 	function, because that's from the Proxy settings, which is only
 	used for the GUI capplet, which always sets enabled to True, because
 	this is a hacker-only option. Got it?

	* background-properties.xml: Add "enabled".
2001-08-13 18:39:08 +00:00
Bradford Hovinen (Gdict maintainer)
9137adbe17 Backed out the last commit 2001-07-27 22:00:22 +00:00
Richard Hestilow
4a76138680 Only draw disabled message if do_preview. Actually, the user will never
2001-07-27  Richard Hestilow  <hestilow@ximian.com>

	* applier.c (applier_apply_prefs): Only draw disabled message
	if do_preview. Actually, the user will never see this because
	the correct behavior (which is done) is to assume if they're
	running capplet, prefs->enable should be TRUE. This is because
	we are only honoring enable as a hacker-only setting.
	(output_compat_prefs): Output the correct "Enable" setting.

	* background-properties-capplet.c (get_legacy_settings): Support
	the "Enabled" flag.

	* preferences.c (preferences_new_from_bonobo_db): Import the
	"enabled" flag. Note that this is not bothered with in the _pbag
	function, because that's from the Proxy settings, which is only
	used for the GUI capplet, which always sets enabled to True, because
	this is a hacker-only option. Got it?
2001-07-27 19:34:55 +00:00
Bradford Hovinen
d063bb65b0 Fix val_ulong in the gradient case
2001-07-27  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (get_legacy_settings): Fix
	val_ulong in the gradient case
2001-07-27 18:09:06 +00:00
Bradford Hovinen
0336802107 Restore some lost tweaks from earlier.
2001-07-26  Bradford Hovinen  <hovinen@ximian.com>

	* applier.c (renderer_render_wallpaper): Restore some lost tweaks
	from earlier.

	* preferences.c (preferences_init): strdup the home directory

	* applier.c: Store preview widget in the renderer, not the applier
	itself
2001-07-27 02:15:42 +00:00
Bradford Hovinen
4e921471d4 Add a "(none)" string to the history
2001-07-26  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (create_dialog): Add a "(none)"
	string to the history
2001-07-27 01:48:44 +00:00
Richard Hestilow
dae9cccc0e Remove all bonobo-conf stuff.
2001-07-26  Richard Hestilow  <hestilow@ximian.com>

	* applier.c: Remove all bonobo-conf stuff.

	* preferences.[ch]: New functions preferences_new_from_bonobo_pbag
	and preferences_new_from_bonobo_db.
2001-07-27 01:43:48 +00:00
Bradford Hovinen
6dbe99f68a Accept applier as argument; retrieve property bag from applier
2001-07-26  Bradford Hovinen  <hovinen@ximian.com>

	* background-properties-capplet.c (property_change_cb): Accept
	applier as argument; retrieve property bag from applier
	(realize_cb): Retrieve applier from widget
	(setup_dialog): Store property bag in applier

	* applier.c (renderer_new): Store applier inside renderer; accept
	applier as function parameter

	* background-properties-capplet.c (create_dialog): Store the
	applier inside the widget

	* applier.c (struct _ApplierPrivate ): Define preview_widget here
	rather than globally
	(applier_get_preview_widget): Make this a method of the applier class
2001-07-26 16:07:40 +00:00
Bradford Hovinen
4937798114 Remove IMLIB check (GNOMECC_CAPPLETS_DESKTOP_IN_RULE): Add sed expression
2001-07-25  Bradford Hovinen  <hovinen@ximian.com>

	* configure.in: Remove IMLIB check
	(GNOMECC_CAPPLETS_DESKTOP_IN_RULE): Add sed expression to cover
	macro DESKTOP_EXEC_LINE
	(LIBCOMMON_DIR): Add option --enable-bonobo-conf

	* all: Added support for optionally compiling without bonobo-conf enabled
2001-07-25 17:26:17 +00:00