diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2008-04-03 19:52:40 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2008-04-03 19:52:40 +0000 |
| commit | 64bb8141c669ab3f36a713885472045c6c2ba035 (patch) | |
| tree | e612211b16213e3ca79cfa3aac10ebbeed50ae79 /gladeui/glade-signal-editor.c | |
| parent | 1b84fad310e3f98deb960fc09bc6ad6ba9169671 (diff) | |
| download | glade-64bb8141c669ab3f36a713885472045c6c2ba035.tar.gz | |
merging builder branch into trunk
A plugins/gtk+/glade-keysyms.c
M plugins/gtk+/glade-gtk.c
M plugins/gtk+/gtk+.xml.in
A plugins/gtk+/glade-accels.c
M plugins/gtk+/Makefile.am
A plugins/gtk+/glade-accels.h
M ChangeLog
M gladeui/glade-editor.c
M gladeui/glade-editor-property.c
M gladeui/glade-editor-property.h
M gladeui/glade-widget.c
M gladeui/glade-widget.h
M gladeui/glade-widget-adaptor.c
M gladeui/glade-command.c
M gladeui/glade-widget-adaptor.h
M gladeui/glade-parser.c
M gladeui/glade-xml-utils.c
M gladeui/glade-base-editor.c
M gladeui/glade-utils.c
D gladeui/glade-parser.h
M gladeui/glade-signal-editor.c
M gladeui/glade-xml-utils.h
D gladeui/glade-keysyms.c
M gladeui/glade-property.c
M gladeui/glade-property-class.c
M gladeui/glade-property.h
M gladeui/glade-builtins.c
M gladeui/glade-property-class.h
M gladeui/glade-builtins.h
M gladeui/glade-project.c
M gladeui/glade-signal.c
M gladeui/Makefile.am
M gladeui/glade-signal.h
svn path=/trunk/; revision=1764
Diffstat (limited to 'gladeui/glade-signal-editor.c')
| -rw-r--r-- | gladeui/glade-signal-editor.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gladeui/glade-signal-editor.c b/gladeui/glade-signal-editor.c index d62e0e94..06fac409 100644 --- a/gladeui/glade-signal-editor.c +++ b/gladeui/glade-signal-editor.c @@ -102,8 +102,8 @@ glade_signal_editor_after_toggled (GtkCellRendererToggle *cell, g_assert (signal_name != NULL); } - old_signal = glade_signal_new (signal_name, handler, userdata, lookup, after); - new_signal = glade_signal_new (signal_name, handler, userdata, lookup, !after); + old_signal = glade_signal_new (signal_name, handler, userdata, after); + new_signal = glade_signal_new (signal_name, handler, userdata, !after); glade_command_change_signal (editor->widget, old_signal, new_signal); gtk_tree_store_set (GTK_TREE_STORE (model), &iter, COLUMN_AFTER, !after, -1); @@ -348,7 +348,7 @@ glade_signal_editor_handler_cell_edited (GtkCellRendererText *cell, if (slot && !is_void_signal_handler(new_handler)) { GladeSignal *new_signal = glade_signal_new (signal_name, new_handler, - NULL, FALSE, FALSE); + NULL, FALSE); glade_command_add_signal (glade_widget, new_signal); glade_signal_free (new_signal); gtk_tree_store_set (GTK_TREE_STORE (model), &iter, @@ -368,7 +368,7 @@ glade_signal_editor_handler_cell_edited (GtkCellRendererText *cell, glade_signal_new (signal_name, old_handler, is_void_user_data (userdata) ? NULL : userdata, - lookup, after); + after); glade_command_remove_signal (glade_widget, old_signal); glade_signal_free (old_signal); @@ -397,14 +397,12 @@ glade_signal_editor_handler_cell_edited (GtkCellRendererText *cell, (signal_name, old_handler, is_void_user_data(userdata) ? NULL : userdata, - lookup, after); GladeSignal *new_signal = glade_signal_new (signal_name, new_handler, is_void_user_data(userdata) ? NULL : userdata, - lookup, after); glade_command_change_signal (glade_widget, old_signal, new_signal); @@ -619,14 +617,12 @@ glade_signal_editor_userdata_cell_edited (GtkCellRendererText *cell, old_signal = glade_signal_new (signal_name, handler, - is_void_user_data(old_userdata) ? NULL : old_userdata, - lookup, after); + is_void_user_data(old_userdata) ? NULL : old_userdata, after); new_signal = glade_signal_new (signal_name, handler, - is_void_user_data(new_userdata) ? NULL : new_userdata, - lookup, after); + is_void_user_data(new_userdata) ? NULL : new_userdata, after); if (glade_signal_equal (old_signal, new_signal) == FALSE) glade_command_change_signal (glade_widget, old_signal, new_signal); @@ -921,7 +917,7 @@ glade_signal_editor_load_widget (GladeSignalEditor *editor, COLUMN_USERDATA, widget_signal->userdata ? widget_signal->userdata : _(USERDATA_DEFAULT), - COLUMN_LOOKUP, widget_signal->lookup, + COLUMN_LOOKUP, FALSE/* widget_signal->lookup */, COLUMN_LOOKUP_VISIBLE, widget_signal->userdata ? TRUE : FALSE, COLUMN_AFTER_VISIBLE, TRUE, @@ -944,7 +940,7 @@ glade_signal_editor_load_widget (GladeSignalEditor *editor, COLUMN_USERDATA, widget_signal->userdata ? widget_signal->userdata : _(USERDATA_DEFAULT), - COLUMN_LOOKUP, widget_signal->lookup, + COLUMN_LOOKUP, FALSE/* widget_signal->lookup */, COLUMN_LOOKUP_VISIBLE, widget_signal->userdata ? TRUE : FALSE, COLUMN_AFTER_VISIBLE, TRUE, |