Revision: 3143 http://geany.svn.sourceforge.net/geany/?rev=3143&view=rev Author: eht16 Date: 2008-10-22 15:36:45 +0000 (Wed, 22 Oct 2008)
Log Message: ----------- Replace gtk_widget_(un)ref() with g_object(un)ref(), patch by Colomban Wendling, thanks.
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/export.c trunk/src/build.c trunk/src/dialogs.c trunk/src/search.c trunk/src/ui_utils.c trunk/src/vte.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/ChangeLog 2008-10-22 15:36:45 UTC (rev 3143) @@ -10,6 +10,10 @@ Change code where PATH_MAX was used unnecessarily. Use GSlice API when building against GLib >= 2.10 (patch by Colomban Wendling, thanks). + * plugins/export.c, src/build.c, src/dialogs.c, src/search.c, + src/ui_utils.c, src/vte.c: + Replace gtk_widget_(un)ref() with g_object(un)ref(), + patch by Colomban Wendling, thanks.
2008-10-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/plugins/export.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -198,7 +198,7 @@ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox);
g_object_set_data_full(G_OBJECT(dialog), "check_zoom_level", - gtk_widget_ref(check_zoom_level), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_zoom_level), (GDestroyNotify) g_object_unref);
exi->have_zoom_level_checkbox = TRUE; }
Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/src/build.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -1379,7 +1379,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[0], 1, 2, 0, 1); g_object_set_data_full(G_OBJECT(dialog), "tex_entry1", - gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[0]), (GDestroyNotify)g_object_unref); }
/* LaTeX -> PDF args */ @@ -1398,7 +1398,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[1], 1, 2, 1, 2); g_object_set_data_full(G_OBJECT(dialog), "tex_entry2", - gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[1]), (GDestroyNotify)g_object_unref); }
/* View LaTeX -> DVI args */ @@ -1417,7 +1417,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[2], 1, 2, 2, 3); g_object_set_data_full(G_OBJECT(dialog), "tex_entry3", - gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[2]), (GDestroyNotify)g_object_unref); }
/* View LaTeX -> PDF args */ @@ -1436,7 +1436,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[3], 1, 2, 3, 4); g_object_set_data_full(G_OBJECT(dialog), "tex_entry4", - gtk_widget_ref(entries[3]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[3]), (GDestroyNotify)g_object_unref); }
label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n" @@ -1563,7 +1563,7 @@ row++;
g_object_set_data_full(G_OBJECT(dialog), "includes_entry1", - gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[0]), (GDestroyNotify)g_object_unref); }
/* lib-args */ @@ -1584,7 +1584,7 @@ row++;
g_object_set_data_full(G_OBJECT(dialog), "includes_entry2", - gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[1]), (GDestroyNotify)g_object_unref); }
/* program-args */ @@ -1605,7 +1605,7 @@ row++;
g_object_set_data_full(G_OBJECT(dialog), "includes_entry3", - gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entries[2]), (GDestroyNotify)g_object_unref);
/* disable the run command if there is a valid project run command set */ if (app->project && NZV(app->project->run_cmd))
Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/src/dialogs.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -358,13 +358,13 @@ G_CALLBACK(on_file_open_check_hidden_toggled), NULL);
g_object_set_data_full(G_OBJECT(ui_widgets.open_filesel), "file_entry", - gtk_widget_ref(file_entry), (GDestroyNotify)gtk_widget_unref); + g_object_ref(file_entry), (GDestroyNotify)g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.open_filesel), "check_hidden", - gtk_widget_ref(check_hidden), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_hidden), (GDestroyNotify)g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.open_filesel), "filetype_combo", - gtk_widget_ref(filetype_combo), (GDestroyNotify)gtk_widget_unref); + g_object_ref(filetype_combo), (GDestroyNotify)g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.open_filesel), "encoding_combo", - gtk_widget_ref(encoding_combo), (GDestroyNotify)gtk_widget_unref); + g_object_ref(encoding_combo), (GDestroyNotify)g_object_unref);
return vbox; } @@ -504,7 +504,7 @@ G_CALLBACK(on_save_as_new_tab_toggled), rename_btn);
g_object_set_data_full(G_OBJECT(ui_widgets.save_filesel), "check_open_new_tab", - gtk_widget_ref(check_open_new_tab), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_open_new_tab), (GDestroyNotify)g_object_unref);
g_signal_connect(ui_widgets.save_filesel, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/src/search.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -138,7 +138,7 @@
check_regexp = gtk_check_button_new_with_mnemonic(_("_Use regular expressions")); g_object_set_data_full(G_OBJECT(dialog), "check_regexp", - gtk_widget_ref(check_regexp), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_regexp), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_regexp), FALSE); gtk_tooltips_set_tip(tooltips, check_regexp, _("Use POSIX-like regular expressions. " "For detailed information about using regular expressions, please read the documentation."), NULL); @@ -149,7 +149,7 @@ { check_back = gtk_check_button_new_with_mnemonic(_("Search _backwards")); g_object_set_data_full(G_OBJECT(dialog), "check_back", - gtk_widget_ref(check_back), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_back), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_back), FALSE); } else @@ -163,7 +163,7 @@ } checkbox7 = gtk_check_button_new_with_mnemonic(_("Use _escape sequences")); g_object_set_data_full(G_OBJECT(dialog), "check_escape", - gtk_widget_ref(checkbox7), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox7), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox7), FALSE); gtk_tooltips_set_tip(tooltips, checkbox7, _("Replace \\, \t, \n, \r and \uXXXX (Unicode chararacters) with the " @@ -177,17 +177,17 @@
checkbox1 = gtk_check_button_new_with_mnemonic(_("C_ase sensitive")); g_object_set_data_full(G_OBJECT(dialog), "check_case", - gtk_widget_ref(checkbox1), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox1), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox1), FALSE);
checkbox2 = gtk_check_button_new_with_mnemonic(_("Match only a _whole word")); g_object_set_data_full(G_OBJECT(dialog), "check_word", - gtk_widget_ref(checkbox2), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox2), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE);
checkbox5 = gtk_check_button_new_with_mnemonic(_("Match from s_tart of word")); g_object_set_data_full(G_OBJECT(dialog), "check_wordstart", - gtk_widget_ref(checkbox5), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox5), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox5), FALSE);
/* Matching options */ @@ -312,7 +312,7 @@ gtk_dialog_add_action_widget(GTK_DIALOG(widgets.find_dialog), button, GEANY_RESPONSE_FIND_PREVIOUS); g_object_set_data_full(G_OBJECT(widgets.find_dialog), "btn_previous", - gtk_widget_ref(button), (GDestroyNotify)gtk_widget_unref); + g_object_ref(button), (GDestroyNotify)g_object_unref);
button = ui_button_new_with_image(GTK_STOCK_GO_FORWARD, _("_Next")); gtk_dialog_add_action_widget(GTK_DIALOG(widgets.find_dialog), button, @@ -327,7 +327,7 @@ gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50); if (sel) gtk_entry_set_text(GTK_ENTRY(GTK_BIN(entry)->child), sel); g_object_set_data_full(G_OBJECT(widgets.find_dialog), "entry", - gtk_widget_ref(entry), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entry), (GDestroyNotify)g_object_unref);
g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate", G_CALLBACK(on_find_entry_activate), NULL); @@ -368,7 +368,7 @@ /* close window checkbox */ check_close = gtk_check_button_new_with_mnemonic(_("Close _dialog")); g_object_set_data_full(G_OBJECT(widgets.find_dialog), "check_close", - gtk_widget_ref(check_close), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_close), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); gtk_tooltips_set_tip(tooltips, check_close, _("Disable this option to keep the dialog open."), NULL); @@ -453,14 +453,14 @@ gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50); if (sel) gtk_entry_set_text(GTK_ENTRY(GTK_BIN(entry_find)->child), sel); g_object_set_data_full(G_OBJECT(widgets.replace_dialog), "entry_find", - gtk_widget_ref(entry_find), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entry_find), (GDestroyNotify)g_object_unref);
entry_replace = gtk_combo_box_entry_new_text(); gtk_label_set_mnemonic_widget(GTK_LABEL(label_replace), entry_replace); gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 248); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50); g_object_set_data_full(G_OBJECT(widgets.replace_dialog), "entry_replace", - gtk_widget_ref(entry_replace), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entry_replace), (GDestroyNotify)g_object_unref);
g_signal_connect(gtk_bin_get_child(GTK_BIN(entry_find)), "key-press-event", G_CALLBACK(on_widget_key_pressed_set_focus), @@ -514,7 +514,7 @@ /* close window checkbox */ check_close = gtk_check_button_new_with_mnemonic(_("Close _dialog")); g_object_set_data_full(G_OBJECT(widgets.replace_dialog), "check_close", - gtk_widget_ref(check_close), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_close), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); gtk_tooltips_set_tip(tooltips, check_close, _("Disable this option to keep the dialog open."), NULL); @@ -594,7 +594,7 @@ gtk_entry_set_max_length(GTK_ENTRY(entry), 248); gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "dir_combo", - gtk_widget_ref(dir_combo), (GDestroyNotify)gtk_widget_unref); + g_object_ref(dir_combo), (GDestroyNotify)g_object_unref);
dbox = ui_path_box_new(NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(entry)); @@ -624,14 +624,14 @@ /* Make fixed strings the default to speed up searching all files in directory. */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rbtn), TRUE); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_fgrep", - gtk_widget_ref(rbtn), (GDestroyNotify)gtk_widget_unref); + g_object_ref(rbtn), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); gtk_container_add(GTK_CONTAINER(rbox), rbtn);
rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), _("_Grep regular expressions")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_grep", - gtk_widget_ref(rbtn), (GDestroyNotify)gtk_widget_unref); + g_object_ref(rbtn), (GDestroyNotify)g_object_unref); gtk_tooltips_set_tip(tooltips, rbtn, _("See grep's manual page for more information."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); @@ -646,23 +646,23 @@
check_recursive = gtk_check_button_new_with_mnemonic(_("_Recurse in subfolders")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_recursive", - gtk_widget_ref(check_recursive), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_recursive), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_recursive), FALSE);
checkbox1 = gtk_check_button_new_with_mnemonic(_("C_ase sensitive")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_case", - gtk_widget_ref(checkbox1), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox1), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox1), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox1), TRUE);
check_wholeword = gtk_check_button_new_with_mnemonic(_("Match only a _whole word")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_wholeword", - gtk_widget_ref(check_wholeword), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_wholeword), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_wholeword), FALSE);
checkbox2 = gtk_check_button_new_with_mnemonic(_("_Invert search results")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_invert", - gtk_widget_ref(checkbox2), (GDestroyNotify)gtk_widget_unref); + g_object_ref(checkbox2), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE); gtk_tooltips_set_tip(tooltips, checkbox2, _("Invert the sense of matching, to select non-matching lines."), NULL); @@ -683,7 +683,7 @@
check_extra = gtk_check_button_new_with_mnemonic(_("E_xtra options:")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_extra", - gtk_widget_ref(check_extra), (GDestroyNotify)gtk_widget_unref); + g_object_ref(check_extra), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE);
entry_extra = gtk_entry_new(); @@ -691,7 +691,7 @@ gtk_entry_set_text(GTK_ENTRY(entry_extra), search_prefs.fif_extra_options); gtk_widget_set_sensitive(entry_extra, FALSE); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "entry_extra", - gtk_widget_ref(entry_extra), (GDestroyNotify)gtk_widget_unref); + g_object_ref(entry_extra), (GDestroyNotify)g_object_unref); gtk_tooltips_set_tip(tooltips, entry_extra, _("Other options to pass to Grep"), NULL);
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/src/ui_utils.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -541,14 +541,14 @@ gtk_widget_show(item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_insert_date_activate), str); g_object_set_data_full(G_OBJECT(main_widgets.window), - "insert_date_custom1", gtk_widget_ref(item), (GDestroyNotify)gtk_widget_unref); + "insert_date_custom1", g_object_ref(item), (GDestroyNotify)g_object_unref);
item = gtk_menu_item_new_with_mnemonic(str); gtk_container_add(GTK_CONTAINER(menu_popup), item); gtk_widget_show(item); g_signal_connect(item, "activate", G_CALLBACK(on_insert_date_activate), str); g_object_set_data_full(G_OBJECT(main_widgets.editor_menu), - "insert_date_custom2", gtk_widget_ref(item), (GDestroyNotify)gtk_widget_unref); + "insert_date_custom2", g_object_ref(item), (GDestroyNotify)g_object_unref);
insert_date_items(menu_edit, menu_popup, _("_Set Custom Date Format")); } @@ -1208,9 +1208,7 @@ { GtkSizeGroup *size_group;
- /* set_spacing is deprecated but there seems to be no alternative, - * GTK 2.6 defaults to no spacing, unlike dialog button box */ - gtk_button_box_set_spacing(copy, 10); + gtk_box_set_spacing(GTK_BOX(copy), 10); gtk_button_box_set_layout(copy, gtk_button_box_get_layout(master));
/* now we need to put the widest widget from each button box in a size group, @@ -1409,7 +1407,7 @@ (GDestroyNotify) g_free); g_object_set_data(G_OBJECT(open_btn), "action", (gpointer) action); g_object_set_data_full(G_OBJECT(open_btn), "entry", - gtk_widget_ref(path_entry), (GDestroyNotify) gtk_widget_unref); + g_object_ref(path_entry), (GDestroyNotify) g_object_unref); g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn); }
Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2008-10-22 15:36:16 UTC (rev 3142) +++ trunk/src/vte.c 2008-10-22 15:36:45 UTC (rev 3143) @@ -833,31 +833,31 @@ gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0);
g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "font_term", - gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref); + g_object_ref(font_term), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "color_fore", - gtk_widget_ref(color_fore), (GDestroyNotify) gtk_widget_unref); + g_object_ref(color_fore), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "color_back", - gtk_widget_ref(color_back), (GDestroyNotify) gtk_widget_unref); + g_object_ref(color_back), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "spin_scrollback", - gtk_widget_ref(spin_scrollback), (GDestroyNotify) gtk_widget_unref); + g_object_ref(spin_scrollback), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "entry_emulation", - gtk_widget_ref(entry_emulation), (GDestroyNotify) gtk_widget_unref); + g_object_ref(entry_emulation), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "entry_shell", - gtk_widget_ref(entry_shell), (GDestroyNotify) gtk_widget_unref); + g_object_ref(entry_shell), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_scroll_key", - gtk_widget_ref(check_scroll_key), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_scroll_key), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_scroll_out", - gtk_widget_ref(check_scroll_out), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_scroll_out), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_enable_bash_keys", - gtk_widget_ref(check_enable_bash_keys), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_enable_bash_keys), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_ignore_menu_key", - gtk_widget_ref(check_ignore_menu_key), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_ignore_menu_key), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_follow_path", - gtk_widget_ref(check_follow_path), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_follow_path), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_run_in_vte", - gtk_widget_ref(check_run_in_vte), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_run_in_vte), (GDestroyNotify) g_object_unref); g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_skip_script", - gtk_widget_ref(check_skip_script), (GDestroyNotify) gtk_widget_unref); + g_object_ref(check_skip_script), (GDestroyNotify) g_object_unref);
gtk_widget_show_all(frame);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.