Commits June 2014

commits@lists.geany.org

1 participants
35 discussions

[geany/geany] 517bf5: Move Glade-only callbacks out of callbacks.h
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 15:53:55 UTC Commit: 517bf5f960fd4559073bf62039893aa39f8a4bf8 https://github.com/geany/geany/commit/517bf5f960fd4559073bf62039893aa39f8a4… Log Message: ----------- Move Glade-only callbacks out of callbacks.h There is no need to expose the Glade-only callbacks in the header as nobody uses them directly anyway; and not having them makes the header a little less bloated. Modified Paths: -------------- src/callbacks.c src/callbacks.h Modified: src/callbacks.c 75 lines changed, 75 insertions(+), 0 deletions(-) =================================================================== @@ -73,6 +73,81 @@ #include <time.h> +/* prototypes of Glade-only callback to let the compiler know they really are meant to be exported */ +G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data); +G_MODULE_EXPORT void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); +G_MODULE_EXPORT void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); +G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); +G_MODULE_EXPORT void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); + + /* flag to indicate that an insert callback was triggered from the file menu, * so we need to store the current cursor position in editor_info.click_pos. */ static gboolean insert_callback_from_menu = FALSE; Modified: src/callbacks.h 146 lines changed, 2 insertions(+), 144 deletions(-) =================================================================== @@ -30,20 +30,14 @@ extern gboolean ignore_callback; gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata); -G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data); void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data); @@ -54,20 +48,12 @@ G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_dat G_MODULE_EXPORT void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data); void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data); gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer user_data); -G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -90,26 +76,12 @@ void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpoi G_MODULE_EXPORT void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - G_MODULE_EXPORT void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -117,7 +89,9 @@ G_MODULE_EXPORT void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data G_MODULE_EXPORT void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data); + G_MODULE_EXPORT void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data); + G_MODULE_EXPORT void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -142,54 +116,18 @@ G_MODULE_EXPORT void on_help1_activate(GtkMenuItem *menuitem, gpointer user_data void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data); - -G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data); - -G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data); - G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); - -G_MODULE_EXPORT void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data); void on_toolbutton_run_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); - G_MODULE_EXPORT void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -198,8 +136,6 @@ G_MODULE_EXPORT void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointe G_MODULE_EXPORT void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - G_MODULE_EXPORT void on_menu_comment_line1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_menu_uncomment_line1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -212,18 +148,10 @@ G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *men G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_project_open1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -232,14 +160,10 @@ G_MODULE_EXPORT void on_project_close1_activate(GtkMenuItem *menuitem, gpointer G_MODULE_EXPORT void on_project_properties1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_remove_markers1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -248,20 +172,8 @@ void on_back_activate(GtkMenuItem *menuitem, gpointer user_data); void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data); - gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); -G_MODULE_EXPORT void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); - -G_MODULE_EXPORT void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); G_MODULE_EXPORT void on_line_breaking1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -270,70 +182,16 @@ G_MODULE_EXPORT void on_replace_spaces_activate(GtkMenuItem *menuitem, gpointer G_MODULE_EXPORT void on_previous_message1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_close_other_documents1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_debug_messages1_activate (GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - -G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); - G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, gpointer user_data); gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); -G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data); - -G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); - -G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); - G_END_DECLS #endif /* GEANY_CALLBACKS_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3b1fbc: Normalize callbacks prototypes
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 14:53:07 UTC Commit: 3b1fbc16e5a01d4643d01f29abc7e8e8504688f6 https://github.com/geany/geany/commit/3b1fbc16e5a01d4643d01f29abc7e8e850468… Log Message: ----------- Normalize callbacks prototypes Modified Paths: -------------- src/callbacks.h Modified: src/callbacks.h 757 lines changed, 216 insertions(+), 541 deletions(-) =================================================================== @@ -28,636 +28,311 @@ G_BEGIN_DECLS extern gboolean ignore_callback; -gboolean -on_exit_clicked (GtkWidget *widget, gpointer gdata); +gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata); -G_MODULE_EXPORT void -on_new1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_save1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_save_as1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_quit1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_info1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_open1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_change_font1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_close_clicked (GtkAction *action, - gpointer user_data); +void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data); -void -on_toolbutton_close_all_clicked (GtkAction *action, - gpointer user_data); +void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_save_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_close1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_close_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_crlf_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_lf_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_cr_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_replace_tabs_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_search_clicked (GtkAction *action, - gpointer user_data); +void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data); -gboolean -toolbar_popup_menu (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); - -G_MODULE_EXPORT void -on_hide_toolbar1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_undo1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_redo1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_cut1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_copy1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_paste1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_delete1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_zoom_in1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_zoom_out1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void -on_toolbar_search_entry_changed (GtkAction *action, - const gchar *text, - gpointer user_data); - -void -on_toolbar_search_entry_activate (GtkAction *action, - const gchar *text, - gpointer user_data); - -G_MODULE_EXPORT void -on_toggle_case1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_show_toolbar1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_fullscreen1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_markers_margin1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_find_usage1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_show_messages_window1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_color_schemes_activate (GtkImageMenuItem *imagemenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_count_words1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_preferences1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_normal_size1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_edit1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_show_color_chooser1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_find1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_find_next1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_find_previous1_activate (GtkMenuItem *menuitem, - gpointer user_data); -G_MODULE_EXPORT void -on_find_nextsel1_activate (GtkMenuItem *menuitem, - gpointer user_data); -G_MODULE_EXPORT void -on_find_prevsel1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_replace1_activate (GtkMenuItem *menuitem, - gpointer user_data); +gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer user_data); -G_MODULE_EXPORT void -on_find_in_files1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_new_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_open_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_save_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_quit_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_preferences_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_toolbutton_reload_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_go_to_line_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_help1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_compile_clicked (GtkAction *action, - gpointer user_data); +void on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data); -G_MODULE_EXPORT void -on_website1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); -G_MODULE_EXPORT void -on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data); +G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_function_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_multiline_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_changelog_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_gpl_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_fileheader_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_insert_include_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_insert_date_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_set_file_readonly1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +G_MODULE_EXPORT void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_tv_notebook_switch_page (GtkNotebook *notebook, - gpointer page, - guint page_num, - gpointer user_data); +G_MODULE_EXPORT void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_help_shortcuts1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_file_properties_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_show_line_numbers1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +G_MODULE_EXPORT void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_use_auto_indentation1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +void on_toolbutton_new_clicked(GtkAction *action, gpointer user_data); +void on_toolbutton_open_clicked(GtkAction *action, gpointer user_data); +void on_toolbutton_save_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_menu_fold_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_toolbutton_quit_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_menu_unfold_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_toolbutton_preferences_clicked(GtkAction *action, gpointer user_data); -void -on_toolbutton_goto_entry_activate (GtkAction *action, const gchar *text, gpointer user_data); +G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data); -void -on_toolbutton_goto_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_toolbutton_run_clicked (GtkAction *action, - gpointer user_data); +G_MODULE_EXPORT void on_help1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_notebook1_switch_page_after (GtkNotebook *notebook, - gpointer page, - guint page_num, - gpointer user_data); +void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_menu_remove_indicators1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_print1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data); -G_MODULE_EXPORT void -on_menu_select_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data); -G_MODULE_EXPORT void -on_menu_show_sidebar1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data); -G_MODULE_EXPORT void -on_menu_write_unicode_bom1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); +G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_comment_line1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_uncomment_line1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_increase_indent1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_decrease_indent1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_toggle_line_commentation1_activate - (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_next_message1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_comments_multiline_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_comments_gpl_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); -void -on_menu_insert_include_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data); -void -on_menu_insert_date_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_menu_comments_bsd_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_comments_bsd_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_project_new1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_project_open1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_project_close1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); -G_MODULE_EXPORT void -on_project_properties1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_menu_project1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_open_selected_file1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_remove_markers1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_load_tags1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_context_action1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_toggle_all_additional_widgets1_activate - (GtkMenuItem *menuitem, - gpointer user_data); -void -on_back_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void -on_forward_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_file1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -gboolean -on_motion_event (GtkWidget *widget, - GdkEventMotion *event, - gpointer user_data); - -G_MODULE_EXPORT void -on_tv_notebook_switch_page_after (GtkNotebook *notebook, - gpointer page, - guint page_num, - gpointer user_data); - -G_MODULE_EXPORT void -on_tabs1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_spaces1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - - -G_MODULE_EXPORT void -on_strip_trailing_spaces1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_page_setup1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT gboolean -on_escape_key_press_event (GtkWidget *widget, - GdkEventKey *event, - gpointer user_data); - -G_MODULE_EXPORT void -on_line_breaking1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - -G_MODULE_EXPORT void -on_replace_spaces_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_previous_message1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_search1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_close_other_documents1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_reload_configuration1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_find_document_usage1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_tabs_and_spaces1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); -G_MODULE_EXPORT void -on_debug_messages1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_show_white_space1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_show_line_endings1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_menu_show_indentation_guides1_toggled - (GtkCheckMenuItem *checkmenuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_send_selection_to_vte1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -gboolean -on_window_state_event (GtkWidget *widget, - GdkEventWindowState *event, - gpointer user_data); +void on_toolbutton_run_clicked(GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void -on_customize_toolbar1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); -G_MODULE_EXPORT void -on_button_customize_toolbar_clicked (GtkButton *button, - gpointer user_data); +G_MODULE_EXPORT void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_cut_current_lines1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_copy_current_lines1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_delete_current_lines1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_duplicate_line_or_selection1_activate - (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -G_MODULE_EXPORT void -on_select_current_lines1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_comment_line1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_select_current_paragraph1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_uncomment_line1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_insert_alternative_white_space1_activate - (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_go_to_next_marker1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_increase_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_go_to_previous_marker1_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_decrease_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void -on_reflow_lines_block1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_smart_line_indent1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_plugin_preferences1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_goto_tag_definition1 (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_goto_tag_declaration1 (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_indent_width_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_reset_indentation1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - -G_MODULE_EXPORT void -on_mark_all1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_detect_type_from_file_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void -on_detect_width_from_file_activate (GtkMenuItem *menuitem, - gpointer user_data); +G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data); + +void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); + +void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_project_open1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_project_close1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_project_properties1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_remove_markers1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem *menuitem, gpointer user_data); + +void on_back_activate(GtkMenuItem *menuitem, gpointer user_data); + +void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data); + +gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); + +G_MODULE_EXPORT void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data); + +G_MODULE_EXPORT void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); + +G_MODULE_EXPORT void on_line_breaking1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_replace_spaces_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_previous_message1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_close_other_documents1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_debug_messages1_activate (GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); + +G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); + +G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, gpointer user_data); + +gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); + +G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data); + +G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); + +G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 220545: Don't export callbacks not used from Glade
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 14:44:10 UTC Commit: 220545d988ab90c46699fa5586d8115de104c0d6 https://github.com/geany/geany/commit/220545d988ab90c46699fa5586d8115de104c… Log Message: ----------- Don't export callbacks not used from Glade Modified Paths: -------------- src/callbacks.c src/callbacks.h Modified: src/callbacks.c 46 lines changed, 23 insertions(+), 23 deletions(-) =================================================================== @@ -126,7 +126,7 @@ static void quit_app(void) /* wrapper function to abort exit process if cancel button is pressed */ -G_MODULE_EXPORT gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata) +gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata) { main_status.quitting = TRUE; @@ -386,7 +386,7 @@ G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data /* quit toolbar button */ -G_MODULE_EXPORT void on_toolbutton_quit_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_quit_clicked(GtkAction *action, gpointer user_data) { on_exit_clicked(NULL, NULL); } @@ -410,21 +410,21 @@ G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer us /* new file */ -G_MODULE_EXPORT void on_toolbutton_new_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_new_clicked(GtkAction *action, gpointer user_data) { document_new_file(NULL, NULL, NULL); } /* open file */ -G_MODULE_EXPORT void on_toolbutton_open_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_open_clicked(GtkAction *action, gpointer user_data) { dialogs_show_open_file(); } /* save file */ -G_MODULE_EXPORT void on_toolbutton_save_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_save_clicked(GtkAction *action, gpointer user_data) { on_save1_activate(NULL, user_data); } @@ -454,21 +454,21 @@ static void do_toolbar_search(const gchar *text, gboolean incremental, gboolean /* search text */ -G_MODULE_EXPORT void on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data) +void on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data) { do_toolbar_search(text, TRUE, FALSE); } /* search text */ -G_MODULE_EXPORT void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) +void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) { do_toolbar_search(text, FALSE, GPOINTER_TO_INT(user_data)); } /* search text */ -G_MODULE_EXPORT void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data) { GeanyDocument *doc = document_get_current(); gboolean result; @@ -536,19 +536,19 @@ G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer us /* close tab */ -G_MODULE_EXPORT void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data) { on_close1_activate(NULL, NULL); } -G_MODULE_EXPORT void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data) { on_close_all1_activate(NULL, NULL); } -G_MODULE_EXPORT void on_toolbutton_preferences_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_preferences_clicked(GtkAction *action, gpointer user_data) { on_preferences1_activate(NULL, NULL); } @@ -945,7 +945,7 @@ G_MODULE_EXPORT void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpoi } -G_MODULE_EXPORT void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data) { keybindings_send_command(GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_COMPILE); } @@ -1039,7 +1039,7 @@ G_MODULE_EXPORT void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user } -G_MODULE_EXPORT void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) +void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) { GeanyDocument *doc = document_get_current(); gint offset; @@ -1055,7 +1055,7 @@ G_MODULE_EXPORT void on_toolbutton_goto_entry_activate(GtkAction *action, const } -G_MODULE_EXPORT void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data) { GtkWidget *entry = toolbar_get_widget_child_by_name("GotoEntry"); @@ -1235,7 +1235,7 @@ G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpoi } -G_MODULE_EXPORT void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); const gchar *format = NULL; @@ -1295,7 +1295,7 @@ G_MODULE_EXPORT void on_insert_date_activate(GtkMenuItem *menuitem, gpointer use } -G_MODULE_EXPORT void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); gint pos = -1; @@ -1352,7 +1352,7 @@ G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointe } -G_MODULE_EXPORT void on_toolbutton_run_clicked(GtkAction *action, gpointer user_data) +void on_toolbutton_run_clicked(GtkAction *action, gpointer user_data) { keybindings_send_command(GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_RUN); } @@ -1516,14 +1516,14 @@ G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpoint } -G_MODULE_EXPORT void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) { insert_callback_from_menu = TRUE; on_insert_include_activate(menuitem, user_data); } -G_MODULE_EXPORT void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) { insert_callback_from_menu = TRUE; on_insert_date_activate(menuitem, user_data); @@ -1752,19 +1752,19 @@ G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem } -G_MODULE_EXPORT void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data) { navqueue_go_forward(); } -G_MODULE_EXPORT void on_back_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_back_activate(GtkMenuItem *menuitem, gpointer user_data) { navqueue_go_back(); } -G_MODULE_EXPORT gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data) +gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data) { if (prefs.auto_focus && ! gtk_widget_has_focus(widget)) gtk_widget_grab_focus(widget); @@ -1923,7 +1923,7 @@ G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, g } -G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) +gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) { if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) Modified: src/callbacks.h 48 lines changed, 24 insertions(+), 24 deletions(-) =================================================================== @@ -28,7 +28,7 @@ G_BEGIN_DECLS extern gboolean ignore_callback; -G_MODULE_EXPORT gboolean +gboolean on_exit_clicked (GtkWidget *widget, gpointer gdata); G_MODULE_EXPORT void @@ -59,11 +59,11 @@ G_MODULE_EXPORT void on_change_font1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_close_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_close_all_clicked (GtkAction *action, gpointer user_data); @@ -95,11 +95,11 @@ G_MODULE_EXPORT void on_replace_tabs_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_search_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT gboolean +gboolean toolbar_popup_menu (GtkWidget *widget, GdkEventButton *event, gpointer user_data); @@ -140,12 +140,12 @@ G_MODULE_EXPORT void on_zoom_out1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbar_search_entry_changed (GtkAction *action, const gchar *text, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbar_search_entry_activate (GtkAction *action, const gchar *text, gpointer user_data); @@ -224,23 +224,23 @@ G_MODULE_EXPORT void on_find_in_files1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_new_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_open_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_save_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_quit_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_preferences_clicked (GtkAction *action, gpointer user_data); @@ -256,7 +256,7 @@ G_MODULE_EXPORT void on_help1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_compile_clicked (GtkAction *action, gpointer user_data); @@ -297,11 +297,11 @@ G_MODULE_EXPORT void on_comments_fileheader_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_insert_include_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_insert_date_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -342,14 +342,14 @@ G_MODULE_EXPORT void on_menu_unfold_all1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_goto_entry_activate (GtkAction *action, const gchar *text, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_goto_clicked (GtkAction *action, gpointer user_data); -G_MODULE_EXPORT void +void on_toolbutton_run_clicked (GtkAction *action, gpointer user_data); @@ -413,11 +413,11 @@ G_MODULE_EXPORT void on_menu_comments_gpl_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_menu_insert_include_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_menu_insert_date_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -469,11 +469,11 @@ G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_back_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT void +void on_forward_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -481,7 +481,7 @@ G_MODULE_EXPORT void on_file1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT gboolean +gboolean on_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data); @@ -567,7 +567,7 @@ G_MODULE_EXPORT void on_send_selection_to_vte1_activate (GtkMenuItem *menuitem, gpointer user_data); -G_MODULE_EXPORT gboolean +gboolean on_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 69a449: Remove prototypes of non-existing callbacks
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 14:43:11 UTC Commit: 69a44997ad2ddf0d07244fb6c1901de819a2703a https://github.com/geany/geany/commit/69a44997ad2ddf0d07244fb6c1901de819a27… Log Message: ----------- Remove prototypes of non-existing callbacks Modified Paths: -------------- src/callbacks.h Modified: src/callbacks.h 21 lines changed, 0 insertions(+), 21 deletions(-) =================================================================== @@ -155,10 +155,6 @@ on_toggle_case1_activate (GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void -on_fullscreen1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void on_show_toolbar1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); @@ -171,10 +167,6 @@ on_markers_margin1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); G_MODULE_EXPORT void -on_invisible1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void on_find_usage1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -187,10 +179,6 @@ on_menu_color_schemes_activate (GtkImageMenuItem *imagemenuitem, gpointer user_data); G_MODULE_EXPORT void -on_construct_completion1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void on_count_words1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -314,15 +302,6 @@ on_insert_include_activate (GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void -on_custom_date_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data); - -G_MODULE_EXPORT void -on_custom_date_entry_activate (GtkEntry *entry, - gpointer user_data); - -G_MODULE_EXPORT void on_insert_date_activate (GtkMenuItem *menuitem, gpointer user_data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d6382e: VTE: avoid exporting callbacks that are only used internally
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 13:04:37 UTC Commit: d6382e443fa966c4333cf320db9d754d89812148 https://github.com/geany/geany/commit/d6382e443fa966c4333cf320db9d754d89812… Log Message: ----------- VTE: avoid exporting callbacks that are only used internally Modified Paths: -------------- src/vte.c Modified: src/vte.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -740,14 +740,14 @@ static void vte_drag_data_received(GtkWidget *widget, GdkDragContext *drag_conte } -G_MODULE_EXPORT void on_check_run_in_vte_toggled(GtkToggleButton *togglebutton, GtkWidget *user_data) +static void on_check_run_in_vte_toggled(GtkToggleButton *togglebutton, GtkWidget *user_data) { g_return_if_fail(GTK_IS_WIDGET(user_data)); gtk_widget_set_sensitive(user_data, gtk_toggle_button_get_active(togglebutton)); } -G_MODULE_EXPORT void on_term_font_set(GtkFontButton *widget, gpointer user_data) +static void on_term_font_set(GtkFontButton *widget, gpointer user_data) { const gchar *fontbtn = gtk_font_button_get_font_name(widget); @@ -759,13 +759,13 @@ G_MODULE_EXPORT void on_term_font_set(GtkFontButton *widget, gpointer user_data) } -G_MODULE_EXPORT void on_term_fg_color_set(GtkColorButton *widget, gpointer user_data) +static void on_term_fg_color_set(GtkColorButton *widget, gpointer user_data) { gtk_color_button_get_color(widget, &vc->colour_fore); } -G_MODULE_EXPORT void on_term_bg_color_set(GtkColorButton *widget, gpointer user_data) +static void on_term_bg_color_set(GtkColorButton *widget, gpointer user_data) { gtk_color_button_get_color(widget, &vc->colour_back); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2490df: Avoid passing non-literals to string formatting functions
by Colomban Wendling 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 13:02:31 UTC Commit: 2490df9b45a2b5c3707436971a8bb5f3538fc006 https://github.com/geany/geany/commit/2490df9b45a2b5c3707436971a8bb5f3538fc… Log Message: ----------- Avoid passing non-literals to string formatting functions Having a string literal allows the compiler to check the arguments match the format, so avoid passing non-literal whenever possible. Modified Paths: -------------- src/filetypes.c Modified: src/filetypes.c 14 lines changed, 5 insertions(+), 9 deletions(-) =================================================================== @@ -87,21 +87,17 @@ enum TitleType /* Save adding many translation strings if the filetype name doesn't need translating */ static gchar *filetype_make_title(const char *name, enum TitleType type) { - const gchar *fmt = NULL; - g_return_val_if_fail(name != NULL, NULL); switch (type) { - case TITLE_SOURCE_FILE: fmt = _("%s source file"); break; - case TITLE_FILE: fmt = _("%s file"); break; - case TITLE_SCRIPT: fmt = _("%s script"); break; - case TITLE_DOCUMENT: fmt = _("%s document"); break; + case TITLE_SOURCE_FILE: return g_strdup_printf(_("%s source file"), name); + case TITLE_FILE: return g_strdup_printf(_("%s file"), name); + case TITLE_SCRIPT: return g_strdup_printf(_("%s script"), name); + case TITLE_DOCUMENT: return g_strdup_printf(_("%s document"), name); case TITLE_NONE: /* fall through */ - default: fmt = "%s"; break; + default: return g_strdup(name); } - - return g_strdup_printf(fmt, name); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 135b60: callbacks: Refactor on_reload_as_activate() as document_reload_prompt()
by Thomas Martitz 24 Jun '14

24 Jun '14

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 13:01:42 UTC Commit: 135b60d25ef7557d2ea75a1a4f684ee49b5c3463 https://github.com/geany/geany/commit/135b60d25ef7557d2ea75a1a4f684ee49b5c3… Log Message: ----------- callbacks: Refactor on_reload_as_activate() as document_reload_prompt() The callback wasn't used from glade but is useful for some other places so it's worth moving into document.c. This also fixes a bug where reload via sidebar always reloads the current document instead of the actually clicked one. Modified Paths: -------------- src/callbacks.c src/callbacks.h src/document.c src/document.h src/encodings.c src/sidebar.c Modified: src/callbacks.c 36 lines changed, 1 insertions(+), 35 deletions(-) =================================================================== @@ -395,45 +395,11 @@ G_MODULE_EXPORT void on_toolbutton_quit_clicked(GtkAction *action, gpointer user /* reload file */ G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data) { - on_reload_as_activate(NULL, GINT_TO_POINTER(-1)); -} - - -/* also used for reloading when user_data is -1 */ -G_MODULE_EXPORT void on_reload_as_activate(GtkMenuItem *menuitem, gpointer user_data) -{ GeanyDocument *doc = document_get_current(); - gchar *base_name; - gint i = GPOINTER_TO_INT(user_data); - const gchar *charset = NULL; g_return_if_fail(doc != NULL); - /* No need to reload "untitled" (non-file-backed) documents */ - if (doc->file_name == NULL) - return; - - if (i >= 0) - { - if (i >= GEANY_ENCODINGS_MAX || encodings[i].charset == NULL) - return; - charset = encodings[i].charset; - } - else - charset = doc->encoding; - - base_name = g_path_get_basename(doc->file_name); - /* don't prompt if file hasn't been edited at all */ - if ((!doc->changed && !document_can_undo(doc) && !document_can_redo(doc)) || - dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, - _("Any unsaved changes will be lost."), - _("Are you sure you want to reload '%s'?"), base_name)) - { - document_reload_file(doc, charset); - if (charset != NULL) - ui_update_statusbar(doc, -1); - } - g_free(base_name); + document_reload_prompt(doc, NULL); } Modified: src/callbacks.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -385,10 +385,6 @@ on_menu_remove_indicators1_activate (GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void -on_reload_as_activate (GtkMenuItem *menuitem, - gpointer user_data); - -G_MODULE_EXPORT void on_print1_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: src/document.c 32 lines changed, 32 insertions(+), 0 deletions(-) =================================================================== @@ -1382,6 +1382,38 @@ gboolean document_reload_file(GeanyDocument *doc, const gchar *forced_enc) } +/* also used for reloading when forced_enc is NULL */ +gboolean document_reload_prompt(GeanyDocument *doc, const gchar *forced_enc) +{ + gchar *base_name; + gboolean result = FALSE; + + g_return_if_fail(doc != NULL); + + /* No need to reload "untitled" (non-file-backed) documents */ + if (doc->file_name == NULL) + return FALSE; + + if (forced_enc == NULL) + forced_enc = doc->encoding; + + base_name = g_path_get_basename(doc->file_name); + /* don't prompt if file hasn't been edited at all */ + if ((!doc->changed && !document_can_undo(doc) && !document_can_redo(doc)) || + dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, + _("Any unsaved changes will be lost."), + _("Are you sure you want to reload '%s'?"), base_name)) + { + result = document_reload_file(doc, forced_enc); + if (forced_enc != NULL) + ui_update_statusbar(doc, -1); + } + g_free(base_name); + + return result; +} + + static gboolean document_update_timestamp(GeanyDocument *doc, const gchar *locale_filename) { #ifndef USE_GIO_FILEMON Modified: src/document.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -194,6 +194,8 @@ GeanyDocument* document_open_file(const gchar *locale_filename, gboolean readonl gboolean document_reload_file(GeanyDocument *doc, const gchar *forced_enc); +gboolean document_reload_prompt(GeanyDocument *doc, const gchar *forced_enc); + void document_set_text_changed(GeanyDocument *doc, gboolean changed); void document_set_filetype(GeanyDocument *doc, GeanyFiletype *type); Modified: src/encodings.c 23 lines changed, 16 insertions(+), 7 deletions(-) =================================================================== @@ -360,11 +360,11 @@ static gchar *regex_match(GRegex *preg, const gchar *buffer, gsize size) static void encodings_radio_item_change_cb(GtkCheckMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); - guint i = GPOINTER_TO_INT(user_data); + const gchar *charset = user_data; - if (ignore_callback || doc == NULL || encodings[i].charset == NULL || + if (ignore_callback || doc == NULL || charset == NULL || ! gtk_check_menu_item_get_active(menuitem) || - utils_str_equal(encodings[i].charset, doc->encoding)) + utils_str_equal(charset, doc->encoding)) return; if (doc->readonly) @@ -374,7 +374,16 @@ static void encodings_radio_item_change_cb(GtkCheckMenuItem *menuitem, gpointer } document_undo_add(doc, UNDO_ENCODING, g_strdup(doc->encoding)); - document_set_encoding(doc, encodings[i].charset); + document_set_encoding(doc, charset); +} + +static void encodings_reload_radio_item_change_cb(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + g_return_if_fail(doc != NULL); + + document_reload_prompt(doc, user_data); } @@ -416,7 +425,7 @@ void encodings_init(void) menu[0] = ui_lookup_widget(main_widgets.window, "set_encoding1_menu"); menu[1] = ui_lookup_widget(main_widgets.window, "menu_reload_as1_menu"); cb_func[0] = G_CALLBACK(encodings_radio_item_change_cb); - cb_func[1] = G_CALLBACK(on_reload_as_activate); + cb_func[1] = G_CALLBACK(encodings_reload_radio_item_change_cb); for (k = 0; k < 2; k++) { @@ -488,8 +497,8 @@ void encodings_init(void) item = gtk_menu_item_new_with_label(label); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(submenu), item); - g_signal_connect(item, "activate", - cb_func[k], GINT_TO_POINTER(encodings[j].idx)); + g_signal_connect(item, "activate", cb_func[k], + (gpointer) encodings[j].charset); g_free(label); break; } Modified: src/sidebar.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -819,7 +819,7 @@ static void document_action(GeanyDocument *doc, gint action) } case OPENFILES_ACTION_RELOAD: { - on_toolbutton_reload_clicked(NULL, NULL); + document_reload_prompt(doc, NULL); break; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d6c980: Printing: properly claim ownership of the printing Scintilla widget
by Colomban Wendling 23 Jun '14

23 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 23 Jun 2014 16:38:59 UTC Commit: d6c980f2fcdf49b731aacbd9e4751cbb9d85cafe https://github.com/geany/geany/commit/d6c980f2fcdf49b731aacbd9e4751cbb9d85c… Log Message: ----------- Printing: properly claim ownership of the printing Scintilla widget This avoids a GObject warning about unref-ing a floating object on print termination. Modified Paths: -------------- src/printing.c Modified: src/printing.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -349,6 +349,8 @@ static void begin_print(GtkPrintOperation *operation, GtkPrintContext *context, /* setup printing scintilla object */ dinfo->sci = editor_create_widget(dinfo->doc->editor); + /* since we won't add the widget to any container, assume it's ownership */ + g_object_ref_sink(dinfo->sci); scintilla_send_message(dinfo->sci, SCI_SETDOCPOINTER, 0, scintilla_send_message(dinfo->doc->editor->sci, SCI_GETDOCPOINTER, 0, 0)); highlighting_set_styles(dinfo->sci, dinfo->doc->file_type); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 881ca4: Fix typo in generated geany.pc
by Enrico Tröger 22 Jun '14

22 Jun '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 22 Jun 2014 12:09:04 UTC Commit: 881ca4fa0243c29ace29e56955d85fcad255e90f https://github.com/geany/geany/commit/881ca4fa0243c29ace29e56955d85fcad255e… Log Message: ----------- Fix typo in generated geany.pc Modified Paths: -------------- wscript Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -476,7 +476,7 @@ def build(bld): 'includedir': '${prefix}/include', 'datarootdir': '${prefix}/share', 'datadir': '${datarootdir}', - 'localedir': '${datarootdir/locale'}) + 'localedir': '${datarootdir}/locale'}) if not is_win32: # geany.desktop -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ec7071: Fix GTK frame clock warnings with our about dialog
by Colomban Wendling 21 Jun '14

21 Jun '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 21 Jun 2014 16:35:17 UTC Commit: ec7071062c5dc39d5f893a830b3c26968a579251 https://github.com/geany/geany/commit/ec7071062c5dc39d5f893a830b3c26968a579… Log Message: ----------- Fix GTK frame clock warnings with our about dialog We used to set the widget's style in a style-set handler, and despite guarding ourselves from recursive invocations, the GTK frame clock introduced by GTK 3.8 didn't like it very much. So, replace the manual color modification by a simpler global widget state modification, making the code simpler and smaller, yet achieving the same result (or so I hope and see). Modified Paths: -------------- src/about.c Modified: src/about.c 38 lines changed, 2 insertions(+), 36 deletions(-) =================================================================== @@ -120,8 +120,6 @@ static const gchar *contributors = "Tyler Mulligan, Walery Studennikov, Yura Siamashka"; -static void header_eventbox_style_set(GtkWidget *widget); -static void header_label_style_set(GtkWidget *widget); static void homepage_clicked(GtkButton *button, gpointer data); @@ -189,10 +187,8 @@ static GtkWidget *create_dialog(void) gtk_label_set_markup(GTK_LABEL(header_label), buffer); gtk_widget_show(header_label); gtk_box_pack_start(GTK_BOX(header_hbox), header_label, FALSE, FALSE, 0); - header_eventbox_style_set(header_eventbox); - header_label_style_set(header_label); - g_signal_connect_after(header_eventbox, "style-set", G_CALLBACK(header_eventbox_style_set), NULL); - g_signal_connect_after(header_label, "style-set", G_CALLBACK(header_label_style_set), NULL); + gtk_widget_set_state(header_eventbox, GTK_STATE_SELECTED); + gtk_widget_set_state(header_label, GTK_STATE_SELECTED); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), header_eventbox, FALSE, FALSE, 0); /* create notebook */ @@ -456,36 +452,6 @@ void about_dialog_show(void) } -static void header_eventbox_style_set(GtkWidget *widget) -{ - static gint recursive = 0; - GtkStyle *style; - - if (recursive > 0) - return; - - ++recursive; - style = gtk_widget_get_style(widget); - gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &style->bg[GTK_STATE_SELECTED]); - --recursive; -} - - -static void header_label_style_set(GtkWidget *widget) -{ - static gint recursive = 0; - GtkStyle *style; - - if (recursive > 0) - return; - - ++recursive; - style = gtk_widget_get_style(widget); - gtk_widget_modify_fg(widget, GTK_STATE_NORMAL, &style->fg[GTK_STATE_SELECTED]); - --recursive; -} - - static void homepage_clicked(GtkButton *button, gpointer data) { utils_open_browser(data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2014