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 --- mail/em-folder-selector.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index ced6448101..06b1bc4520 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * 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 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 free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ -- cgit v1.2.3 From e7a31c5035a0afeed6c1675e30487c1e2bdc139f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 24 Oct 2008 23:02:33 +0000 Subject: Commit recent work so I can merge from trunk. svn path=/branches/kill-bonobo/; revision=36684 --- mail/em-folder-selector.h | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 06b1bc4520..a97831ec95 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -26,20 +26,30 @@ #include -#ifdef cplusplus -extern "C" { -#pragma } -#endif /* cplusplus */ - -#define EM_TYPE_FOLDER_SELECTOR (em_folder_selector_get_type ()) -#define EM_FOLDER_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector)) -#define EM_FOLDER_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass)) -#define EM_IS_FOLDER_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR)) -#define EM_IS_FOLDER_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR)) - -typedef struct _EMFolderSelector EMFolderSelector; +/* Standard GObject macros */ +#define EM_TYPE_FOLDER_SELECTOR \ + (em_folder_selector_get_type ()) +#define EM_FOLDER_SELECTOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector)) +#define EM_FOLDER_SELECTOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass)) +#define EM_IS_FOLDER_SELECTOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), EM_TYPE_FOLDER_SELECTOR)) +#define EM_IS_FOLDER_SELECTOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), EM_TYPE_FOLDER_SELECTOR)) +#define EM_FOLDER_SELECTOR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass)) + +G_BEGIN_DECLS + +typedef struct _EMFolderSelector EMFolderSelector; +typedef struct _EMFolderSelectorClass EMFolderSelectorClass; typedef struct _EMFolderSelectorPrivate EMFolderSelectorPrivate; -typedef struct _EMFolderSelectorClass EMFolderSelectorClass; struct _EMFolderSelector { GtkDialog parent; @@ -87,8 +97,6 @@ const char *em_folder_selector_get_selected_path (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_uris (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_paths (EMFolderSelector *emfs); -#ifdef cplusplus -} -#endif /* cplusplus */ +G_END_DECLS #endif /* EM_FOLDER_SELECTOR_H */ -- cgit v1.2.3 From a538f3f3100dbdbae1ea172ae3b8344e650d529d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 12:11:55 -0400 Subject: Fix several types of pedantic compiler warnings. --- mail/em-folder-selector.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index a97831ec95..ee8fc2856f 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -71,11 +71,11 @@ struct _EMFolderSelectorClass { }; enum { - EM_FOLDER_SELECTOR_CAN_CREATE = 1, + EM_FOLDER_SELECTOR_CAN_CREATE = 1 }; enum { - EM_FOLDER_SELECTOR_RESPONSE_NEW = 1, + EM_FOLDER_SELECTOR_RESPONSE_NEW = 1 }; GType em_folder_selector_get_type (void); -- cgit v1.2.3 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. --- mail/em-folder-selector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 7b011f588c..12662ae5f7 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.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. --- mail/em-folder-selector.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 5d13f10cb9..c700ce0344 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -58,10 +58,10 @@ struct _EMFolderSelector { struct _EMFolderTree *emft; struct _GtkEntry *name_entry; - char *selected_path; - char *selected_uri; + gchar *selected_path; + gchar *selected_uri; - char *created_uri; + gchar *created_uri; guint created_id; }; @@ -80,19 +80,19 @@ enum { GType em_folder_selector_get_type (void); -void em_folder_selector_construct (EMFolderSelector *emfs, struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel); +void em_folder_selector_construct (EMFolderSelector *emfs, struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel); /* for selecting folders */ -GtkWidget *em_folder_selector_new (struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel); +GtkWidget *em_folder_selector_new (struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel); /* for creating folders */ -GtkWidget *em_folder_selector_create_new (struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text); +GtkWidget *em_folder_selector_create_new (struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text); -void em_folder_selector_set_selected (EMFolderSelector *emfs, const char *uri); +void em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri); void em_folder_selector_set_selected_list (EMFolderSelector *emfs, GList *list); -const char *em_folder_selector_get_selected_uri (EMFolderSelector *emfs); -const char *em_folder_selector_get_selected_path (EMFolderSelector *emfs); +const gchar *em_folder_selector_get_selected_uri (EMFolderSelector *emfs); +const gchar *em_folder_selector_get_selected_path (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_uris (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_paths (EMFolderSelector *emfs); -- cgit v1.2.3 From c0d998229d5a3d2b65445b9025de7b23112f4063 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- mail/em-folder-selector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-folder-selector.h') diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index c700ce0344..131c4a4574 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -57,7 +57,7 @@ struct _EMFolderSelector { guint32 flags; struct _EMFolderTree *emft; - struct _GtkEntry *name_entry; + GtkEntry *name_entry; gchar *selected_path; gchar *selected_uri; -- cgit v1.2.3