aboutsummaryrefslogtreecommitdiff
path: root/src/dbus-shared.h
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-21 15:01:54 +0000
committerTarmac <Unknown>2013-06-21 15:01:54 +0000
commit854fb1a47bed41e41e6fed9c5e498dc81146302a (patch)
treec0db59a66b90162a7f8ae2519430249ce5a5ffb6 /src/dbus-shared.h
parent05ba6fa097260473c774d0d077d4e3add3db134b (diff)
parent51bd7465ac148a34ec37cb8760daf3b282b5ed6a (diff)
downloadayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.gz
ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.bz2
ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.zip
This push extracts geoclue to its own self-contained module, fixes an errant g_critical, and merges ryan's timedate1 changes from the 13.04 branch.
Approved by PS Jenkins bot, Lars Uebernickel.
Diffstat (limited to 'src/dbus-shared.h')
-rw-r--r--src/dbus-shared.h22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 9e3a781..24319e3 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -19,24 +19,6 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define BUS_NAME "com.canonical.indicator.datetime"
+#define BUS_PATH "/com/canonical/indicator/datetime"
-#define SERVICE_NAME "com.canonical.indicator.datetime"
-#define SERVICE_IFACE "com.canonical.indicator.datetime.service"
-#define SERVICE_OBJ "/com/canonical/indicator/datetime/service"
-#define SERVICE_VERSION 1
-
-#define MENU_OBJ "/com/canonical/indicator/datetime/menu"
-
-#define DBUSMENU_CALENDAR_MENUITEM_TYPE "x-canonical-calendar-item"
-
-#define CALENDAR_MENUITEM_PROP_MARKS "calendar-marks"
-
-#define APPOINTMENT_MENUITEM_TYPE "appointment-item"
-#define APPOINTMENT_MENUITEM_PROP_LABEL "appointment-label"
-#define APPOINTMENT_MENUITEM_PROP_ICON "appointment-icon"
-#define APPOINTMENT_MENUITEM_PROP_RIGHT "appointment-time"
-
-#define TIMEZONE_MENUITEM_TYPE "timezone-item"
-#define TIMEZONE_MENUITEM_PROP_ZONE "timezone-zone"
-#define TIMEZONE_MENUITEM_PROP_NAME "timezone-name"
-#define TIMEZONE_MENUITEM_PROP_RADIO "timezone-radio"