From: Dana Jansens Date: Fri, 29 Jul 2011 20:42:15 +0000 (-0400) Subject: Rename actions/all.[ch] and filters/all.[ch] to _all.[ch] X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=10113af14704eccc9de3c73643391557e7ccd4cb;p=dana%2Fopenbox.git 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 3ca51665..2528950c 100644 --- 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 99a28bb7..e962fe60 100644 --- 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 bdd0f6a3..1c23f6be 100644 --- 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 26bf8bbe..c25f0e5d 100644 --- 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 3fbda6b8..b27055ed 100644 --- 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 5464fe39..0345df86 100644 --- 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 2c7d966d..e75b3d62 100644 --- 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