Rename actions/all.[ch] and filters/all.[ch] to _all.[ch]

There will actually be an "all" filter so this clashed.

diff --git a/Makefile.am b/Makefile.am
index 3ca51665a844d14725a237f0fbd39249acb8daef..2528950c5574bb9c2173891dd33d4878deed9f24 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,8 +196,8 @@ openbox_openbox_LDADD = \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \
-       openbox/actions/all.c \
-       openbox/actions/all.h \
+       openbox/actions/_all.c \
+       openbox/actions/_all.h \
        openbox/actions/addremovedesktop.c \
        openbox/actions/breakchroot.c \
        openbox/actions/close.c \
@@ -234,8 +234,8 @@ openbox_openbox_SOURCES = \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.c \
-       openbox/filters/all.c \
-       openbox/filters/all.h \
+       openbox/filters/_all.c \
+       openbox/filters/_all.h \
        openbox/action.c \
        openbox/action.h \
        openbox/action_filter.c \

diff --git a/openbox/action.c b/openbox/action.c
index 99a28bb7957f7ce0e523dfdfa9b3edd6187d07ec..e962fe60984071fb2ad4350cac9c85ee3ff4389f 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -29,7 +29,7 @@
 #include "openbox.h"
 #include "debug.h"
 
-#include "actions/all.h"
+#include "actions/_all.h"
 
 static void     action_definition_ref(ObActionDefinition *def);
 static void     action_definition_unref(ObActionDefinition *def);
@@ -73,7 +73,7 @@ void action_startup(gboolean reconfig)
 {
     if (reconfig) return;
 
-    actions_all_startup();
+    actions__all_startup();
 }
 
 void action_shutdown(gboolean reconfig)

diff --git a/openbox/action_filter.c b/openbox/action_filter.c
index bdd0f6a38d33f8e9eb56be3a193820a522d2702c..1c23f6be855fc81bd7dc359fa78ad169d84963cc 100644 (file)
--- a/openbox/action_filter.c
+++ b/openbox/action_filter.c
@@ -19,7 +19,7 @@
 #include "action_filter.h"
 #include "gettext.h"
 
-#include "filters/all.h"
+#include "filters/_all.h"
 
 typedef struct _ObActionFilterDefinition ObActionFilterDefinition;
 
@@ -45,7 +45,7 @@ static GSList *registered = NULL;
 
 void action_filter_startup(gboolean reconfig)
 {
-    filters_all_startup();
+    filters__all_startup();
 }
 
 void action_filter_shutdown(gboolean reconfig)

diff --git a/openbox/actions/all.c b/openbox/actions/_all.c
similarity index 59%
rename from openbox/actions/all.c
rename to openbox/actions/_all.c
index 26bf8bbe17a4f5aa0d66c973195c040ea1b05142..c25f0e5d76fff3b2092cfb449c68625bcaa4f3d4 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/_all.c
@@ -1,6 +1,24 @@
-#include "all.h"
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-void actions_all_startup(void)
+   actions/_all.c for the Openbox window manager
+   Copyright (c) 2011        Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "_all.h"
+
+void actions__all_startup(void)
 {
     action_execute_startup();
     action_debug_startup();

diff --git a/openbox/actions/all.h b/openbox/actions/_all.h
similarity index 63%
rename from openbox/actions/all.h
rename to openbox/actions/_all.h
index 3fbda6b8595f5db74e9aa4aea39f76c9bb1af363..b27055edf664becf257932e493c0d9fa6c830140 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/_all.h
@@ -1,7 +1,22 @@
-#ifndef __actions_all_h
-#define __actions_all_h
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-void actions_all_startup(void);
+   actions/_all.h for the Openbox window manager
+   Copyright (c) 2011        Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+void actions__all_startup(void);
 
 void action_execute_startup(void);
 void action_debug_startup(void);
@@ -39,5 +54,3 @@ void action_layer_startup(void);
 void action_movetoedge_startup(void);
 void action_growtoedge_startup(void);
 void action_focustobottom_startup(void);
-
-#endif

diff --git a/openbox/filters/all.c b/openbox/filters/_all.c
similarity index 87%
rename from openbox/filters/all.c
rename to openbox/filters/_all.c
index 5464fe39614a847a12cd29f321cef6137799d035..0345df86c4d4f6885d9a5725994dc3c7bc39f4e6 100644 (file)
--- a/openbox/filters/all.c
+++ b/openbox/filters/_all.c
@@ -1,6 +1,6 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-   filters/all.c for the Openbox window manager
+   filters/_all.c for the Openbox window manager
    Copyright (c) 2011        Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,9 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#include "all.h"
+#include "_all.h"
 
-void filters_all_startup(void)
+void filters__all_startup(void)
 {
     /*filter_foo_startup();*/
 }

diff --git a/openbox/filters/all.h b/openbox/filters/_all.h
similarity index 84%
rename from openbox/filters/all.h
rename to openbox/filters/_all.h
index 2c7d966d7c1495aae6794c42bea8cda9907b137b..e75b3d62d0ed61cc2e1a00805a388463f59b95cf 100644 (file)
--- a/openbox/filters/all.h
+++ b/openbox/filters/_all.h
@@ -1,6 +1,6 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-   filters/all.h for the Openbox window manager
+   filters/_all.h for the Openbox window manager
    Copyright (c) 2011        Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -16,11 +16,6 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#ifndef __filters_all_h
-#define __filters_all_h
-
-void filters_all_startup(void);
+void filters__all_startup(void);
 
 /*void filter_foo_startup(void);*/
-
-#endif