From a134f7433b1ab1d313ec063dd88f54094882be21 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 22 Nov 2014 20:48:41 -0600 Subject: [PATCH] wmcliphist: Switch from angled brackets to quotes for local includes. --- wmcliphist/Makefile | 2 +- wmcliphist/clipboard.c | 2 +- wmcliphist/gui.c | 2 +- wmcliphist/history.c | 2 +- wmcliphist/hotkeys.c | 2 +- wmcliphist/rcconfig.c | 2 +- wmcliphist/utils.c | 2 +- wmcliphist/wmcliphist.c | 30 +++++++++++++++--------------- wmcliphist/wmcliphist.h | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/wmcliphist/Makefile b/wmcliphist/Makefile index c8ba5a9..2baafa7 100644 --- a/wmcliphist/Makefile +++ b/wmcliphist/Makefile @@ -1,6 +1,6 @@ CC ?= gcc PREFIX = /usr/local -INCLUDES = `pkg-config --cflags gtk+-2.0 x11` -I. -Ifoodock +INCLUDES = `pkg-config --cflags gtk+-2.0 x11` # for normal use CFLAGS += -Wall -ansi -pedantic $(INCLUDES) diff --git a/wmcliphist/clipboard.c b/wmcliphist/clipboard.c index b39b915..ad341f7 100644 --- a/wmcliphist/clipboard.c +++ b/wmcliphist/clipboard.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" #include /* when true, clipboard will be automatically taken up by wmcliphist */ diff --git a/wmcliphist/gui.c b/wmcliphist/gui.c index 55bda91..beee837 100644 --- a/wmcliphist/gui.c +++ b/wmcliphist/gui.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" #include diff --git a/wmcliphist/history.c b/wmcliphist/history.c index d4db3ad..43a0878 100644 --- a/wmcliphist/history.c +++ b/wmcliphist/history.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" int autosave_period = 120; diff --git a/wmcliphist/hotkeys.c b/wmcliphist/hotkeys.c index 890c089..ae412dd 100644 --- a/wmcliphist/hotkeys.c +++ b/wmcliphist/hotkeys.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" #include /* Exec on hotkey? */ diff --git a/wmcliphist/rcconfig.c b/wmcliphist/rcconfig.c index 388793c..1f2cf46 100644 --- a/wmcliphist/rcconfig.c +++ b/wmcliphist/rcconfig.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" #include #define RC_BUF_SIZE 256 diff --git a/wmcliphist/utils.c b/wmcliphist/utils.c index 7a88962..070a3d1 100644 --- a/wmcliphist/utils.c +++ b/wmcliphist/utils.c @@ -1,4 +1,4 @@ -#include +#include "wmcliphist.h" /* * converts text in UTF-8 to charset by actual locale diff --git a/wmcliphist/wmcliphist.c b/wmcliphist/wmcliphist.c index f038251..32ddc8a 100644 --- a/wmcliphist/wmcliphist.c +++ b/wmcliphist/wmcliphist.c @@ -2,25 +2,25 @@ * (c) 2001 Michal Krause */ -#include +#include "wmcliphist.h" -#include -#include -#include -#include +#include "icon/ico_60x60_mask.xbm" +#include "icon/ico_60x60_black.xpm" +#include "icon/ico_60x60_white.xpm" +#include "icon/ico_60x60_gray.xpm" -#include -#include -#include -#include +#include "icon/ico_40x40_mask.xbm" +#include "icon/ico_40x40_black.xpm" +#include "icon/ico_40x40_white.xpm" +#include "icon/ico_40x40_gray.xpm" -#include -#include -#include -#include +#include "icon/ico_30x30_mask.xbm" +#include "icon/ico_30x30_black.xpm" +#include "icon/ico_30x30_white.xpm" +#include "icon/ico_30x30_gray.xpm" -#include -#include +#include "icon/ico_16x16_mask.xbm" +#include "icon/ico_16x16.xpm" /* * print some help diff --git a/wmcliphist/wmcliphist.h b/wmcliphist/wmcliphist.h index c55cdc2..bd23c9c 100644 --- a/wmcliphist/wmcliphist.h +++ b/wmcliphist/wmcliphist.h @@ -20,9 +20,9 @@ #include #include -#include +#include "foodock/foodock.h" -#include +#include "debug.h" #define VERSION 0x0003