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
This commit is contained in:
Bradford Hovinen
Bradford Hovinen (Gdict maintainer)
parent
7ec25076f0
commit
fb0d289855
8 changed files with 250 additions and 124 deletions
|
|
@ -202,27 +202,27 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset, BGApplier *bg_applier
|
|||
g_object_set_data (prefs, "applier", bg_applier);
|
||||
|
||||
peditor = gconf_peditor_new_select_menu
|
||||
(changeset, "/desktop/gnome/background/orientation", WID ("color_option"));
|
||||
(changeset, "/desktop/gnome/background/orientation", WID ("color_option"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
peditor = gconf_peditor_new_color
|
||||
(changeset, "/desktop/gnome/background/color1", WID ("colorpicker1"));
|
||||
(changeset, "/desktop/gnome/background/color1", WID ("colorpicker1"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
peditor = gconf_peditor_new_color
|
||||
(changeset, "/desktop/gnome/background/color2", WID ("colorpicker2"));
|
||||
(changeset, "/desktop/gnome/background/color2", WID ("colorpicker2"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
peditor = gconf_peditor_new_filename
|
||||
(changeset, "/desktop/gnome/background/wallpaper-filename", WID ("image_fileentry"));
|
||||
(changeset, "/desktop/gnome/background/wallpaper-filename", WID ("image_fileentry"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
peditor = gconf_peditor_new_select_menu
|
||||
(changeset, "/desktop/gnome/background/wallpaper-type", WID ("image_option"));
|
||||
(changeset, "/desktop/gnome/background/wallpaper-type", WID ("image_option"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
peditor = gconf_peditor_new_boolean
|
||||
(changeset, "/desktop/gnome/background/wallpaper-enabled", WID ("picture_enabled_check"));
|
||||
(changeset, "/desktop/gnome/background/wallpaper-enabled", WID ("picture_enabled_check"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) peditor_value_changed, prefs);
|
||||
|
||||
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("picture_frame"));
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
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
|
||||
|
||||
2001-12-19 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* gconf-property-editor.c (gconf_peditor_new_float_range)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "gconf-property-editor.h"
|
||||
#include "gconf-property-editor-marshal.h"
|
||||
|
||||
|
|
@ -78,7 +80,9 @@ static void gconf_property_editor_finalize (GObject *object);
|
|||
static GObject *gconf_peditor_new (gchar *key,
|
||||
GConfClientNotifyFunc cb,
|
||||
GConfChangeSet *changeset,
|
||||
GObject *ui_control);
|
||||
GObject *ui_control,
|
||||
const gchar *first_prop_name,
|
||||
va_list var_args);
|
||||
|
||||
GType
|
||||
gconf_property_editor_get_type (void)
|
||||
|
|
@ -282,27 +286,17 @@ gconf_property_editor_finalize (GObject *object)
|
|||
G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
init_widget_cb (GConfPropertyEditor *peditor)
|
||||
{
|
||||
GConfClient *client;
|
||||
GConfEntry *gconf_entry;
|
||||
|
||||
client = gconf_client_get_default ();
|
||||
gconf_entry = gconf_client_get_entry (client, peditor->p->key, NULL, TRUE, NULL);
|
||||
peditor->p->callback (client, 0, gconf_entry, peditor);
|
||||
peditor->p->inited = TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static GObject *
|
||||
gconf_peditor_new (gchar *key,
|
||||
GConfClientNotifyFunc cb,
|
||||
GConfChangeSet *changeset,
|
||||
GObject *ui_control)
|
||||
GObject *ui_control,
|
||||
const gchar *first_prop_name,
|
||||
va_list var_args)
|
||||
{
|
||||
GObject *obj;
|
||||
GConfClient *client;
|
||||
GConfEntry *gconf_entry;
|
||||
|
||||
g_return_if_fail (key != NULL);
|
||||
g_return_if_fail (cb != NULL);
|
||||
|
|
@ -314,8 +308,12 @@ gconf_peditor_new (gchar *key,
|
|||
"ui-control", ui_control,
|
||||
NULL);
|
||||
|
||||
/* Use an idle handler to give the caller a chance to set up any additional parameters */
|
||||
gtk_idle_add ((GtkFunction) init_widget_cb, obj);
|
||||
g_object_set_valist (obj, first_prop_name, var_args);
|
||||
|
||||
client = gconf_client_get_default ();
|
||||
gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
|
||||
GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
|
||||
GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
|
@ -363,16 +361,29 @@ peditor_boolean_widget_changed (GConfPropertyEditor *peditor,
|
|||
GObject *
|
||||
gconf_peditor_new_boolean (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *checkbox)
|
||||
GtkWidget *checkbox,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (checkbox != NULL, NULL);
|
||||
g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (checkbox), NULL);
|
||||
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_boolean_value_changed, changeset, G_OBJECT (checkbox));
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_boolean_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (checkbox),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (checkbox), "toggled",
|
||||
(GCallback) peditor_boolean_widget_changed, peditor);
|
||||
|
|
@ -414,19 +425,22 @@ peditor_string_widget_changed (GConfPropertyEditor *peditor,
|
|||
gconf_value_free (value);
|
||||
}
|
||||
|
||||
GObject *
|
||||
gconf_peditor_new_string (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *entry)
|
||||
static GObject *
|
||||
gconf_peditor_new_string_valist (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *entry,
|
||||
gchar *first_property_name,
|
||||
va_list var_args)
|
||||
{
|
||||
GObject *peditor;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (entry != NULL, NULL);
|
||||
g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
|
||||
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_string_value_changed, changeset, G_OBJECT (entry));
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_string_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (entry),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (entry), "changed",
|
||||
(GCallback) peditor_string_widget_changed, peditor);
|
||||
|
|
@ -434,17 +448,57 @@ gconf_peditor_new_string (GConfChangeSet *changeset,
|
|||
return peditor;
|
||||
}
|
||||
|
||||
GObject *
|
||||
gconf_peditor_new_string (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *entry,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (entry != NULL, NULL);
|
||||
g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
|
||||
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new_string_valist
|
||||
(changeset, key, entry,
|
||||
first_property_name, var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
return peditor;
|
||||
}
|
||||
|
||||
GObject *
|
||||
gconf_peditor_new_filename (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *file_entry)
|
||||
GtkWidget *file_entry,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (file_entry != NULL, NULL);
|
||||
g_return_val_if_fail (GNOME_IS_FILE_ENTRY (file_entry), NULL);
|
||||
|
||||
gconf_peditor_new_string (changeset, key, gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (file_entry)));
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new_string_valist
|
||||
(changeset, key,
|
||||
gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (file_entry)),
|
||||
first_property_name, var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
return peditor;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -498,16 +552,29 @@ peditor_color_widget_changed (GConfPropertyEditor *peditor,
|
|||
GObject *
|
||||
gconf_peditor_new_color (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *cp)
|
||||
GtkWidget *cp,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (cp != NULL, NULL);
|
||||
g_return_val_if_fail (GNOME_IS_COLOR_PICKER (cp), NULL);
|
||||
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_color_value_changed, changeset, G_OBJECT (cp));
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_color_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (cp),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (cp), "color_set",
|
||||
(GCallback) peditor_color_widget_changed, peditor);
|
||||
|
|
@ -552,16 +619,29 @@ peditor_select_menu_widget_changed (GConfPropertyEditor *peditor,
|
|||
GObject *
|
||||
gconf_peditor_new_select_menu (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *option_menu)
|
||||
GtkWidget *option_menu,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
g_return_val_if_fail (option_menu != NULL, NULL);
|
||||
g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), NULL);
|
||||
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_select_menu_value_changed, changeset, G_OBJECT (option_menu));
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_select_menu_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (option_menu),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (option_menu), "changed",
|
||||
(GCallback) peditor_select_menu_widget_changed, peditor);
|
||||
|
|
@ -613,11 +693,14 @@ peditor_select_radio_widget_changed (GConfPropertyEditor *peditor,
|
|||
GObject *
|
||||
gconf_peditor_new_select_radio (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GSList *radio_group)
|
||||
GSList *radio_group,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
GtkRadioButton *first_button;
|
||||
GSList *item;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
|
|
@ -627,8 +710,17 @@ gconf_peditor_new_select_radio (GConfChangeSet *changeset,
|
|||
|
||||
first_button = GTK_RADIO_BUTTON (radio_group->data);
|
||||
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_select_radio_value_changed,
|
||||
changeset, G_OBJECT (first_button));
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_select_radio_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (first_button),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
for (item = radio_group; item != NULL; item = item->next)
|
||||
g_signal_connect_swapped (G_OBJECT (item->data), "toggled",
|
||||
|
|
@ -674,12 +766,15 @@ peditor_numeric_range_widget_changed (GConfPropertyEditor *peditor,
|
|||
}
|
||||
|
||||
GObject *
|
||||
gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *range)
|
||||
gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *range,
|
||||
gchar *first_property_name,
|
||||
...)
|
||||
{
|
||||
GObject *peditor;
|
||||
GObject *adjustment;
|
||||
va_list var_args;
|
||||
|
||||
g_return_val_if_fail (changeset != NULL, NULL);
|
||||
g_return_val_if_fail (key != NULL, NULL);
|
||||
|
|
@ -687,7 +782,18 @@ gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
|
|||
g_return_val_if_fail (GTK_IS_RANGE (range), NULL);
|
||||
|
||||
adjustment = G_OBJECT (gtk_range_get_adjustment (GTK_RANGE (range)));
|
||||
peditor = gconf_peditor_new (key, (GConfClientNotifyFunc) peditor_numeric_range_value_changed, changeset, adjustment);
|
||||
|
||||
va_start (var_args, first_property_name);
|
||||
|
||||
peditor = gconf_peditor_new
|
||||
(key,
|
||||
(GConfClientNotifyFunc) peditor_numeric_range_value_changed,
|
||||
changeset,
|
||||
G_OBJECT (adjustment),
|
||||
first_property_name,
|
||||
var_args);
|
||||
|
||||
va_end (var_args);
|
||||
|
||||
g_signal_connect_swapped (adjustment, "value_changed",
|
||||
(GCallback) peditor_numeric_range_widget_changed, peditor);
|
||||
|
|
|
|||
|
|
@ -60,25 +60,39 @@ const gchar *gconf_property_editor_get_key (GConfPropertyEditor *peditor);
|
|||
|
||||
GObject *gconf_peditor_new_boolean (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *checkbox);
|
||||
GtkWidget *checkbox,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_string (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *entry);
|
||||
GtkWidget *entry,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_filename (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *file_entry);
|
||||
GtkWidget *file_entry,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_color (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *color_entry);
|
||||
GtkWidget *color_entry,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_select_menu (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *option_menu);
|
||||
GtkWidget *option_menu,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_select_radio (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GSList *radio_group);
|
||||
GSList *radio_group,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
GObject *gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
|
||||
gchar *key,
|
||||
GtkWidget *range);
|
||||
GtkWidget *range,
|
||||
gchar *first_property_name,
|
||||
...);
|
||||
|
||||
void gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,
|
||||
GtkWidget *widget);
|
||||
|
|
|
|||
|
|
@ -177,32 +177,36 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
|
|||
{
|
||||
GObject *peditor;
|
||||
|
||||
peditor = gconf_peditor_new_boolean (changeset, "/gnome/desktop/peripherals/keyboard/repeat", WID ("repeat_toggle"));
|
||||
peditor = gconf_peditor_new_boolean
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/repeat", WID ("repeat_toggle"), NULL);
|
||||
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("repeat_table"));
|
||||
|
||||
peditor = gconf_peditor_new_select_menu (changeset, "/gnome/desktop/peripherals/keyboard/delay", WID ("delay_menu"));
|
||||
gconf_peditor_new_select_menu
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/delay", WID ("delay_menu"),
|
||||
"conv-to-widget-cb", delay_to_widget,
|
||||
"conv-from-widget-cb", delay_from_widget,
|
||||
NULL);
|
||||
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", delay_to_widget,
|
||||
"conv-from-widget-cb", delay_from_widget,
|
||||
NULL);
|
||||
gconf_peditor_new_select_menu
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/rate", WID ("repeat_menu"),
|
||||
"conv-to-widget-cb", rate_to_widget,
|
||||
"conv-from-widget-cb", rate_from_widget,
|
||||
NULL);
|
||||
|
||||
peditor = gconf_peditor_new_select_menu (changeset, "/gnome/desktop/peripherals/keyboard/rate", WID ("repeat_menu"));
|
||||
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", rate_to_widget,
|
||||
"conv-from-widget-cb", rate_from_widget,
|
||||
NULL);
|
||||
|
||||
peditor = gconf_peditor_new_boolean (changeset, "/gnome/desktop/peripherals/keyboard/click", WID ("click_toggle"));
|
||||
peditor = gconf_peditor_new_boolean
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/click", WID ("click_toggle"), NULL);
|
||||
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("click_hbox"));
|
||||
|
||||
gconf_peditor_new_numeric_range (changeset, "/gnome/desktop/peripherals/keyboard/volume", WID ("click_volume_entry"));
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/volume", WID ("click_volume_entry"), NULL);
|
||||
|
||||
/* Bell properties */
|
||||
gconf_peditor_new_numeric_range (changeset, "/gnome/desktop/peripherals/keyboard/bell_volume", WID ("bell_volume_range"));
|
||||
gconf_peditor_new_numeric_range (changeset, "/gnome/desktop/peripherals/keyboard/bell_pitch", WID ("bell_pitch_range"));
|
||||
gconf_peditor_new_numeric_range (changeset, "/gnome/desktop/peripherals/keyboard/bell_duration", WID ("bell_duration_range"));
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/bell_volume", WID ("bell_volume_range"), NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/bell_pitch", WID ("bell_pitch_range"), NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/gnome/desktop/peripherals/keyboard/bell_duration", WID ("bell_duration_range"), NULL);
|
||||
|
||||
g_signal_connect (G_OBJECT (WID ("bell_test_button")), "clicked", (GCallback) bell_cb, changeset);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
|
|||
*/
|
||||
/* Left-handed toggle */
|
||||
peditor = gconf_peditor_new_boolean
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/left_handed", WID ("left_handed_toggle"));
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/left_handed", WID ("left_handed_toggle"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) left_handed_toggle_cb, WID ("orientation_image"));
|
||||
|
||||
/* Make sure the image gets initialized correctly */
|
||||
|
|
@ -341,30 +341,27 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
|
|||
/* Double-click time */
|
||||
g_signal_connect (WID ("double_click_darea"), "expose_event", (GCallback) drawing_area_expose_event, changeset);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, DOUBLE_CLICK_KEY, WID ("delay_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", double_click_from_gconf,
|
||||
"conv-from-widget-cb", double_click_to_gconf,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, DOUBLE_CLICK_KEY, WID ("delay_scale"),
|
||||
"conv-to-widget-cb", double_click_from_gconf,
|
||||
"conv-from-widget-cb", double_click_to_gconf,
|
||||
NULL);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_acceleration", WID ("accel_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", motion_acceleration_from_gconf,
|
||||
"conv-from-widget-cb", motion_acceleration_to_gconf,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_acceleration", WID ("accel_scale"),
|
||||
"conv-to-widget-cb", motion_acceleration_from_gconf,
|
||||
"conv-from-widget-cb", motion_acceleration_to_gconf,
|
||||
NULL);
|
||||
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_threshold",
|
||||
WID ("sensitivity_scale"));
|
||||
WID ("sensitivity_scale"), NULL);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", threshold_from_gconf,
|
||||
"conv-from-widget-cb", gconf_value_float_to_int,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"),
|
||||
"conv-to-widget-cb", threshold_from_gconf,
|
||||
"conv-from-widget-cb", gconf_value_float_to_int,
|
||||
NULL);
|
||||
}
|
||||
|
||||
/* Construct the dialog */
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
|
|||
*/
|
||||
/* Left-handed toggle */
|
||||
peditor = gconf_peditor_new_boolean
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/left_handed", WID ("left_handed_toggle"));
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/left_handed", WID ("left_handed_toggle"), NULL);
|
||||
g_signal_connect (peditor, "value-changed", (GCallback) left_handed_toggle_cb, WID ("orientation_image"));
|
||||
|
||||
/* Make sure the image gets initialized correctly */
|
||||
|
|
@ -341,30 +341,27 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
|
|||
/* Double-click time */
|
||||
g_signal_connect (WID ("double_click_darea"), "expose_event", (GCallback) drawing_area_expose_event, changeset);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, DOUBLE_CLICK_KEY, WID ("delay_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", double_click_from_gconf,
|
||||
"conv-from-widget-cb", double_click_to_gconf,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, DOUBLE_CLICK_KEY, WID ("delay_scale"),
|
||||
"conv-to-widget-cb", double_click_from_gconf,
|
||||
"conv-from-widget-cb", double_click_to_gconf,
|
||||
NULL);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_acceleration", WID ("accel_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", motion_acceleration_from_gconf,
|
||||
"conv-from-widget-cb", motion_acceleration_to_gconf,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_acceleration", WID ("accel_scale"),
|
||||
"conv-to-widget-cb", motion_acceleration_from_gconf,
|
||||
"conv-from-widget-cb", motion_acceleration_to_gconf,
|
||||
NULL);
|
||||
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/motion_threshold",
|
||||
WID ("sensitivity_scale"));
|
||||
WID ("sensitivity_scale"), NULL);
|
||||
|
||||
peditor = gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"));
|
||||
g_object_set (peditor,
|
||||
"conv-to-widget-cb", threshold_from_gconf,
|
||||
"conv-from-widget-cb", gconf_value_float_to_int,
|
||||
NULL);
|
||||
gconf_peditor_new_numeric_range
|
||||
(changeset, "/desktop/gnome/peripherals/mouse/drag_threshold", WID ("drag_threshold_scale"),
|
||||
"conv-to-widget-cb", threshold_from_gconf,
|
||||
"conv-from-widget-cb", gconf_value_float_to_int,
|
||||
NULL);
|
||||
}
|
||||
|
||||
/* Construct the dialog */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
SUBDIRS = screensavers
|
||||
|
||||
cappletname = screensaver
|
||||
cappletgroup =
|
||||
bin_PROGRAMS = gnome-screensaver-properties
|
||||
|
||||
gnome_screensaver_properties_LDADD = @OLD_CAPPLET_LIBS@ -lXt
|
||||
|
|
@ -20,20 +18,21 @@ gnome_screensaver_properties_SOURCES = \
|
|||
gnome-startup.c gnome-startup.h \
|
||||
XScreenSaver_ad.h
|
||||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmaps_DATA = no-hack.png blank-screen.png checked.xpm unchecked.xpm
|
||||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = screensaver-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = screensaver-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
desktop_DATA = screensaver.desktop
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) @OLD_CAPPLET_CFLAGS@
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(pixmaps_DATA)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
Glade_DATA = $(cappletname)-properties.glade
|
||||
icons_DATA = $(cappletname)-capplet.png
|
||||
desktop = $(cappletname).desktop
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA) $(pixmaps_DATA)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue