pidgin/pidgin

Fix a ton of missing and incorrect global header guards

2022-03-11, Gary Kramlich
03f98ece6b26
Parents 3c11bbd93e97
Children 1b6374960c08
Fix a ton of missing and incorrect global header guards

Testing Done:
Compiled and ran.

Reviewed at https://reviews.imfreedom.org/r/1321/
20 files changed, 54 insertions(+), 12 deletions(-)
  • +3 -3
    libpurple/internal.h
  • +5 -0
    libpurple/purpleaccountpresence.h
  • +5 -0
    libpurple/purplebuddypresence.h
  • +1 -1
    libpurple/purplecoreuiops.h
  • +1 -1
    libpurple/purplecredentialmanager.h
  • +1 -1
    libpurple/purplehistorymanager.h
  • +1 -1
    libpurple/purpleidleui.h
  • +1 -1
    libpurple/purplemarkup.h
  • +1 -1
    libpurple/purpleprotocolmanager.h
  • +1 -1
    libpurple/purplewhiteboardmanager.h
  • +1 -1
    libpurple/purplewhiteboardops.h
  • +1 -1
    libpurple/purplewhiteboarduiops.h
  • +4 -0
    pidgin/gtkblist.h
  • +4 -0
    pidgin/pidginaccountfilterconnected.h
  • +4 -0
    pidgin/pidginaccountfilterprotocol.h
  • +4 -0
    pidgin/pidginaccountstore.h
  • +4 -0
    pidgin/pidgindnd.h
  • +4 -0
    pidgin/pidginprivate.h
  • +4 -0
    pidgin/pidginstatusprimitivechooser.h
  • +4 -0
    pidgin/pidginstatusprimitivestore.h
    • --- a/libpurple/internal.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/internal.h Fri Mar 11 01:23:12 2022 -0600
    @@ -19,13 +19,13 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifndef PURPLE_INTERNAL_H
    -#define PURPLE_INTERNAL_H
    -
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    # error "only <purple.h> may be included directly"
    #endif
    +#ifndef PURPLE_INTERNAL_H
    +#define PURPLE_INTERNAL_H
    +
    #ifdef HAVE_CONFIG_H
    # ifdef GETTEXT_PACKAGE
    # undef GETTEXT_PACKAGE
    --- a/libpurple/purpleaccountpresence.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purpleaccountpresence.h Fri Mar 11 01:23:12 2022 -0600
    @@ -18,6 +18,11 @@
    * You should have received a copy of the GNU General Public License
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_ACCOUNT_PRESENCE_H
    #define PURPLE_ACCOUNT_PRESENCE_H
    --- a/libpurple/purplebuddypresence.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplebuddypresence.h Fri Mar 11 01:23:12 2022 -0600
    @@ -18,6 +18,11 @@
    * You should have received a copy of the GNU General Public License
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +
    +#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    +# error "only <purple.h> may be included directly"
    +#endif
    +
    #ifndef PURPLE_BUDDY_PRESENCE_H
    #define PURPLE_BUDDY_PRESENCE_H
    --- a/libpurple/purplecoreuiops.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplecoreuiops.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_CORE_UIOPS_H
    --- a/libpurple/purplecredentialmanager.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplecredentialmanager.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_CREDENTIAL_MANAGER_H
    --- a/libpurple/purplehistorymanager.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplehistorymanager.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_HISTORY_MANAGER_H
    --- a/libpurple/purpleidleui.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purpleidleui.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_IDLE_UI_H
    --- a/libpurple/purplemarkup.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplemarkup.h Fri Mar 11 01:23:12 2022 -0600
    @@ -21,7 +21,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_MARKUP_H
    --- a/libpurple/purpleprotocolmanager.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purpleprotocolmanager.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_PROTOCOL_MANAGER_H
    --- a/libpurple/purplewhiteboardmanager.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplewhiteboardmanager.h Fri Mar 11 01:23:12 2022 -0600
    @@ -17,7 +17,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_WHITEBOARD_MANAGER_H
    --- a/libpurple/purplewhiteboardops.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplewhiteboardops.h Fri Mar 11 01:23:12 2022 -0600
    @@ -21,7 +21,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_WHITEBOARD_OPS_H
    --- a/libpurple/purplewhiteboarduiops.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/libpurple/purplewhiteboarduiops.h Fri Mar 11 01:23:12 2022 -0600
    @@ -21,7 +21,7 @@
    */
    #if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION)
    -# error "only <pidgin.h> may be included directly"
    +# error "only <purple.h> may be included directly"
    #endif
    #ifndef PURPLE_WHITEBOARD_UIOPS_H
    --- a/pidgin/gtkblist.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/gtkblist.h Fri Mar 11 01:23:12 2022 -0600
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINBLIST_H_
    #define _PIDGINBLIST_H_
    --- a/pidgin/pidginaccountfilterconnected.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginaccountfilterconnected.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNT_FILTER_CONNECTED_H
    #define PIDGIN_ACCOUNT_FILTER_CONNECTED_H
    --- a/pidgin/pidginaccountfilterprotocol.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginaccountfilterprotocol.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNT_FILTER_PROTOCOL_H
    #define PIDGIN_ACCOUNT_FILTER_PROTOCOL_H
    --- a/pidgin/pidginaccountstore.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginaccountstore.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNT_STORE_H
    #define PIDGIN_ACCOUNT_STORE_H
    --- a/pidgin/pidgindnd.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidgindnd.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_DND_H
    #define PIDGIN_DND_H
    --- a/pidgin/pidginprivate.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginprivate.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PRIVATE_H
    #define PIDGIN_PRIVATE_H
    --- a/pidgin/pidginstatusprimitivechooser.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginstatusprimitivechooser.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_STATUS_PRIMITIVE_CHOOSER_H
    #define PIDGIN_STATUS_PRIMITIVE_CHOOSER_H
    --- a/pidgin/pidginstatusprimitivestore.h Tue Mar 08 02:18:51 2022 -0600
    +++ b/pidgin/pidginstatusprimitivestore.h Fri Mar 11 01:23:12 2022 -0600
    @@ -20,6 +20,10 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_STATUS_PRIMITIVE_STORE_H
    #define PIDGIN_STATUS_PRIMITIVE_STORE_H