[gnome-panel/wip/applets/clock: 18/18] clock: rename clock.h to clock-common.h



commit 7b9f1363b7850a7d07207281a8b0731458f7b735
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Nov 14 18:58:47 2014 +0200

    clock: rename clock.h to clock-common.h

 applets/clock/Makefile.am                 |    2 +-
 applets/clock/calendar-window.c           |    2 +-
 applets/clock/{clock.h => clock-common.h} |    0
 applets/clock/clock-face.c                |    2 +-
 applets/clock/clock-map.c                 |    2 +-
 applets/clock/clock-map.h                 |    1 -
 applets/clock/clock-utils.c               |    4 +---
 applets/clock/clock.c                     |    3 +--
 8 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index fe567c5..9b6403f 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -27,7 +27,7 @@ CLOCK_SOURCES =               \
        calendar-window.c       \
        calendar-window.h       \
        clock.c                 \
-       clock.h                 \
+       clock-common.h          \
        clock-face.c            \
        clock-face.h            \
        clock-location.c        \
diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
index 89534b6..7ea82c4 100644
--- a/applets/clock/calendar-window.c
+++ b/applets/clock/calendar-window.c
@@ -42,7 +42,7 @@
 
 #include "calendar-window.h"
 
-#include "clock.h"
+#include "clock-common.h"
 #include "clock-utils.h"
 #include "clock-typebuiltins.h"
 #ifdef HAVE_EDS
diff --git a/applets/clock/clock.h b/applets/clock/clock-common.h
similarity index 100%
rename from applets/clock/clock.h
rename to applets/clock/clock-common.h
diff --git a/applets/clock/clock-face.c b/applets/clock/clock-face.c
index e636f07..8543cd5 100644
--- a/applets/clock/clock-face.c
+++ b/applets/clock/clock-face.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "clock.h"
+#include "clock-common.h"
 #include "clock-face.h"
 
 typedef enum _ClockFaceType ClockFaceType;
diff --git a/applets/clock/clock-map.c b/applets/clock/clock-map.c
index 82baf2c..75d404a 100644
--- a/applets/clock/clock-map.c
+++ b/applets/clock/clock-map.c
@@ -10,7 +10,7 @@
 
 #include <libpanel-util/panel-color.h>
 
-#include "clock.h"
+#include "clock-common.h"
 #include "clock-map.h"
 #include "clock-sunpos.h"
 #include "clock-marshallers.h"
diff --git a/applets/clock/clock-map.h b/applets/clock/clock-map.h
index c991b77..1f17606 100644
--- a/applets/clock/clock-map.h
+++ b/applets/clock/clock-map.h
@@ -1,7 +1,6 @@
 #ifndef __CLOCK_MAP_H__
 #define __CLOCK_MAP_H__
 
-#include "clock.h"
 #include "clock-location.h"
 
 #include <gtk/gtk.h>
diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
index 94589cc..f147705 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -29,11 +29,9 @@
 #endif
 
 #include <glib/gi18n.h>
-
 #include <gtk/gtk.h>
 
-#include "clock.h"
-
+#include "clock-common.h"
 #include "clock-utils.h"
 
 gboolean
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 4b4f315..897ec46 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -56,8 +56,7 @@
 #include <libgweather/timezone-menu.h>
 #include <libgweather/gweather-enum-types.h>
 
-#include "clock.h"
-
+#include "clock-common.h"
 #include "calendar-window.h"
 #include "clock-location.h"
 #include "clock-location-tile.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]