From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- calendar/gui/e-cal-menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-cal-menu.h') diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 9c37a6a9ae..5dda63f227 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- calendar/gui/e-cal-menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-cal-menu.h') diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 5dda63f227..f1d9f4b729 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -100,7 +100,7 @@ struct _ECalMenuClass { GType e_cal_menu_get_type(void); -ECalMenu *e_cal_menu_new(const char *menuid); +ECalMenu *e_cal_menu_new(const gchar *menuid); ECalMenuTargetSelect *e_cal_menu_target_new_select(ECalMenu *emp, struct _ECalModel *model, GPtrArray *events); -- cgit v1.2.3 From 00d56cd32c5d0a7f49567d5241ba0d6fd80940bb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 10:50:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- calendar/gui/e-cal-menu.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'calendar/gui/e-cal-menu.h') diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index f1d9f4b729..0667f92051 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -28,10 +28,7 @@ #include "e-util/e-menu.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _ECalMenu ECalMenu; typedef struct _ECalMenuClass ECalMenuClass; @@ -119,8 +116,6 @@ struct _ECalMenuHookClass { GType e_cal_menu_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CAL_MENU_H__ */ -- cgit v1.2.3 From 5d498956659bfe5016aa46190507203fee694ddd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Aug 2009 22:19:16 -0400 Subject: Kill EMenu. --- calendar/gui/e-cal-menu.h | 121 ---------------------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 calendar/gui/e-cal-menu.h (limited to 'calendar/gui/e-cal-menu.h') diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h deleted file mode 100644 index 0667f92051..0000000000 --- a/calendar/gui/e-cal-menu.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Michel Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef __E_CAL_MENU_H__ -#define __E_CAL_MENU_H__ - -#include - -#include "e-util/e-menu.h" - -G_BEGIN_DECLS - -typedef struct _ECalMenu ECalMenu; -typedef struct _ECalMenuClass ECalMenuClass; - -/* Current target description */ -/* Types of popup tagets */ -enum _e_cal_menu_target_t { - E_CAL_MENU_TARGET_SELECT -}; - -/** - * enum _e_cal_menu_target_select_t - ECalPopupTargetSelect qualifiers. - * - * @E_CAL_MENU_SELECT_ONE: Only one item is selected. - * @E_CAL_MENU_SELECT_MANY: More than one item selected. - * @E_CAL_MENU_SELECT_ANY: One or more items selected. - * @E_CAL_MENU_SELECT_EDITABLE: The selection is editable. - * @E_CAL_MENU_SELECT_RECURRING: Is a recurring event. - * @E_CAL_MENU_SELECT_NONRECURRING: Is not a recurring event. - * @E_CAL_MENU_SELECT_INSTANCE: This is an instance event. - * @E_CAL_MENU_SELECT_ORGANIZER: The user is the organiser of the event. - * @E_CAL_MENU_SELECT_NOTEDITING: The event is not being edited already. Not implemented. - * @E_CAL_MENU_SELECT_NOTMEETING: The event is not a meeting. - * @E_CAL_MENU_SELECT_ASSIGNABLE: An assignable task. - * @E_CAL_MENU_SELECT_HASURL: A task that contains a URL. - **/ -enum _e_cal_menu_target_select_t { - E_CAL_MENU_SELECT_ONE = 1<<0, - E_CAL_MENU_SELECT_MANY = 1<<1, - E_CAL_MENU_SELECT_ANY = 1<<2, - E_CAL_MENU_SELECT_EDITABLE = 1<<3, - E_CAL_MENU_SELECT_RECURRING = 1<<4, - E_CAL_MENU_SELECT_NONRECURRING = 1<<5, - E_CAL_MENU_SELECT_INSTANCE = 1<<6, - - E_CAL_MENU_SELECT_ORGANIZER = 1<<7, - E_CAL_MENU_SELECT_NOTEDITING = 1<<8, - E_CAL_MENU_SELECT_NOTMEETING = 1<<9, - - E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10, - E_CAL_MENU_SELECT_HASURL = 1<<11, - E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12 -}; - -typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect; - -struct _ECalMenuTargetSelect { - EMenuTarget target; - - struct _ECalModel *model; - GPtrArray *events; -}; - -typedef struct _EMenuItem ECalMenuItem; - -/* The object */ -struct _ECalMenu { - EMenu menu; - - struct _ECalMenuPrivate *priv; -}; - -struct _ECalMenuClass { - EMenuClass menu_class; -}; - -GType e_cal_menu_get_type(void); - -ECalMenu *e_cal_menu_new(const gchar *menuid); - -ECalMenuTargetSelect *e_cal_menu_target_new_select(ECalMenu *emp, struct _ECalModel *model, GPtrArray *events); - -/* ********************************************************************** */ - -typedef struct _ECalMenuHook ECalMenuHook; -typedef struct _ECalMenuHookClass ECalMenuHookClass; - -struct _ECalMenuHook { - EMenuHook hook; -}; - -struct _ECalMenuHookClass { - EMenuHookClass hook_class; -}; - -GType e_cal_menu_hook_get_type(void); - -G_END_DECLS - -#endif /* __E_CAL_MENU_H__ */ -- cgit v1.2.3