diff options
81 files changed, 194 insertions, 200 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index 6c96a98..0000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -split = True diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index d66c865..278b7e3 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,7 +3,7 @@ ## include (UseGSettings) -set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml") +set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml") set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") @@ -80,10 +80,10 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}" ## # where to install -set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators") +set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators") message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir") -set (UNITY_INDICATOR_NAME "com.canonical.indicator.datetime") +set (UNITY_INDICATOR_NAME "org.ayatana.indicator.datetime") set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") install (FILES "${UNITY_INDICATOR_FILE}" diff --git a/data/com.canonical.indicator.datetime b/data/com.canonical.indicator.datetime deleted file mode 100644 index 1df0d33..0000000 --- a/data/com.canonical.indicator.datetime +++ /dev/null @@ -1,20 +0,0 @@ -[Indicator Service] -Name=indicator-datetime -ObjectPath=/com/canonical/indicator/datetime -Position=20 - -[desktop] -ObjectPath=/com/canonical/indicator/datetime/desktop - -[desktop_greeter] -ObjectPath=/com/canonical/indicator/datetime/desktop_greeter - -[desktop_lockscreen] -ObjectPath=/com/canonical/indicator/datetime/desktop_greeter - -[phone] -ObjectPath=/com/canonical/indicator/datetime/phone - -[phone_greeter] -ObjectPath=/com/canonical/indicator/datetime/phone_greeter - diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in index 7d57c8d..ab1174d 100644 --- a/data/indicator-datetime.desktop.in +++ b/data/indicator-datetime.desktop.in @@ -2,7 +2,7 @@ Type=Application Name=Indicator Date & Time Exec=@pkglibexecdir@/indicator-datetime-service -OnlyShowIn=Unity;GNOME;Pantheon; +OnlyShowIn=MATE;Unity;GNOME;Pantheon; NoDisplay=true StartupNotify=false Terminal=false diff --git a/data/org.ayatana.indicator.datetime b/data/org.ayatana.indicator.datetime new file mode 100644 index 0000000..1219c2e --- /dev/null +++ b/data/org.ayatana.indicator.datetime @@ -0,0 +1,20 @@ +[Indicator Service] +Name=indicator-datetime +ObjectPath=/org/ayatana/indicator/datetime +Position=20 + +[desktop] +ObjectPath=/org/ayatana/indicator/datetime/desktop + +[desktop_greeter] +ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter + +[desktop_lockscreen] +ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter + +[phone] +ObjectPath=/org/ayatana/indicator/datetime/phone + +[phone_greeter] +ObjectPath=/org/ayatana/indicator/datetime/phone_greeter + diff --git a/data/com.canonical.indicator.datetime.AlarmProperties.xml b/data/org.ayatana.indicator.datetime.AlarmProperties.xml index 7ba0e5e..eb306a6 100644 --- a/data/com.canonical.indicator.datetime.AlarmProperties.xml +++ b/data/org.ayatana.indicator.datetime.AlarmProperties.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> - <interface name="com.canonical.indicator.datetime.AlarmProperties"> + <interface name="org.ayatana.indicator.datetime.AlarmProperties"> <property name="DefaultSound" type="s" access="readwrite"> <doc:doc> diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/org.ayatana.indicator.datetime.gschema.xml.in index cd0a26d..a83c658 100644 --- a/data/com.canonical.indicator.datetime.gschema.xml.in +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in @@ -5,7 +5,7 @@ <value nick="24-hour" value="2" /> <value nick="custom" value="3" /> </enum> - <schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime"> + <schema id="com.canonical.indicator.datetime" path="/org/ayatana/indicator/datetime/" gettext-domain="indicator-datetime"> <key name="show-clock" type="b"> <default>true</default> <_summary>Show the clock in the panel</_summary> diff --git a/debian/changelog b/debian/changelog index f02656b..5f072c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-datetime (0.4.0-0) UNRELEASED; urgency=medium + + * Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 07 Nov 2015 12:44:19 +0100 + indicator-datetime (15.10) wily; urgency=medium * Bump version to match the branch diff --git a/debian/control b/debian/control index 84a1864..55297b0 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ -Source: indicator-datetime +Source: ayatana-indicator-datetime Section: misc Priority: optional -Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> +Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: cmake, dbus, debhelper (>= 9), - dh-translations, libglib2.0-dev (>= 2.35.4), libnotify-dev (>= 0.7.6), libgstreamer1.0-dev, @@ -21,19 +20,15 @@ Build-Depends: cmake, python3-dbusmock, # for 12h/24h locale unit tests: locales, - language-pack-touch-en | language-pack-en-base, # for running live EDS tests: evolution-data-server, gvfs-daemons, -Standards-Version: 3.9.3 -Homepage: https://launchpad.net/indicator-datetime -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04 -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04/files +Standards-Version: 3.9.6 +Homepage: https://github.com/ArcticaProject/ayatana-indicator-datetime +Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git +Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git/ -Package: indicator-datetime +Package: ayatana-indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -41,11 +36,6 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - geoclue-ubuntu-geoip | geoclue-provider, - unity-control-center (>= 14.04.3) | ubuntu-system-settings, - ubuntu-touch-sounds, -Suggests: click, -Conflicts: indicator-datetime (<< 13.10.0) -Replaces: indicator-datetime (<< 13.10.0) + geoclue-provider, Description: Simple clock A simple clock appearing in the indicator bar diff --git a/debian/rules b/debian/rules index d2889aa..402da6c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: - dh $@ --with translations + dh $@ override_dh_install: dh_install --fail-missing diff --git a/include/datetime/actions-live.h b/include/datetime/actions-live.h index 0214d65..2c348c6 100644 --- a/include/datetime/actions-live.h +++ b/include/datetime/actions-live.h @@ -22,7 +22,7 @@ #include <datetime/actions.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -59,6 +59,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ACTIONS_H diff --git a/include/datetime/actions.h b/include/datetime/actions.h index 87cb676..4780990 100644 --- a/include/datetime/actions.h +++ b/include/datetime/actions.h @@ -28,7 +28,7 @@ #include <gio/gio.h> // GSimpleActionGroup -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -76,6 +76,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ACTIONS_H diff --git a/include/datetime/alarm-queue-simple.h b/include/datetime/alarm-queue-simple.h index 838d28a..12d8206 100644 --- a/include/datetime/alarm-queue-simple.h +++ b/include/datetime/alarm-queue-simple.h @@ -27,7 +27,7 @@ #include <datetime/planner.h> #include <datetime/wakeup-timer.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -52,6 +52,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ALARM_QUEUE_H diff --git a/include/datetime/alarm-queue.h b/include/datetime/alarm-queue.h index 98abd7a..a869f4f 100644 --- a/include/datetime/alarm-queue.h +++ b/include/datetime/alarm-queue.h @@ -28,7 +28,7 @@ #include <set> #include <string> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -54,6 +54,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ALARM_QUEUE_H diff --git a/include/datetime/appointment.h b/include/datetime/appointment.h index e323c9c..2cd1807 100644 --- a/include/datetime/appointment.h +++ b/include/datetime/appointment.h @@ -25,7 +25,7 @@ #include <string> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -67,6 +67,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_APPOINTMENT_H diff --git a/include/datetime/clock-mock.h b/include/datetime/clock-mock.h index 011d079..67be943 100644 --- a/include/datetime/clock-mock.h +++ b/include/datetime/clock-mock.h @@ -22,7 +22,7 @@ #include <datetime/clock.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -64,6 +64,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_CLOCK_MOCK_H diff --git a/include/datetime/clock.h b/include/datetime/clock.h index 4a0642f..9fffd9b 100644 --- a/include/datetime/clock.h +++ b/include/datetime/clock.h @@ -27,7 +27,7 @@ #include <memory> // std::shared_ptr, std::unique_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -89,6 +89,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_CLOCK_H diff --git a/include/datetime/date-time.h b/include/datetime/date-time.h index ea9ea36..fc83388 100644 --- a/include/datetime/date-time.h +++ b/include/datetime/date-time.h @@ -26,7 +26,7 @@ #include <ctime> // time_t #include <memory> // std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -86,6 +86,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_DATETIME_H diff --git a/include/datetime/engine-eds.h b/include/datetime/engine-eds.h index 7372f71..20b1f84 100644 --- a/include/datetime/engine-eds.h +++ b/include/datetime/engine-eds.h @@ -29,7 +29,7 @@ #include <functional> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -71,6 +71,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ENGINE_EDS_H diff --git a/include/datetime/engine-mock.h b/include/datetime/engine-mock.h index 9fb0442..9cffdcc 100644 --- a/include/datetime/engine-mock.h +++ b/include/datetime/engine-mock.h @@ -22,7 +22,7 @@ #include <datetime/engine.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -66,6 +66,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ENGINE_MOCK_H diff --git a/include/datetime/engine.h b/include/datetime/engine.h index 59468d1..4d07290 100644 --- a/include/datetime/engine.h +++ b/include/datetime/engine.h @@ -27,7 +27,7 @@ #include <functional> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -64,6 +64,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ENGINE_H diff --git a/include/datetime/exporter.h b/include/datetime/exporter.h index 211e7bb..fb21db2 100644 --- a/include/datetime/exporter.h +++ b/include/datetime/exporter.h @@ -29,7 +29,7 @@ #include <memory> // std::shared_ptr #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -58,6 +58,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_EXPORTER_H diff --git a/include/datetime/formatter.h b/include/datetime/formatter.h index 9b3699d..e5367a5 100644 --- a/include/datetime/formatter.h +++ b/include/datetime/formatter.h @@ -32,7 +32,7 @@ #include <string> #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -133,6 +133,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_CLOCK_H diff --git a/include/datetime/locations-settings.h b/include/datetime/locations-settings.h index 8757f43..0cba0c3 100644 --- a/include/datetime/locations-settings.h +++ b/include/datetime/locations-settings.h @@ -25,7 +25,7 @@ #include <datetime/settings.h> #include <datetime/timezones.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -50,6 +50,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_SETTINGS_LOCATIONS_H diff --git a/include/datetime/locations.h b/include/datetime/locations.h index b840436..c90344d 100644 --- a/include/datetime/locations.h +++ b/include/datetime/locations.h @@ -27,7 +27,7 @@ #include <string> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -74,6 +74,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_LOCATIONS_H diff --git a/include/datetime/menu.h b/include/datetime/menu.h index 7b351c3..39ecc68 100644 --- a/include/datetime/menu.h +++ b/include/datetime/menu.h @@ -28,7 +28,7 @@ #include <gio/gio.h> // GMenuModel -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -80,6 +80,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_MENU_H diff --git a/include/datetime/planner-aggregate.h b/include/datetime/planner-aggregate.h index 892e71a..5d5794d 100644 --- a/include/datetime/planner-aggregate.h +++ b/include/datetime/planner-aggregate.h @@ -24,7 +24,7 @@ #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -47,6 +47,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_AGGREGATE_H diff --git a/include/datetime/planner-month.h b/include/datetime/planner-month.h index 492529f..ef605d9 100644 --- a/include/datetime/planner-month.h +++ b/include/datetime/planner-month.h @@ -27,7 +27,7 @@ #include <memory> // std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,6 +51,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_MONTH_H diff --git a/include/datetime/planner-range.h b/include/datetime/planner-range.h index d638182..7e769d3 100644 --- a/include/datetime/planner-range.h +++ b/include/datetime/planner-range.h @@ -25,7 +25,7 @@ #include <datetime/date-time.h> #include <datetime/engine.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -79,6 +79,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_RANGE_H diff --git a/include/datetime/planner-snooze.h b/include/datetime/planner-snooze.h index fc08d27..8f37e4e 100644 --- a/include/datetime/planner-snooze.h +++ b/include/datetime/planner-snooze.h @@ -26,7 +26,7 @@ #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -50,6 +50,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_H diff --git a/include/datetime/planner-upcoming.h b/include/datetime/planner-upcoming.h index 683543f..9670ce4 100644 --- a/include/datetime/planner-upcoming.h +++ b/include/datetime/planner-upcoming.h @@ -27,7 +27,7 @@ #include <memory> // std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,6 +51,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_UPCOMING_H diff --git a/include/datetime/planner.h b/include/datetime/planner.h index 22b6381..181a0d0 100644 --- a/include/datetime/planner.h +++ b/include/datetime/planner.h @@ -27,7 +27,7 @@ #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -47,6 +47,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_H diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h index bb4cd8d..af99596 100644 --- a/include/datetime/settings-live.h +++ b/include/datetime/settings-live.h @@ -24,7 +24,7 @@ #include <gio/gio.h> // GSettings -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -70,6 +70,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_SETTINGS_LIVE_H diff --git a/include/datetime/settings.h b/include/datetime/settings.h index 0294f60..6ee3e97 100644 --- a/include/datetime/settings.h +++ b/include/datetime/settings.h @@ -26,7 +26,7 @@ #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -65,6 +65,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_SETTINGS_H diff --git a/include/datetime/snap.h b/include/datetime/snap.h index cc091d3..a34f0fa 100644 --- a/include/datetime/snap.h +++ b/include/datetime/snap.h @@ -28,7 +28,7 @@ #include <functional> #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -55,6 +55,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_SNAP_H diff --git a/include/datetime/state.h b/include/datetime/state.h index 0e1043c..235c023 100644 --- a/include/datetime/state.h +++ b/include/datetime/state.h @@ -31,7 +31,7 @@ #include <memory> // std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -76,6 +76,6 @@ struct State } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_STATE_H diff --git a/include/datetime/timezone-geoclue.h b/include/datetime/timezone-geoclue.h index ab6b815..18fc159 100644 --- a/include/datetime/timezone-geoclue.h +++ b/include/datetime/timezone-geoclue.h @@ -22,7 +22,7 @@ #include <datetime/timezone.h> // base class -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -47,7 +47,7 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H diff --git a/include/datetime/timezone-timedated.h b/include/datetime/timezone-timedated.h index 5978e3e..336a148 100644 --- a/include/datetime/timezone-timedated.h +++ b/include/datetime/timezone-timedated.h @@ -26,7 +26,7 @@ #include <string> // std::string -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,6 +51,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H diff --git a/include/datetime/timezone.h b/include/datetime/timezone.h index 7d2ace8..71b3c71 100644 --- a/include/datetime/timezone.h +++ b/include/datetime/timezone.h @@ -24,7 +24,7 @@ #include <string> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -40,6 +40,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_TIMEZONE_H diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index b9d78a5..e722576 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -27,7 +27,7 @@ #include <memory> // shared_ptr<> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,6 +51,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_LIVE_TIMEZONES_H diff --git a/include/datetime/timezones.h b/include/datetime/timezones.h index d2842af..6f6d1b1 100644 --- a/include/datetime/timezones.h +++ b/include/datetime/timezones.h @@ -24,7 +24,7 @@ #include <core/property.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -54,6 +54,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_TIMEZONES_H diff --git a/include/datetime/wakeup-timer-mainloop.h b/include/datetime/wakeup-timer-mainloop.h index 5acb150..1bcd675 100644 --- a/include/datetime/wakeup-timer-mainloop.h +++ b/include/datetime/wakeup-timer-mainloop.h @@ -25,7 +25,7 @@ #include <memory> // std::unique_ptr, std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -57,6 +57,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H diff --git a/include/datetime/wakeup-timer-powerd.h b/include/datetime/wakeup-timer-powerd.h index 5237fb9..a855aa6 100644 --- a/include/datetime/wakeup-timer-powerd.h +++ b/include/datetime/wakeup-timer-powerd.h @@ -25,7 +25,7 @@ #include <memory> // std::unique_ptr, std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -57,6 +57,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_WAKEUP_TIMER_MAINLOOP_H diff --git a/include/datetime/wakeup-timer.h b/include/datetime/wakeup-timer.h index 3e5344c..b02b97e 100644 --- a/include/datetime/wakeup-timer.h +++ b/include/datetime/wakeup-timer.h @@ -24,7 +24,7 @@ #include <core/signal.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -50,6 +50,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_WAKEUP_TIMER_H diff --git a/include/notifications/awake.h b/include/notifications/awake.h index bc38817..b441692 100644 --- a/include/notifications/awake.h +++ b/include/notifications/awake.h @@ -17,12 +17,12 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H -#define UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H +#ifndef AYATANA_INDICATOR_NOTIFICATIONS_AWAKE_H +#define AYATANA_INDICATOR_NOTIFICATIONS_AWAKE_H #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -50,6 +50,6 @@ private: } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana -#endif // UNITY_INDICATOR_NOTIFICATIONS_AWAKE_H +#endif // AYATANA_INDICATOR_NOTIFICATIONS_AWAKE_H diff --git a/include/notifications/dbus-shared.h b/include/notifications/dbus-shared.h index af714e7..523fb2a 100644 --- a/include/notifications/dbus-shared.h +++ b/include/notifications/dbus-shared.h @@ -18,8 +18,8 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef UNITY_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H -#define UNITY_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H +#ifndef AYATANA_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H +#define AYATANA_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H #define BUS_SCREEN_NAME "com.canonical.Unity.Screen" #define BUS_SCREEN_PATH "/com/canonical/Unity/Screen" diff --git a/include/notifications/haptic.h b/include/notifications/haptic.h index f4f1b4d..535074d 100644 --- a/include/notifications/haptic.h +++ b/include/notifications/haptic.h @@ -17,12 +17,12 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H -#define UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H +#ifndef AYATANA_INDICATOR_NOTIFICATIONS_HAPTIC_H +#define AYATANA_INDICATOR_NOTIFICATIONS_HAPTIC_H #include <memory> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -55,6 +55,6 @@ private: } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana -#endif // UNITY_INDICATOR_NOTIFICATIONS_HAPTIC_H +#endif // AYATANA_INDICATOR_NOTIFICATIONS_HAPTIC_H diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h index fd41edf..fbc2109 100644 --- a/include/notifications/notifications.h +++ b/include/notifications/notifications.h @@ -17,15 +17,15 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H -#define UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H +#ifndef AYATANA_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H +#define AYATANA_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H #include <chrono> #include <functional> #include <memory> #include <string> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -112,6 +112,6 @@ private: } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana -#endif // UNITY_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H +#endif // AYATANA_INDICATOR_NOTIFICATIONS_NOTIFICATIONS_H diff --git a/include/notifications/sound.h b/include/notifications/sound.h index d08c2e7..8bd3e33 100644 --- a/include/notifications/sound.h +++ b/include/notifications/sound.h @@ -17,13 +17,13 @@ * Charles Kerr <charles.kerr@canonical.com> */ -#ifndef UNITY_INDICATOR_NOTIFICATIONS_SOUND_H -#define UNITY_INDICATOR_NOTIFICATIONS_SOUND_H +#ifndef AYATANA_INDICATOR_NOTIFICATIONS_SOUND_H +#define AYATANA_INDICATOR_NOTIFICATIONS_SOUND_H #include <memory> #include <string> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -55,6 +55,6 @@ private: } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana -#endif // UNITY_INDICATOR_NOTIFICATIONS_SOUND_H +#endif // AYATANA_INDICATOR_NOTIFICATIONS_SOUND_H diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 90186c3..5f98dfd 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -23,7 +23,7 @@ #include <glib.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -263,4 +263,4 @@ void LiveActions::set_location(const std::string& tzid, const std::string& name) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/actions.cpp b/src/actions.cpp index 930e100..e89b116 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -23,7 +23,7 @@ #include <glib.h> #include <gio/gio.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -293,4 +293,4 @@ const std::shared_ptr<State> Actions::state() const } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/alarm-queue-simple.cpp b/src/alarm-queue-simple.cpp index 921e8d2..652d744 100644 --- a/src/alarm-queue-simple.cpp +++ b/src/alarm-queue-simple.cpp @@ -22,7 +22,7 @@ #include <cmath> #include <set> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -187,4 +187,4 @@ SimpleAlarmQueue::alarm_reached() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/appointment.cpp b/src/appointment.cpp index 1edd93c..dca57e6 100644 --- a/src/appointment.cpp +++ b/src/appointment.cpp @@ -19,7 +19,7 @@ #include <datetime/appointment.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,4 +51,4 @@ bool Appointment::operator==(const Appointment& that) const } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/awake.cpp b/src/awake.cpp index e1bec6c..5f7e2e0 100644 --- a/src/awake.cpp +++ b/src/awake.cpp @@ -24,7 +24,7 @@ #include <limits> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -286,4 +286,4 @@ Awake::~Awake() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/clock-live.cpp b/src/clock-live.cpp index 89541ae..0ff60a8 100644 --- a/src/clock-live.cpp +++ b/src/clock-live.cpp @@ -29,7 +29,7 @@ #define TFD_TIMER_CANCEL_ON_SET (1 << 1) #endif -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -212,5 +212,5 @@ DateTime LiveClock::localtime() const } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/clock.cpp b/src/clock.cpp index a04e074..a2ef387 100644 --- a/src/clock.cpp +++ b/src/clock.cpp @@ -28,7 +28,7 @@ #include <string> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -229,4 +229,4 @@ Clock::~Clock() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/date-time.cpp b/src/date-time.cpp index 4930bf6..8aa3807 100644 --- a/src/date-time.cpp +++ b/src/date-time.cpp @@ -19,7 +19,7 @@ #include <datetime/date-time.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -289,4 +289,4 @@ bool DateTime::is_same_minute(const DateTime& a, const DateTime& b) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index c349703..0c833c6 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -30,7 +30,7 @@ #include <map> #include <set> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -1072,4 +1072,4 @@ void EdsEngine::disable_ubuntu_alarm(const Appointment& appointment) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/exporter.cpp b/src/exporter.cpp index 05b21eb..305adfb 100644 --- a/src/exporter.cpp +++ b/src/exporter.cpp @@ -25,7 +25,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -260,5 +260,5 @@ void Exporter::publish(const std::shared_ptr<Actions>& actions, } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/formatter-desktop.cpp b/src/formatter-desktop.cpp index dd5285d..dd4ff5b 100644 --- a/src/formatter-desktop.cpp +++ b/src/formatter-desktop.cpp @@ -20,7 +20,7 @@ #include <datetime/formatter.h> #include <datetime/utils.h> // T_() -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -187,4 +187,4 @@ const gchar* DesktopFormatter::getDateFormat(bool show_day, bool show_date, bool } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/formatter.cpp b/src/formatter.cpp index 9aa9bbb..c6d0d4c 100644 --- a/src/formatter.cpp +++ b/src/formatter.cpp @@ -29,7 +29,7 @@ #include <langinfo.h> // nl_langinfo() #include <string.h> // strstr() -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -264,4 +264,4 @@ Formatter::relative_format(GDateTime* then_begin, GDateTime* then_end) const } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/haptic.cpp b/src/haptic.cpp index 54a7d49..cc8ea0b 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -25,7 +25,7 @@ #include <numeric> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -167,4 +167,4 @@ Haptic::~Haptic() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/locations-settings.cpp b/src/locations-settings.cpp index ef3085f..f1e2b42 100644 --- a/src/locations-settings.cpp +++ b/src/locations-settings.cpp @@ -25,7 +25,7 @@ #include <algorithm> // std::find() -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -89,4 +89,4 @@ SettingsLocations::reload() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/locations.cpp b/src/locations.cpp index 0690acd..94ccb23 100644 --- a/src/locations.cpp +++ b/src/locations.cpp @@ -21,7 +21,7 @@ #include <glib.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -56,4 +56,4 @@ Location::Location(const std::string& zone_, const std::string& name_): } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/main.cpp b/src/main.cpp index c7769c9..8bab754 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,7 +44,7 @@ namespace uin = unity::indicator::notifications; -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; namespace diff --git a/src/menu.cpp b/src/menu.cpp index ff894bc..250cb72 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -27,7 +27,7 @@ #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -600,4 +600,4 @@ MenuFactory::buildMenu(Menu::Profile profile) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/notifications.cpp b/src/notifications.cpp index 58a6e83..4856546 100644 --- a/src/notifications.cpp +++ b/src/notifications.cpp @@ -26,7 +26,7 @@ #include <string> #include <vector> -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -366,5 +366,5 @@ Engine::app_name() const } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner-aggregate.cpp b/src/planner-aggregate.cpp index 7458f0c..23a1230 100644 --- a/src/planner-aggregate.cpp +++ b/src/planner-aggregate.cpp @@ -19,7 +19,7 @@ #include <datetime/planner-aggregate.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -102,5 +102,5 @@ AggregatePlanner::add(const std::shared_ptr<Planner>& planner) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner-month.cpp b/src/planner-month.cpp index cdae26f..93c542a 100644 --- a/src/planner-month.cpp +++ b/src/planner-month.cpp @@ -19,7 +19,7 @@ #include <datetime/planner-month.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -58,4 +58,4 @@ core::Property<std::vector<Appointment>>& MonthPlanner::appointments() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner-range.cpp b/src/planner-range.cpp index c223665..340fa20 100644 --- a/src/planner-range.cpp +++ b/src/planner-range.cpp @@ -19,7 +19,7 @@ #include <datetime/planner-range.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -107,4 +107,4 @@ core::Property<std::pair<DateTime,DateTime>>& SimpleRangePlanner::range() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner-snooze.cpp b/src/planner-snooze.cpp index e4062d2..cb365ca 100644 --- a/src/planner-snooze.cpp +++ b/src/planner-snooze.cpp @@ -21,7 +21,7 @@ #include <libedataserver/libedataserver.h> // e_uid_new() -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -116,4 +116,4 @@ SnoozePlanner::appointments() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner-upcoming.cpp b/src/planner-upcoming.cpp index 338329c..918ebbe 100644 --- a/src/planner-upcoming.cpp +++ b/src/planner-upcoming.cpp @@ -19,7 +19,7 @@ #include <datetime/planner-upcoming.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -58,4 +58,4 @@ core::Property<std::vector<Appointment>>& UpcomingPlanner::appointments() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/planner.cpp b/src/planner.cpp index 6ca9ca7..91bfe10 100644 --- a/src/planner.cpp +++ b/src/planner.cpp @@ -21,7 +21,7 @@ #include <algorithm> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,4 +51,4 @@ Planner::sort(std::vector<Appointment>& appts) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/settings-live.cpp b/src/settings-live.cpp index 8ea06a4..3475d5e 100644 --- a/src/settings-live.cpp +++ b/src/settings-live.cpp @@ -19,7 +19,7 @@ #include <datetime/settings-live.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -318,4 +318,4 @@ void LiveSettings::update_key(const std::string& key) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/snap.cpp b/src/snap.cpp index 9e470bc..9beb379 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -39,7 +39,7 @@ namespace uin = unity::indicator::notifications; -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -258,4 +258,4 @@ Snap::operator()(const Appointment& appointment, } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/sound.cpp b/src/sound.cpp index a768a29..51b410a 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -23,7 +23,7 @@ #include <mutex> // std::call_once() -namespace unity { +namespace ayatana { namespace indicator { namespace notifications { @@ -164,4 +164,4 @@ Sound::~Sound() } // namespace notifications } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/timezone-geoclue.cpp b/src/timezone-geoclue.cpp index ca9132f..9f8b4c4 100644 --- a/src/timezone-geoclue.cpp +++ b/src/timezone-geoclue.cpp @@ -27,7 +27,7 @@ #define GEOCLUE_BUS_NAME "org.freedesktop.Geoclue.Master" -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -287,5 +287,5 @@ GeoclueTimezone::~GeoclueTimezone() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/timezone-timedated.cpp b/src/timezone-timedated.cpp index fa99cd2..d38557b 100644 --- a/src/timezone-timedated.cpp +++ b/src/timezone-timedated.cpp @@ -24,7 +24,7 @@ #include <cerrno> #include <cstdlib> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -209,4 +209,4 @@ TimedatedTimezone::~TimedatedTimezone() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/timezones-live.cpp b/src/timezones-live.cpp index c5dd43c..2979036 100644 --- a/src/timezones-live.cpp +++ b/src/timezones-live.cpp @@ -21,7 +21,7 @@ #include <glib.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -68,4 +68,4 @@ void LiveTimezones::update_timezones() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/wakeup-timer-mainloop.cpp b/src/wakeup-timer-mainloop.cpp index 4f99c8c..56961f2 100644 --- a/src/wakeup-timer-mainloop.cpp +++ b/src/wakeup-timer-mainloop.cpp @@ -23,7 +23,7 @@ #include <cstdlib> // abs() -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -135,4 +135,4 @@ core::Signal<>& MainloopWakeupTimer::timeout() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp index 27b037e..e66c94c 100644 --- a/src/wakeup-timer-powerd.cpp +++ b/src/wakeup-timer-powerd.cpp @@ -26,7 +26,7 @@ #include <memory> // std::shared_ptr -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -308,4 +308,4 @@ core::Signal<>& PowerdWakeupTimer::timeout() } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana |