Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 24 Jun 2014 16:15:46 UTC Commit: 0b32227bf0892f8bf430d712cae1fa73741c906a https://github.com/geany/geany/commit/0b32227bf0892f8bf430d712cae1fa73741c90...
Log Message: ----------- Don't manually connect handlers Glade can connect for us
Don't bother manually connecting handlers that Glade can connect for us just as well.
Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h src/main.c
Modified: data/geany.glade 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -6252,6 +6252,8 @@ <accel-groups> <group name="accelgroup1"/> </accel-groups> + <signal name="window-state-event" handler="on_window_state_event" swapped="no"/> + <signal name="delete-event" handler="on_window_delete_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> @@ -8319,6 +8321,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="buffer">textbuffer1</property> + <signal name="motion-notify-event" handler="on_motion_event" swapped="no"/> </object> </child> </object>
Modified: src/callbacks.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -74,6 +74,7 @@
/* prototypes of Glade-only callback to let the compiler know they really are meant to be exported */ +G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata); 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); @@ -125,6 +126,7 @@ G_MODULE_EXPORT void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer 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 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); @@ -202,7 +204,7 @@ static void quit_app(void)
/* wrapper function to abort exit process if cancel button is pressed */ -gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata) +G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata) { main_status.quitting = TRUE;
@@ -1952,7 +1954,7 @@ G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, g }
-gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) +G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) {
if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
Modified: src/callbacks.h 6 lines changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -28,8 +28,6 @@ G_BEGIN_DECLS
extern gboolean ignore_callback;
-gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, 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); @@ -160,7 +158,7 @@ void on_toolbutton_back_activate(GtkAction *action, gpointer user_data);
void on_toolbutton_forward_activate(GtkAction *action, gpointer user_data);
-gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data);
@@ -176,8 +174,6 @@ G_MODULE_EXPORT void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpo
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_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data);
G_END_DECLS
Modified: src/main.c 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -1157,12 +1157,6 @@ gint main(gint argc, gchar **argv) symbols_init(); editor_snippets_init();
- /* registering some basic events */ - g_signal_connect(main_widgets.window, "delete-event", G_CALLBACK(on_window_delete_event), NULL); - g_signal_connect(main_widgets.window, "window-state-event", G_CALLBACK(on_window_state_event), NULL); - - g_signal_connect(msgwindow.scribble, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); - #ifdef HAVE_VTE vte_init(); #endif
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).