diff options
| author | Thomas White <taw@physics.org> | 2018-03-11 23:17:06 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-03-11 23:21:52 +0100 |
| commit | c7a86a47001baca65c87d0f060f9a57af8537cf2 (patch) | |
| tree | b5a2ae1e710d7efc1e6830f3323edab5082d5759 /src/narrative_window.c | |
| parent | 2975d15b76c5321d9facae06266fbc17dc99492b (diff) | |
Rename some functions to make them unique
Makes things less confusing.
Ulterior motive: makes Meson unity builds work.
Diffstat (limited to 'src/narrative_window.c')
| -rw-r--r-- | src/narrative_window.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/narrative_window.c b/src/narrative_window.c index 3bd066f..e5faffa 100644 --- a/src/narrative_window.c +++ b/src/narrative_window.c @@ -489,8 +489,8 @@ static void exportpdf_sig(GSimpleAction *action, GVariant *parameter, -static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event, - NarrativeWindow *nw) +static gboolean nw_button_press_sig(GtkWidget *da, GdkEventButton *event, + NarrativeWindow *nw) { return 0; } @@ -515,15 +515,15 @@ static void scroll_down(NarrativeWindow *nw) } -static gboolean destroy_sig(GtkWidget *da, NarrativeWindow *nw) +static gboolean nw_destroy_sig(GtkWidget *da, NarrativeWindow *nw) { g_application_release(nw->app); return FALSE; } -static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event, - NarrativeWindow *nw) +static gboolean nw_key_press_sig(GtkWidget *da, GdkEventKey *event, + NarrativeWindow *nw) { switch ( event->keyval ) { @@ -597,7 +597,7 @@ static void start_slideshow_here_sig(GSimpleAction *action, GVariant *parameter, if ( nw->show == NULL ) return; g_signal_connect(G_OBJECT(nw->show), "key-press-event", - G_CALLBACK(key_press_sig), nw); + G_CALLBACK(nw_key_press_sig), nw); g_signal_connect(G_OBJECT(nw->show), "destroy", G_CALLBACK(ss_destroy_sig), nw); sc_slideshow_set_slide(nw->show, bvp); @@ -618,7 +618,7 @@ static void start_slideshow_noslides_sig(GSimpleAction *action, GVariant *parame if ( nw->show == NULL ) return; g_signal_connect(G_OBJECT(nw->show), "key-press-event", - G_CALLBACK(key_press_sig), nw); + G_CALLBACK(nw_key_press_sig), nw); g_signal_connect(G_OBJECT(nw->show), "destroy", G_CALLBACK(ss_destroy_sig), nw); sc_slideshow_set_slide(nw->show, first_slide(nw->p)); @@ -639,7 +639,7 @@ static void start_slideshow_sig(GSimpleAction *action, GVariant *parameter, if ( nw->show == NULL ) return; g_signal_connect(G_OBJECT(nw->show), "key-press-event", - G_CALLBACK(key_press_sig), nw); + G_CALLBACK(nw_key_press_sig), nw); g_signal_connect(G_OBJECT(nw->show), "destroy", G_CALLBACK(ss_destroy_sig), nw); sc_slideshow_set_slide(nw->show, first_slide(nw->p)); @@ -890,13 +890,13 @@ NarrativeWindow *narrative_window_new(struct presentation *p, GApplication *papp sc_editor_set_top_frame_editable(nw->sceditor, 1); g_signal_connect(G_OBJECT(nw->sceditor), "button-press-event", - G_CALLBACK(button_press_sig), nw); + G_CALLBACK(nw_button_press_sig), nw); g_signal_connect(G_OBJECT(nw->sceditor), "changed", G_CALLBACK(changed_sig), nw); g_signal_connect(G_OBJECT(nw->sceditor), "key-press-event", - G_CALLBACK(key_press_sig), nw); + G_CALLBACK(nw_key_press_sig), nw); g_signal_connect(G_OBJECT(nw->window), "destroy", - G_CALLBACK(destroy_sig), nw); + G_CALLBACK(nw_destroy_sig), nw); gtk_window_set_default_size(GTK_WINDOW(nw->window), 768, 768); gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0); |