[gnome-panel] clock: rename clock.[ch] to clock-applet.[ch]
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] clock: rename clock.[ch] to clock-applet.[ch]
- Date: Sun, 30 Oct 2016 22:33:37 +0000 (UTC)
commit 496ee76d90332cfa5286400085b5cbd25d8e2289
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Oct 30 23:25:51 2016 +0200
clock: rename clock.[ch] to clock-applet.[ch]
applets/clock/Makefile.am | 4 ++--
applets/clock/calendar-window.c | 2 +-
applets/clock/{clock.c => clock-applet.c} | 2 +-
applets/clock/{clock.h => clock-applet.h} | 4 ++--
applets/clock/clock-face.c | 2 +-
applets/clock/clock-location-tile.c | 1 -
applets/clock/clock-location-tile.h | 1 -
applets/clock/clock-map.c | 2 +-
applets/clock/clock-map.h | 1 -
applets/clock/clock-utils.c | 3 +--
10 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 262a92b..8738965 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -29,8 +29,8 @@ endif
libclock_applet_la_SOURCES = \
calendar-window.c \
calendar-window.h \
- clock.c \
- clock.h \
+ clock-applet.c \
+ clock-applet.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 ac0a3b8..0941cc1 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-applet.h"
#include "clock-utils.h"
#include "clock-typebuiltins.h"
#ifdef HAVE_EDS
diff --git a/applets/clock/clock.c b/applets/clock/clock-applet.c
similarity index 99%
rename from applets/clock/clock.c
rename to applets/clock/clock-applet.c
index 07db09a..f7fe5b8 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock-applet.c
@@ -54,7 +54,7 @@
#include <libgweather/gweather.h>
-#include "clock.h"
+#include "clock-applet.h"
#include "calendar-window.h"
#include "clock-location.h"
diff --git a/applets/clock/clock.h b/applets/clock/clock-applet.h
similarity index 95%
rename from applets/clock/clock.h
rename to applets/clock/clock-applet.h
index b8cbe6e..05d487e 100644
--- a/applets/clock/clock.h
+++ b/applets/clock/clock-applet.h
@@ -22,8 +22,8 @@
* Most of the original code comes from clock.c
*/
-#ifndef CLOCK_H
-#define CLOCK_H
+#ifndef CLOCK_APPLET_H
+#define CLOCK_APPLET_H
G_BEGIN_DECLS
diff --git a/applets/clock/clock-face.c b/applets/clock/clock-face.c
index 2e95b11..a9cebea 100644
--- a/applets/clock/clock-face.c
+++ b/applets/clock/clock-face.c
@@ -15,7 +15,7 @@
#include <math.h>
#include <time.h>
-#include "clock.h"
+#include "clock-applet.h"
#include "clock-face.h"
#include "clock-location.h"
#include "clock-utils.h"
diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c
index f486cee..8016052 100644
--- a/applets/clock/clock-location-tile.c
+++ b/applets/clock/clock-location-tile.c
@@ -9,7 +9,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#include "clock.h"
#include "clock-face.h"
#include "clock-location-tile.h"
#include "clock-location.h"
diff --git a/applets/clock/clock-location-tile.h b/applets/clock/clock-location-tile.h
index c9c0497..ab622e4 100644
--- a/applets/clock/clock-location-tile.h
+++ b/applets/clock/clock-location-tile.h
@@ -3,7 +3,6 @@
#include <gtk/gtk.h>
-#include "clock.h"
#include "clock-face.h"
#include "clock-location.h"
#include "clock-utils.h"
diff --git a/applets/clock/clock-map.c b/applets/clock/clock-map.c
index fd6fe0e..a40f30a 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-applet.h"
#include "clock-map.h"
#include "clock-sunpos.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 d937b23..a63d0d2 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -34,8 +34,7 @@
#include <librsvg/rsvg.h>
-#include "clock.h"
-
+#include "clock-applet.h"
#include "clock-utils.h"
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]