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

constify a number of function arguments

Browse source 
2007-05-09  Jens Granseuer  <jensgr@gmx.net>

	* gconf-property-editor.c: (gconf_peditor_new),
	(gconf_peditor_new_boolean), (gconf_peditor_new_integer_valist),
	(gconf_peditor_new_integer), (gconf_peditor_new_string_valist),
	(gconf_peditor_new_string), (gconf_peditor_new_filename),
	(gconf_peditor_new_color), (gconf_peditor_new_select_menu),
	(gconf_peditor_new_select_menu_with_enum),
	(gconf_peditor_new_combo_box),
	(gconf_peditor_new_combo_box_with_enum),
	(gconf_peditor_new_select_radio),
	(gconf_peditor_new_numeric_range), (gconf_peditor_new_font),
	(gconf_peditor_new_enum_toggle), (gconf_peditor_new_image),
	(gconf_peditor_new_select_radio_with_enum):
	* gconf-property-editor.h: constify a number of function arguments

svn path=/trunk/; revision=7588
This commit is contained in:
Jens Granseuer 2007-05-09 18:52:47 +00:00 • committed by Jens Granseuer
parent cf66c0fd80
commit d3cad0bcbe
3 changed files with 107 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

16
capplets/common/ChangeLog
View file

@ -1,3 +1,19 @@
2007-05-09 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (gconf_peditor_new),
(gconf_peditor_new_boolean), (gconf_peditor_new_integer_valist),
(gconf_peditor_new_integer), (gconf_peditor_new_string_valist),
(gconf_peditor_new_string), (gconf_peditor_new_filename),
(gconf_peditor_new_color), (gconf_peditor_new_select_menu),
(gconf_peditor_new_select_menu_with_enum),
(gconf_peditor_new_combo_box),
(gconf_peditor_new_combo_box_with_enum),
(gconf_peditor_new_select_radio),
(gconf_peditor_new_numeric_range), (gconf_peditor_new_font),
(gconf_peditor_new_enum_toggle), (gconf_peditor_new_image),
(gconf_peditor_new_select_radio_with_enum):
* gconf-property-editor.h: constify a number of function arguments
2007-05-08 Jens Granseuer <jensgr@gmx.net> 2007-05-08 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (peditor_set_gconf_value), * gconf-property-editor.c: (peditor_set_gconf_value),

109
capplets/common/gconf-property-editor.c
View file

@ -94,7 +94,7 @@ static void gconf_property_editor_get_prop (GObject *object,
static void gconf_property_editor_finalize (GObject *object); static void gconf_property_editor_finalize (GObject *object);
static GObject *gconf_peditor_new (gchar *key, static GObject *gconf_peditor_new (const gchar *key,
GConfClientNotifyFunc cb, GConfClientNotifyFunc cb,
GConfChangeSet *changeset, GConfChangeSet *changeset,
GObject *ui_control, GObject *ui_control,
@ -350,7 +350,7 @@ gconf_property_editor_finalize (GObject *object)
} }
static GObject * static GObject *
gconf_peditor_new (gchar *key, gconf_peditor_new (const gchar *key,
GConfClientNotifyFunc cb, GConfClientNotifyFunc cb,
GConfChangeSet *changeset, GConfChangeSet *changeset,
GObject *ui_control, GObject *ui_control,
@ -467,9 +467,9 @@ peditor_boolean_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_boolean (GConfChangeSet *changeset, gconf_peditor_new_boolean (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *checkbox, GtkWidget *checkbox,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -548,9 +548,9 @@ peditor_integer_widget_changed (GConfPropertyEditor *peditor,
static GObject * static GObject *
gconf_peditor_new_integer_valist (GConfChangeSet *changeset, gconf_peditor_new_integer_valist (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
va_list var_args) va_list var_args)
{ {
GObject *peditor; GObject *peditor;
@ -571,9 +571,9 @@ gconf_peditor_new_integer_valist (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_integer (GConfChangeSet *changeset, gconf_peditor_new_integer (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -640,9 +640,9 @@ peditor_string_widget_changed (GConfPropertyEditor *peditor,
static GObject * static GObject *
gconf_peditor_new_string_valist (GConfChangeSet *changeset, gconf_peditor_new_string_valist (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
va_list var_args) va_list var_args)
{ {
GObject *peditor; GObject *peditor;
@ -663,9 +663,9 @@ gconf_peditor_new_string_valist (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_string (GConfChangeSet *changeset, gconf_peditor_new_string (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -688,9 +688,9 @@ gconf_peditor_new_string (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_filename (GConfChangeSet *changeset, gconf_peditor_new_filename (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *file_entry, GtkWidget *file_entry,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -763,9 +763,9 @@ peditor_color_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_color (GConfChangeSet *changeset, gconf_peditor_new_color (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *cb, GtkWidget *cb,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -917,9 +917,9 @@ peditor_select_menu_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_select_menu (GConfChangeSet *changeset, gconf_peditor_new_select_menu (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *option_menu, GtkWidget *option_menu,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -949,14 +949,14 @@ gconf_peditor_new_select_menu (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset, gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *option_menu, GtkWidget *option_menu,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GConfPropertyEditor *peditor; GObject *peditor;
GConfPropertyEditorEnumData *data; GConfPropertyEditorEnumData *data;
va_list var_args; va_list var_args;
@ -971,8 +971,7 @@ gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset,
va_start (var_args, first_property_name); va_start (var_args, first_property_name);
peditor = GCONF_PROPERTY_EDITOR ( peditor = gconf_peditor_new
gconf_peditor_new
(key, (key,
(GConfClientNotifyFunc) peditor_select_menu_value_changed, (GConfClientNotifyFunc) peditor_select_menu_value_changed,
changeset, changeset,
@ -988,14 +987,14 @@ gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset,
"data-free-cb", "data-free-cb",
g_free, g_free,
NULL NULL
)); );
va_end (var_args); va_end (var_args);
g_signal_connect_swapped (G_OBJECT (option_menu), "changed", g_signal_connect_swapped (G_OBJECT (option_menu), "changed",
(GCallback) peditor_select_menu_widget_changed, peditor); (GCallback) peditor_select_menu_widget_changed, peditor);
return G_OBJECT (peditor); return peditor;
} }
static void static void
@ -1037,9 +1036,9 @@ peditor_combo_box_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_combo_box (GConfChangeSet *changeset, gconf_peditor_new_combo_box (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *combo_box, GtkWidget *combo_box,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -1069,14 +1068,14 @@ gconf_peditor_new_combo_box (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset, gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *combo_box, GtkWidget *combo_box,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GConfPropertyEditor *peditor; GObject *peditor;
GConfPropertyEditorEnumData *data; GConfPropertyEditorEnumData *data;
va_list var_args; va_list var_args;
@ -1091,8 +1090,7 @@ gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset,
va_start (var_args, first_property_name); va_start (var_args, first_property_name);
peditor = GCONF_PROPERTY_EDITOR ( peditor = gconf_peditor_new
gconf_peditor_new
(key, (key,
(GConfClientNotifyFunc) peditor_combo_box_value_changed, (GConfClientNotifyFunc) peditor_combo_box_value_changed,
changeset, changeset,
@ -1108,14 +1106,14 @@ gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset,
"data-free-cb", "data-free-cb",
g_free, g_free,
NULL NULL
)); );
va_end (var_args); va_end (var_args);
g_signal_connect_swapped (G_OBJECT (combo_box), "changed", g_signal_connect_swapped (G_OBJECT (combo_box), "changed",
(GCallback) peditor_combo_box_widget_changed, peditor); (GCallback) peditor_combo_box_widget_changed, peditor);
return G_OBJECT (peditor); return peditor;
} }
static void static void
@ -1171,9 +1169,9 @@ peditor_select_radio_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_select_radio (GConfChangeSet *changeset, gconf_peditor_new_select_radio (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GSList *radio_group, GSList *radio_group,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -1290,9 +1288,9 @@ peditor_numeric_range_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_numeric_range (GConfChangeSet *changeset, gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *range, GtkWidget *range,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -1446,9 +1444,9 @@ peditor_font_widget_changed (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_font (GConfChangeSet *changeset, gconf_peditor_new_font (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *font_button, GtkWidget *font_button,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -1523,17 +1521,17 @@ peditor_enum_toggle_conv_from_widget (GConfPropertyEditor *peditor,
GObject * GObject *
gconf_peditor_new_enum_toggle (GConfChangeSet *changeset, gconf_peditor_new_enum_toggle (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *checkbox, GtkWidget *checkbox,
GType enum_type, GType enum_type,
GConfPEditorGetValueFn val_true_fn, GConfPEditorGetValueFn val_true_fn,
guint val_false, guint val_false,
gboolean use_nick, gboolean use_nick,
gpointer data, gpointer data,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GConfPropertyEditor *peditor; GObject *peditor;
GConfPropertyEditorEnumData *enum_data; GConfPropertyEditorEnumData *enum_data;
va_list var_args; va_list var_args;
@ -1550,8 +1548,7 @@ gconf_peditor_new_enum_toggle (GConfChangeSet *changeset,
va_start (var_args, first_property_name); va_start (var_args, first_property_name);
peditor = GCONF_PROPERTY_EDITOR ( peditor = gconf_peditor_new
gconf_peditor_new
(key, (key,
(GConfClientNotifyFunc) peditor_boolean_value_changed, (GConfClientNotifyFunc) peditor_boolean_value_changed,
changeset, changeset,
@ -1566,14 +1563,14 @@ gconf_peditor_new_enum_toggle (GConfChangeSet *changeset,
enum_data, enum_data,
"data-free-cb", "data-free-cb",
g_free, g_free,
NULL)); NULL);
va_end (var_args); va_end (var_args);
g_signal_connect_swapped (G_OBJECT (checkbox), "toggled", g_signal_connect_swapped (G_OBJECT (checkbox), "toggled",
(GCallback) peditor_boolean_widget_changed, peditor); (GCallback) peditor_boolean_widget_changed, peditor);
return G_OBJECT (peditor); return peditor;
} }
static gboolean static gboolean
@ -1806,9 +1803,9 @@ peditor_image_value_changed (GConfClient *client,
GObject * GObject *
gconf_peditor_new_image (GConfChangeSet *changeset, gconf_peditor_new_image (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *button, GtkWidget *button,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GObject *peditor; GObject *peditor;
@ -1838,14 +1835,14 @@ gconf_peditor_new_image (GConfChangeSet *changeset,
GObject * GObject *
gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset, gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GSList *radio_group, GSList *radio_group,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...) ...)
{ {
GConfPropertyEditor *peditor; GObject *peditor;
GConfPropertyEditorEnumData *enum_data; GConfPropertyEditorEnumData *enum_data;
GtkRadioButton *first_button; GtkRadioButton *first_button;
GSList *item; GSList *item;
@ -1864,8 +1861,7 @@ gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
va_start (var_args, first_property_name); va_start (var_args, first_property_name);
peditor = GCONF_PROPERTY_EDITOR ( peditor = gconf_peditor_new
gconf_peditor_new
(key, (key,
(GConfClientNotifyFunc) peditor_select_radio_value_changed, (GConfClientNotifyFunc) peditor_select_radio_value_changed,
changeset, changeset,
@ -1880,7 +1876,7 @@ gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
enum_data, enum_data,
"data-free-cb", "data-free-cb",
g_free, g_free,
NULL)); NULL);
va_end (var_args); va_end (var_args);
@ -1888,6 +1884,5 @@ gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
g_signal_connect_swapped (G_OBJECT (item->data), "toggled", g_signal_connect_swapped (G_OBJECT (item->data), "toggled",
(GCallback) peditor_select_radio_widget_changed, peditor); (GCallback) peditor_select_radio_widget_changed, peditor);
return G_OBJECT (peditor); return peditor;
} }

62
capplets/common/gconf-property-editor.h
View file

@ -61,103 +61,101 @@ const gchar *gconf_property_editor_get_key (GConfPropertyEditor *peditor
GObject *gconf_property_editor_get_ui_control (GConfPropertyEditor *peditor); GObject *gconf_property_editor_get_ui_control (GConfPropertyEditor *peditor);
GObject *gconf_peditor_new_boolean (GConfChangeSet *changeset, GObject *gconf_peditor_new_boolean (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *checkbox, GtkWidget *checkbox,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_enum_toggle (GConfChangeSet *changeset, GObject *gconf_peditor_new_enum_toggle (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *checkbox, GtkWidget *checkbox,
GType enum_type, GType enum_type,
GConfPEditorGetValueFn val_true_fn, GConfPEditorGetValueFn val_true_fn,
guint val_false, guint val_false,
gboolean use_nick, gboolean use_nick,
gpointer data, gpointer data,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_integer (GConfChangeSet *changeset, GObject *gconf_peditor_new_integer (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_string (GConfChangeSet *changeset, GObject *gconf_peditor_new_string (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *entry, GtkWidget *entry,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_filename (GConfChangeSet *changeset, GObject *gconf_peditor_new_filename (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *file_entry, GtkWidget *file_entry,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_color (GConfChangeSet *changeset, GObject *gconf_peditor_new_color (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *color_entry, GtkWidget *color_entry,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_select_menu (GConfChangeSet *changeset, GObject *gconf_peditor_new_select_menu (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *option_menu, GtkWidget *option_menu,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset, GObject *gconf_peditor_new_select_menu_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *option_menu, GtkWidget *option_menu,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_combo_box (GConfChangeSet *changeset, GObject *gconf_peditor_new_combo_box (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *combo_box, GtkWidget *combo_box,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset, GObject *gconf_peditor_new_combo_box_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *combo_box, GtkWidget *combo_box,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_select_radio (GConfChangeSet *changeset, GObject *gconf_peditor_new_select_radio (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GSList *radio_group, GSList *radio_group,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset, GObject *gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GSList *radio_group, GSList *radio_group,
GType enum_type, GType enum_type,
gboolean use_nick, gboolean use_nick,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_numeric_range (GConfChangeSet *changeset, GObject *gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *range, GtkWidget *range,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_font (GConfChangeSet *changeset, GObject *gconf_peditor_new_font (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *font_button, GtkWidget *font_button,
gchar *first_property_name, const gchar *first_property_name,
...); ...);
GObject *gconf_peditor_new_image (GConfChangeSet *changeset, GObject *gconf_peditor_new_image (GConfChangeSet *changeset,
gchar *key, const gchar *key,
GtkWidget *button, GtkWidget *button,
gchar *first_property, const gchar *first_property,
...); ...);
void gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor, void gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,