diff options
| author | Thomas White <taw@bitwiz.me.uk> | 2019-10-10 17:38:23 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.me.uk> | 2019-10-10 17:38:23 +0200 |
| commit | 23c8103b45433c0bef316c84acbc74db4dcb5621 (patch) | |
| tree | 6eaa453f85a00945546ddb9a62a0d25d81ac4c0d /src | |
| parent | 428a3329d1b86c9daa15fa72b2fbbd54859579ca (diff) | |
Make symbol names unique across all files
Enables Meson unity builds, helps ctags work, and reduces space for bugs
Diffstat (limited to 'src')
| -rw-r--r-- | src/narrative_window.c | 4 | ||||
| -rw-r--r-- | src/slide_window.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/narrative_window.c b/src/narrative_window.c index 6c952f9..9a06a07 100644 --- a/src/narrative_window.c +++ b/src/narrative_window.c @@ -211,7 +211,7 @@ static void saveas_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) } -static void about_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) +static void nw_about_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) { NarrativeWindow *nw = vp; open_about_dialog(nw->window); @@ -666,7 +666,7 @@ static void start_slideshow_sig(GSimpleAction *action, GVariant *parameter, GActionEntry nw_entries[] = { - { "about", about_sig, NULL, NULL, NULL }, + { "about", nw_about_sig, NULL, NULL, NULL }, { "save", save_sig, NULL, NULL, NULL }, { "saveas", saveas_sig, NULL, NULL, NULL }, { "slide", add_slide_sig, NULL, NULL, NULL }, diff --git a/src/slide_window.c b/src/slide_window.c index 8a0db2c..75d40d2 100644 --- a/src/slide_window.c +++ b/src/slide_window.c @@ -285,7 +285,7 @@ static gboolean sw_key_press_sig(GtkWidget *da, GdkEventKey *event, } -static void about_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) +static void sw_about_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) { SlideWindow *sw = vp; open_about_dialog(sw->window); @@ -294,7 +294,7 @@ static void about_sig(GSimpleAction *action, GVariant *parameter, gpointer vp) GActionEntry sw_entries[] = { - { "about", about_sig, NULL, NULL, NULL }, + { "about", sw_about_sig, NULL, NULL, NULL }, { "paste", paste_sig, NULL, NULL, NULL }, { "copyframe", copy_frame_sig, NULL, NULL, NULL }, { "deleteframe", delete_frame_sig, NULL, NULL, NULL }, |