[gnome-panel] Revert "Start adding geoclue support..."
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-panel] Revert "Start adding geoclue support..."
- Date: Thu, 6 Aug 2009 14:28:34 +0000 (UTC)
commit 7852d97ee54fe2b7efaab2a352abad7e2cadf4f9
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Aug 6 10:27:02 2009 -0400
Revert "Start adding geoclue support..."
This reverts commit 7c8d23896de1580ad817dac19fa837fd45599031.
applets/clock/Makefile.am | 3 ---
applets/clock/clock-marshallers.list | 1 -
applets/clock/clock.c | 9 ---------
configure.in | 3 +--
4 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 2e28351..87be581 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -57,9 +57,6 @@ CLOCK_SOURCES = \
clock-utils.h \
system-timezone.c \
system-timezone.h \
- clock-geoclue.c \
- clock-geoclue.h \
- geoclue-localnet-bindings.h \
$(BUILT_SOURCES) \
$(CALENDAR_SOURCES) \
$(SETTIME_SOURCES)
diff --git a/applets/clock/clock-marshallers.list b/applets/clock/clock-marshallers.list
index d1785c8..8c4d307 100644
--- a/applets/clock/clock-marshallers.list
+++ b/applets/clock/clock-marshallers.list
@@ -1,4 +1,3 @@
POINTER:VOID
VOID:OBJECT,STRING
INT:VOID
-VOID:STRING,STRING,STRING
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 2523c0c..31ad70e 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -70,7 +70,6 @@
#include "clock-utils.h"
#include "set-timezone.h"
#include "system-timezone.h"
-#include "clock-geoclue.h"
#define INTERNETSECOND (864)
#define INTERNETBEAT (86400)
@@ -177,8 +176,6 @@ struct _ClockData {
GList *locations;
GList *location_tiles;
- ClockGeoclue *clock_geo; /* geoclue abstraction */
-
/* runtime data */
time_t current_time;
char *timeformat;
@@ -779,10 +776,6 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
g_list_free (cd->location_tiles);
cd->location_tiles = NULL;
- if (cd->clock_geo)
- g_object_unref (cd->clock_geo);
- cd->clock_geo = NULL;
-
if (cd->systz) {
g_object_unref (cd->systz);
cd->systz = NULL;
@@ -2645,8 +2638,6 @@ fill_clock_applet (PanelApplet *applet)
NULL);
}
- cd->clock_geo = clock_geoclue_new ();
-
cd->systz = system_timezone_new ();
g_signal_connect (cd->systz, "changed",
G_CALLBACK (clock_timezone_changed), cd);
diff --git a/configure.in b/configure.in
index ee0548c..2942ceb 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,6 @@ LIBEDATASERVERUI_REQUIRED=1.2.0
CAIRO_REQUIRED=1.0.0
DBUS_GLIB_REQUIRED=0.60
GWEATHER_REQUIRED=2.24.1
-GEOCLUE_REQUIRED=0.11.1
dnl pkg-config dependency checks
@@ -122,7 +121,7 @@ fi
AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
AC_SUBST(CLOCK_EDS_ICONDIR)
-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED geoclue >= $GEOCLUE_REQUIRED libnm_glib)
+PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED)
AC_SUBST(CLOCK_CFLAGS)
AC_SUBST(CLOCK_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]