From 08019dc2686cb99ae740b9b8f0f8368fcb2ed665 Mon Sep 17 00:00:00 2001
From: Benedikt Heine <bebe@bebehei.de>
Date: Wed, 31 Oct 2018 13:41:41 +0100
Subject: [PATCH] Move context_menu into right header

---
 src/dunst.c | 2 --
 src/dunst.h | 2 --
 src/menu.c  | 5 +----
 src/menu.h  | 5 +++++
 src/rules.c | 2 ++
 src/x11/x.c | 1 +
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/dunst.c b/src/dunst.c
index 7ffcfcb..7b6b4b9 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -30,8 +30,6 @@
 
 GMainLoop *mainloop = NULL;
 
-GSList *rules = NULL;
-
 /* misc functions */
 static gboolean run(void *data);
 
diff --git a/src/dunst.h b/src/dunst.h
index adaa794..bd456c4 100644
--- a/src/dunst.h
+++ b/src/dunst.h
@@ -14,7 +14,6 @@
 #define ColFG 1
 #define ColBG 0
 
-extern GSList *rules;
 extern const char *colors[3][3];
 
 void wake_up(void);
@@ -23,7 +22,6 @@ int dunst_main(int argc, char *argv[]);
 
 void usage(int exit_status);
 void print_version(void);
-void context_menu(void);
 void pause_signal_handler(int sig);
 
 #endif
diff --git a/src/menu.c b/src/menu.c
index fe324ae..e427f29 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -270,10 +270,7 @@ char *invoke_dmenu(const char *dmenu_input)
         return ret;
 }
 
-/*
- * Open the context menu that let's the user
- * select urls/actions/etc
- */
+/* see menu.h */
 void context_menu(void)
 {
         GError *err = NULL;
diff --git a/src/menu.h b/src/menu.h
index 298fd85..b93f78b 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -7,5 +7,10 @@ void open_browser(const char *in);
 void invoke_action(const char *action);
 void regex_teardown(void);
 
+/**
+ * Open the context menu that lets the user select urls/actions/etc.
+ */
+void context_menu(void);
+
 #endif
 /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */
diff --git a/src/rules.c b/src/rules.c
index a6d373c..4f13977 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -7,6 +7,8 @@
 
 #include "dunst.h"
 
+GSList *rules = NULL;
+
 /*
  * Apply rule to notification.
  */
diff --git a/src/x11/x.c b/src/x11/x.c
index b96174a..673cd1a 100644
--- a/src/x11/x.c
+++ b/src/x11/x.c
@@ -24,6 +24,7 @@
 #include "src/dunst.h"
 #include "src/log.h"
 #include "src/markup.h"
+#include "src/menu.h"
 #include "src/notification.h"
 #include "src/queues.h"
 #include "src/settings.h"