From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- calendar/gui/e-memos.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 25d52c6b63..c4a4e96154 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -1,26 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-memos.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * 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 - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * Authors: Federico Mena Quintero + * + * Authors: + * Federico Mena Quintero * Damon Chaplin - * Nathan Owens + * Nathan Owens + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_MEMOS_H_ -- cgit From 7ee6ef65f1019389c172478a80b8f0aa73a1453e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 13 Sep 2008 04:02:09 +0000 Subject: Allow EShellContent, EShellSidebar, and EShellTaskbar to be subclassed, and begin doing so for Calendars, Memos and Tasks. Makes the code cleaner. svn path=/branches/kill-bonobo/; revision=36317 --- calendar/gui/e-memos.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index c4a4e96154..9f196ded22 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -25,7 +25,6 @@ #ifndef _E_MEMOS_H_ #define _E_MEMOS_H_ -#include #include #include #include @@ -64,9 +63,6 @@ GtkWidget *e_memos_construct (EMemos *memos); GtkWidget *e_memos_new (void); -void e_memos_set_ui_component (EMemos *memos, - BonoboUIComponent *ui_component); - gboolean e_memos_add_memo_source (EMemos *memos, ESource *source); gboolean e_memos_remove_memo_source (EMemos *memos, ESource *source); gboolean e_memos_set_default_source (EMemos *memos, ESource *source); -- cgit 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-memos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 1b3f0b8c72..0a000f0d73 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -10,7 +10,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 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-memos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 7b484830fd..2c0f69f87d 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -52,7 +52,7 @@ struct _EMemosClass { GtkTableClass parent_class; /* Notification signals */ - void (* selection_changed) (EMemos *memos, int n_selected); + void (* selection_changed) (EMemos *memos, gint n_selected); void (* source_added) (EMemos *memos, ESource *source); void (* source_removed) (EMemos *memos, ESource *source); }; -- cgit From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- calendar/gui/e-memos.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 2c0f69f87d..4c49f56a79 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -57,7 +57,6 @@ struct _EMemosClass { void (* source_removed) (EMemos *memos, ESource *source); }; - GType e_memos_get_type (void); GtkWidget *e_memos_construct (EMemos *memos); @@ -73,7 +72,6 @@ void e_memos_new_memo (EMemos *memos); void e_memos_complete_selected (EMemos *memos); void e_memos_delete_selected (EMemos *memos); - void e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic); void e_memos_discard_view_menus (EMemos *memos); -- cgit From 3b0699fc304d0f4aecb261d19869de221f5d6abf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Aug 2009 21:43:09 -0400 Subject: More refactoring of settings management. --- calendar/gui/e-memos.h | 81 -------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 calendar/gui/e-memos.h (limited to 'calendar/gui/e-memos.h') diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h deleted file mode 100644 index 4c49f56a79..0000000000 --- a/calendar/gui/e-memos.h +++ /dev/null @@ -1,81 +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: - * Federico Mena Quintero - * Damon Chaplin - * Nathan Owens - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef _E_MEMOS_H_ -#define _E_MEMOS_H_ - -#include -#include -#include -#include "e-memo-table.h" - -#define E_TYPE_MEMOS (e_memos_get_type ()) -#define E_MEMOS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEMOS, EMemos)) -#define E_MEMOS_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_MEMOS, \ - EMemosClass)) -#define E_IS_MEMOS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEMOS)) -#define E_IS_MEMOS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_MEMOS)) - -typedef struct _EMemos EMemos; -typedef struct _EMemosClass EMemosClass; -typedef struct _EMemosPrivate EMemosPrivate; - -struct _EMemos { - GtkTable table; - - /* Private data */ - EMemosPrivate *priv; -}; - -struct _EMemosClass { - GtkTableClass parent_class; - - /* Notification signals */ - void (* selection_changed) (EMemos *memos, gint n_selected); - void (* source_added) (EMemos *memos, ESource *source); - void (* source_removed) (EMemos *memos, ESource *source); -}; - -GType e_memos_get_type (void); -GtkWidget *e_memos_construct (EMemos *memos); - -GtkWidget *e_memos_new (void); - -gboolean e_memos_add_memo_source (EMemos *memos, ESource *source); -gboolean e_memos_remove_memo_source (EMemos *memos, ESource *source); -gboolean e_memos_set_default_source (EMemos *memos, ESource *source); -ECal *e_memos_get_default_client (EMemos *memos); - -void e_memos_open_memo (EMemos *memos); -void e_memos_new_memo (EMemos *memos); -void e_memos_complete_selected (EMemos *memos); -void e_memos_delete_selected (EMemos *memos); - -void e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic); -void e_memos_discard_view_menus (EMemos *memos); - -EMemoTable *e_memos_get_calendar_table (EMemos *memos); -GtkWidget *e_memos_get_preview (EMemos *memos); - -#endif /* _E_MEMOS_H_ */ -- cgit