diff options
author | Javier Jardón <javier.jardon@codethink.co.uk> | 2011-09-06 15:25:34 +0100 |
---|---|---|
committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2011-09-06 15:25:34 +0100 |
commit | 34acc7b2e756c8cb98eb6560d0ea4d3d4d02d09c (patch) | |
tree | e4d5e4c40d943e5a7d5f6c8223ce59f77792a181 | |
parent | 1ab5a36d28ea2d3bac39534de9c18a95bfcb0670 (diff) | |
download | ayatana-indicator-datetime-34acc7b2e756c8cb98eb6560d0ea4d3d4d02d09c.tar.gz ayatana-indicator-datetime-34acc7b2e756c8cb98eb6560d0ea4d3d4d02d09c.tar.bz2 ayatana-indicator-datetime-34acc7b2e756c8cb98eb6560d0ea4d3d4d02d09c.zip |
Remove death code: calendar-menu-item
We use IdoCalendarMenuItem nowadays
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/calendar-menu-item.c | 100 | ||||
-rw-r--r-- | src/calendar-menu-item.h | 59 |
4 files changed, 1 insertions, 161 deletions
diff --git a/configure.ac b/configure.ac index 71fd0e9..4dec84c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_HEADER_STDC LT_PREREQ([2.2]) LT_INIT([disable-static]) +AC_CHECK_LIB([m],[pow]) AC_ARG_ENABLE([deprecations], [AS_HELP_STRING([--enable-deprecations], diff --git a/src/Makefile.am b/src/Makefile.am index 6ca07a8..254022e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,6 @@ indicator_datetime_service_SOURCES = \ 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 \ diff --git a/src/calendar-menu-item.c b/src/calendar-menu-item.c deleted file mode 100644 index c2ceec3..0000000 --- a/src/calendar-menu-item.c +++ /dev/null @@ -1,100 +0,0 @@ -/* -Calendar menu item dbusmenu "transport" for the corresponding IDO widget. - -Copyright 2010 Canonical Ltd. - -Authors: - David Barth <david.barth@canonical.com> - -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; -} - diff --git a/src/calendar-menu-item.h b/src/calendar-menu-item.h deleted file mode 100644 index 7a56f96..0000000 --- a/src/calendar-menu-item.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Calendar menu item dbusmenu "transport" for the corresponding IDO widget. - -Copyright 2010 Canonical Ltd. - -Authors: - David Barth <david.barth@canonical.com> - -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__ */ - |