Merge lp:~jjardon/indicator-datetime/remove_death_code into lp:indicator-datetime/0.3

[Javier Jardón]

[Ted Gould (ted)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-08-18 15:57:14 +0000
+++ configure.ac	2011-09-06 14:29:23 +0000
@@ -26,6 +26,7 @@
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
+AC_CHECK_LIB([m],[pow])
 
 AC_ARG_ENABLE([deprecations],
   [AS_HELP_STRING([--enable-deprecations],

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-06-29 13:10:25 +0000
+++ src/Makefile.am	2011-09-06 14:29:23 +0000
@@ -8,8 +8,6 @@
 	datetime-interface.c \
 	datetime-interface.h \
 	gen-datetime-service.xml.c \
-	calendar-menu-item.c \
-	calendar-menu-item.h \
 	datetime-service.c \
 	utils.c \
 	utils.h \

=== removed file 'src/calendar-menu-item.c'
--- src/calendar-menu-item.c	2010-07-22 19:13:36 +0000
+++ src/calendar-menu-item.c	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
-Calendar menu item dbusmenu "transport" for the corresponding IDO widget.
-
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    David Barth <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gdk/gdk.h>
-#include <glib/gi18n.h>
-#include "calendar-menu-item.h"
-
-#include "dbus-shared.h"
-
-#include <libdbusmenu-glib/client.h>
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-enum {
-	LAST_SIGNAL
-};
-
-/* static guint signals[LAST_SIGNAL] = { }; */
-
-typedef struct _CalendarMenuItemPrivate CalendarMenuItemPrivate;
-struct _CalendarMenuItemPrivate
-{
-	void * placeholder;
-};
-
-#define CALENDAR_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CALENDAR_MENU_ITEM_TYPE, CalendarMenuItemPrivate))
-
-/* Prototypes */
-static void calendar_menu_item_class_init (CalendarMenuItemClass *klass);
-static void calendar_menu_item_init       (CalendarMenuItem *self);
-static void calendar_menu_item_dispose    (GObject *object);
-static void calendar_menu_item_finalize   (GObject *object);
-
-G_DEFINE_TYPE (CalendarMenuItem, calendar_menu_item, DBUSMENU_TYPE_MENUITEM);
-
-static void
-calendar_menu_item_class_init (CalendarMenuItemClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (CalendarMenuItemPrivate));
-
-	object_class->dispose = calendar_menu_item_dispose;
-	object_class->finalize = calendar_menu_item_finalize;
-
-	return;
-}
-
-static void
-calendar_menu_item_init (CalendarMenuItem *self)
-{
-	return;
-}
-
-static void
-calendar_menu_item_dispose (GObject *object)
-{
-	G_OBJECT_CLASS (calendar_menu_item_parent_class)->dispose (object);
-}
-
-static void
-calendar_menu_item_finalize (GObject *object)
-{
-	G_OBJECT_CLASS (calendar_menu_item_parent_class)->finalize (object);
-
-	return;
-}
-
-CalendarMenuItem *
-calendar_menu_item_new ()
-{
-	CalendarMenuItem * self = g_object_new(CALENDAR_MENU_ITEM_TYPE, NULL);
-
-	dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CALENDAR_MENUITEM_TYPE);
-
-	return self;
-}
-

=== removed file 'src/calendar-menu-item.h'
--- src/calendar-menu-item.h	2010-07-22 19:13:36 +0000
+++ src/calendar-menu-item.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
-Calendar menu item dbusmenu "transport" for the corresponding IDO widget.
-
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    David Barth <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __CALENDAR_MENU_ITEM_H__
-#define __CALENDAR_MENU_ITEM_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <libdbusmenu-glib/menuitem.h>
-
-G_BEGIN_DECLS
-
-#define CALENDAR_MENU_ITEM_TYPE            (calendar_menu_item_get_type ())
-#define CALENDAR_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_MENU_ITEM_TYPE, CalendarMenuItem))
-#define CALENDAR_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_MENU_ITEM_TYPE, CalendarMenuItemClass))
-#define IS_CALENDAR_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_MENU_ITEM_TYPE))
-#define IS_CALENDAR_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALENDAR_MENU_ITEM_TYPE))
-#define CALENDAR_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALENDAR_MENU_ITEM_TYPE, CalendarMenuItemClass))
-
-#define CALENDAR_MENU_ITEM_SIGNAL_ACTIVATE   "activate"
-#define CALENDAR_MENUITEM_PROP_TEXT          "text"
-
-typedef struct _CalendarMenuItem      CalendarMenuItem;
-typedef struct _CalendarMenuItemClass CalendarMenuItemClass;
-
-struct _CalendarMenuItemClass {
-	DbusmenuMenuitemClass parent_class;
-};
-
-struct _CalendarMenuItem {
-	DbusmenuMenuitem parent;
-};
-
-GType calendar_menu_item_get_type (void);
-CalendarMenuItem * calendar_menu_item_new ();
-
-G_END_DECLS
-
-#endif /* __CALENDAR_MENU_ITEM_H__ */
-