Commit 8a71509e authored by Matthew Barnes's avatar Matthew Barnes
Browse files

Add a "settings" module.

Collect all the "config" extensions from the "addressbook", "calendar",
and "mail" modules into one place.  These extensions typically just bind
GObject properties of extensible classes to app-specific GSettings keys.
parent 8e2902ee
......@@ -1664,6 +1664,7 @@ modules/plugin-lib/Makefile
modules/plugin-manager/Makefile
modules/prefer-plain/Makefile
modules/prefer-plain/plugin/Makefile
modules/settings/Makefile
modules/spamassassin/Makefile
modules/startup-wizard/Makefile
modules/text-highlight/Makefile
......
......@@ -54,6 +54,7 @@ SUBDIRS = \
plugin-lib \
plugin-manager \
prefer-plain \
settings \
startup-wizard \
vcard-inline \
web-inspector \
......
......@@ -30,8 +30,6 @@ module_addressbook_la_SOURCES = \
eab-composer-util.h \
e-book-config-hook.c \
e-book-config-hook.h \
e-book-config-name-selector-entry.c \
e-book-config-name-selector-entry.h \
e-book-shell-backend.c \
e-book-shell-backend.h \
e-book-shell-content.c \
......
/*
* e-book-config-name-selector-entry.h
*
* 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 <http://www.gnu.org/licenses/>
*
*/
#ifndef E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_H
#define E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_H
#include <libebackend/libebackend.h>
/* Standard GObject macros */
#define E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY \
(e_book_config_name_selector_entry_get_type ())
#define E_BOOK_CONFIG_NAME_SELECTOR_ENTRY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST \
((obj), E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY, EBookConfigNameSelectorEntry))
#define E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY, EBookConfigNameSelectorEntryClass))
#define E_IS_BOOK_CONFIG_NAME_SELECTOR_ENTRY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY))
#define E_IS_BOOK_CONFIG_NAME_SELECTOR_ENTRY_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY))
#define E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_BOOK_CONFIG_NAME_SELECTOR_ENTRY, EBookConfigNameSelectorEntryClass))
G_BEGIN_DECLS
typedef struct _EBookConfigNameSelectorEntry EBookConfigNameSelectorEntry;
typedef struct _EBookConfigNameSelectorEntryClass EBookConfigNameSelectorEntryClass;
typedef struct _EBookConfigNameSelectorEntryPrivate EBookConfigNameSelectorEntryPrivate;
struct _EBookConfigNameSelectorEntry {
EExtension parent;
EBookConfigNameSelectorEntryPrivate *priv;
};
struct _EBookConfigNameSelectorEntryClass {
EExtensionClass parent_class;
};
GType e_book_config_name_selector_entry_get_type
(void) G_GNUC_CONST;
void e_book_config_name_selector_entry_type_register
(GTypeModule *type_module);
G_END_DECLS
#endif /* E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_H */
......@@ -24,7 +24,6 @@
#endif
#include "e-book-config-hook.h"
#include "e-book-config-name-selector-entry.h"
#include "e-book-shell-view.h"
#include "e-book-shell-backend.h"
......@@ -41,7 +40,6 @@ e_module_load (GTypeModule *type_module)
/* Register dynamically loaded types. */
e_book_config_hook_register_type (type_module);
e_book_config_name_selector_entry_type_register (type_module);
e_book_shell_view_register_type (type_module);
e_book_shell_backend_type_register (type_module);
......
......@@ -17,22 +17,8 @@ module_calendar_la_SOURCES = \
e-calendar-preferences.h \
e-cal-attachment-handler.c \
e-cal-attachment-handler.h \
e-cal-config-calendar-item.c \
e-cal-config-calendar-item.h \
e-cal-config-comp-editor.c \
e-cal-config-comp-editor.h \
e-cal-config-date-edit.c \
e-cal-config-date-edit.h \
e-cal-config-hook.c \
e-cal-config-hook.h \
e-cal-config-meeting-store.c \
e-cal-config-meeting-store.h \
e-cal-config-meeting-time-selector.c \
e-cal-config-meeting-time-selector.h \
e-cal-config-model.c \
e-cal-config-model.h \
e-cal-config-view.c \
e-cal-config-view.h \
e-cal-event-hook.c \
e-cal-event-hook.h \
e-cal-shell-backend.c \
......
/*
* e-cal-config-meeting-time-selector.h
*
* 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 <http://www.gnu.org/licenses/>
*
*/
#ifndef E_CAL_CONFIG_MEETING_TIME_SELECTOR_H
#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_H
#include <libebackend/libebackend.h>
/* Standard GObject macros */
#define E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR \
(e_cal_config_meeting_time_selector_get_type ())
#define E_CAL_CONFIG_MEETING_TIME_SELECTOR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST \
((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelector))
#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelectorClass))
#define E_IS_CAL_CONFIG_MEETING_TIME_SELECTOR(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR))
#define E_IS_CAL_CONFIG_MEETING_TIME_SELECTOR_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR))
#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelectorClass))
G_BEGIN_DECLS
typedef struct _ECalConfigMeetingTimeSelector ECalConfigMeetingTimeSelector;
typedef struct _ECalConfigMeetingTimeSelectorClass ECalConfigMeetingTimeSelectorClass;
typedef struct _ECalConfigMeetingTimeSelectorPrivate ECalConfigMeetingTimeSelectorPrivate;
struct _ECalConfigMeetingTimeSelector {
EExtension parent;
ECalConfigMeetingTimeSelectorPrivate *priv;
};
struct _ECalConfigMeetingTimeSelectorClass {
EExtensionClass parent_class;
};
GType e_cal_config_meeting_time_selector_get_type
(void) G_GNUC_CONST;
void e_cal_config_meeting_time_selector_type_register
(GTypeModule *type_module);
G_END_DECLS
#endif /* E_CAL_CONFIG_MEETING_TIME_SELECTOR_H */
......@@ -43,14 +43,6 @@
#include "e-task-shell-sidebar.h"
#include "e-task-shell-view.h"
#include "e-cal-config-calendar-item.h"
#include "e-cal-config-comp-editor.h"
#include "e-cal-config-date-edit.h"
#include "e-cal-config-meeting-store.h"
#include "e-cal-config-meeting-time-selector.h"
#include "e-cal-config-model.h"
#include "e-cal-config-view.h"
#include "e-calendar-preferences.h"
/* Module Entry Points */
......@@ -82,14 +74,6 @@ e_module_load (GTypeModule *type_module)
e_task_shell_sidebar_type_register (type_module);
e_task_shell_view_register_type (type_module);
e_cal_config_calendar_item_type_register (type_module);
e_cal_config_comp_editor_type_register (type_module);
e_cal_config_date_edit_type_register (type_module);
e_cal_config_meeting_store_type_register (type_module);
e_cal_config_meeting_time_selector_type_register (type_module);
e_cal_config_model_type_register (type_module);
e_cal_config_view_type_register (type_module);
e_calendar_preferences_type_register (type_module);
}
......
......@@ -15,16 +15,8 @@ module_mail_la_SOURCES = \
evolution-module-mail.c \
e-mail-attachment-handler.c \
e-mail-attachment-handler.h \
e-mail-config-format-html.c \
e-mail-config-format-html.h \
e-mail-config-hook.c \
e-mail-config-hook.h \
e-mail-config-reader.c \
e-mail-config-reader.h \
e-mail-config-web-view.c \
e-mail-config-web-view.h \
e-mail-config-web-view-gtkhtml.c \
e-mail-config-web-view-gtkhtml.h \
e-mail-event-hook.c \
e-mail-event-hook.h \
e-mail-shell-backend.c \
......@@ -58,7 +50,6 @@ module_mail_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/mail/importers/libevolution-mail-importers.la \
$(top_builddir)/em-format/libemformat.la \
$(libevolution_mail_settings_la) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
......
/*
* e-mail-config-web-view-gtkhtml.h
*
* 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 <http://www.gnu.org/licenses/>
*
*/
#ifndef E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H
#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H
#include <libebackend/libebackend.h>
/* Standard GObject macros */
#define E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML \
(e_mail_config_web_view_gtkhtml_get_type ())
#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML(obj) \
(G_TYPE_CHECK_INSTANCE_CAST \
((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTML))
#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTMLClass))
#define E_IS_MAIL_CONFIG_WEB_VIEW_GTKHTML(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML))
#define E_IS_MAIL_CONFIG_WEB_VIEW_GTKHTML_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML))
#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTMLClass))
G_BEGIN_DECLS
typedef struct _EMailConfigWebViewGtkHTML EMailConfigWebViewGtkHTML;
typedef struct _EMailConfigWebViewGtkHTMLClass EMailConfigWebViewGtkHTMLClass;
typedef struct _EMailConfigWebViewGtkHTMLPrivate EMailConfigWebViewGtkHTMLPrivate;
struct _EMailConfigWebViewGtkHTML {
EExtension parent;
EMailConfigWebViewGtkHTMLPrivate *priv;
};
struct _EMailConfigWebViewGtkHTMLClass {
EExtensionClass parent_class;
};
GType e_mail_config_web_view_gtkhtml_get_type
(void) G_GNUC_CONST;
void e_mail_config_web_view_gtkhtml_type_register
(GTypeModule *type_module);
G_END_DECLS
#endif /* E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H */
......@@ -33,11 +33,6 @@
#include "e-mail-shell-sidebar.h"
#include "e-mail-shell-view.h"
#include "e-mail-config-format-html.h"
#include "e-mail-config-reader.h"
#include "e-mail-config-web-view.h"
#include "e-mail-config-web-view-gtkhtml.h"
#include "em-account-prefs.h"
/* Module Entry Points */
......@@ -60,11 +55,6 @@ e_module_load (GTypeModule *type_module)
e_mail_shell_sidebar_type_register (type_module);
e_mail_shell_view_register_type (type_module);
e_mail_config_format_html_type_register (type_module);
e_mail_config_reader_type_register (type_module);
e_mail_config_web_view_type_register (type_module);
e_mail_config_web_view_gtkhtml_type_register (type_module);
em_account_prefs_type_register (type_module);
}
......
NULL =
module_LTLIBRARIES = module-settings.la
module_settings_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"evolution-module-settings\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
module_settings_la_SOURCES = \
evolution-module-settings.c \
e-settings-cal-model.c \
e-settings-cal-model.h \
e-settings-calendar-item.c \
e-settings-calendar-item.h \
e-settings-calendar-view.c \
e-settings-calendar-view.h \
e-settings-comp-editor.c \
e-settings-comp-editor.h \
e-settings-date-edit.c \
e-settings-date-edit.h \
e-settings-mail-formatter.c \
e-settings-mail-formatter.h \
e-settings-mail-reader.c \
e-settings-mail-reader.h \
e-settings-meeting-store.c \
e-settings-meeting-store.h \
e-settings-meeting-time-selector.c \
e-settings-meeting-time-selector.h \
e-settings-name-selector-entry.c \
e-settings-name-selector-entry.h \
e-settings-web-view.c \
e-settings-web-view.h \
e-settings-web-view-gtkhtml.c \
e-settings-web-view-gtkhtml.h \
$(NULL)
module_settings_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/em-format/libemformat.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
module_settings_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
-include $(top_srcdir)/git.mk
/*
* e-cal-config-model.c
* e-settings-cal-model.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -20,27 +20,27 @@
#include <config.h>
#endif
#include "e-cal-config-model.h"
#include "e-settings-cal-model.h"
#include <shell/e-shell.h>
#include <calendar/gui/e-cal-model.h>
#include <calendar/gui/e-cal-model-tasks.h>
#define E_CAL_CONFIG_MODEL_GET_PRIVATE(obj) \
#define E_SETTINGS_CAL_MODEL_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelPrivate))
((obj), E_TYPE_SETTINGS_CAL_MODEL, ESettingsCalModelPrivate))
struct _ECalConfigModelPrivate {
struct _ESettingsCalModelPrivate {
gint placeholder;
};
G_DEFINE_DYNAMIC_TYPE (
ECalConfigModel,
e_cal_config_model,
ESettingsCalModel,
e_settings_cal_model,
E_TYPE_EXTENSION)
static void
cal_config_model_constructed (GObject *object)
settings_cal_model_constructed (GObject *object)
{
EExtension *extension;
EExtensible *extensible;
......@@ -141,41 +141,42 @@ cal_config_model_constructed (GObject *object)
}
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (e_cal_config_model_parent_class)->constructed (object);
G_OBJECT_CLASS (e_settings_cal_model_parent_class)->
constructed (object);
}
static void
e_cal_config_model_class_init (ECalConfigModelClass *class)
e_settings_cal_model_class_init (ESettingsCalModelClass *class)
{
GObjectClass *object_class;
EExtensionClass *extension_class;
g_type_class_add_private (class, sizeof (ECalConfigModelPrivate));
g_type_class_add_private (class, sizeof (ESettingsCalModelPrivate));
object_class = G_OBJECT_CLASS (class);
object_class->constructed = cal_config_model_constructed;
object_class->constructed = settings_cal_model_constructed;
extension_class = E_EXTENSION_CLASS (class);
extension_class->extensible_type = E_TYPE_CAL_MODEL;
}
static void
e_cal_config_model_class_finalize (ECalConfigModelClass *class)
e_settings_cal_model_class_finalize (ESettingsCalModelClass *class)
{
}
static void
e_cal_config_model_init (ECalConfigModel *extension)
e_settings_cal_model_init (ESettingsCalModel *extension)
{
extension->priv = E_CAL_CONFIG_MODEL_GET_PRIVATE (extension);
extension->priv = E_SETTINGS_CAL_MODEL_GET_PRIVATE (extension);
}
void
e_cal_config_model_type_register (GTypeModule *type_module)
e_settings_cal_model_type_register (GTypeModule *type_module)
{
/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
* function, so we have to wrap it with a public function in
* order to register types from a separate compilation unit. */
e_cal_config_model_register_type (type_module);
e_settings_cal_model_register_type (type_module);
}
/*
* e-mail-config-reader.h
* e-settings-cal-model.h
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -16,50 +16,50 @@
*
*/
#ifndef E_MAIL_CONFIG_READER_H
#define E_MAIL_CONFIG_READER_H
#ifndef E_SETTINGS_CAL_MODEL_H
#define E_SETTINGS_CAL_MODEL_H
#include <libebackend/libebackend.h>
/* Standard GObject macros */
#define E_TYPE_MAIL_CONFIG_READER \
(e_mail_config_reader_get_type ())
#define E_MAIL_CONFIG_READER(obj) \
#define E_TYPE_SETTINGS_CAL_MODEL \
(e_settings_cal_model_get_type ())
#define E_SETTINGS_CAL_MODEL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST \
((obj), E_TYPE_MAIL_CONFIG_READER, EMailConfigReader))
#define E_MAIL_CONFIG_READER_CLASS(cls) \
((obj), E_TYPE_SETTINGS_CAL_MODEL, ESettingsCalModel))
#define E_SETTINGS_CAL_MODEL_CLASS(cls) \
(G_TYPE_CHECK_CLASS_CAST \
((cls), E_TYPE_MAIL_CONFIG_READER, EMailConfigReaderClass))
#define E_IS_MAIL_CONFIG_READER(obj) \
((cls), E_TYPE_SETTINGS_CAL_MODEL, ESettingsCalModelClass))
#define E_IS_SETTINGS_CAL_MODEL(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_MAIL_CONFIG_READER))
#define E_IS_MAIL_CONFIG_READER_CLASS(cls) \
((obj), E_TYPE_SETTINGS_CAL_MODEL))
#define E_IS_SETTINGS_CAL_MODEL_CLASS(cls) \
(G_TYPE_CHECK_CLASS_TYPE \
((cls), E_TYPE_MAIL_CONFIG_READER))
#define E_MAIL_CONFIG_READER_GET_CLASS(obj) \
((cls), E_TYPE_SETTINGS_CAL_MODEL))
#define E_SETTINGS_CAL_MODEL_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_MAIL_CONFIG_READER, EMailConfigReaderClass))
((obj), E_TYPE_SETTINGS_CAL_MODEL, ESettingsCalModelClass))
G_BEGIN_DECLS
typedef struct _EMailConfigReader EMailConfigReader;
typedef struct _EMailConfigReaderClass EMailConfigReaderClass;
typedef struct _EMailConfigReaderPrivate EMailConfigReaderPrivate;
typedef struct _ESettingsCalModel ESettingsCalModel;
typedef struct _ESettingsCalModelClass ESettingsCalModelClass;
typedef struct _ESettingsCalModelPrivate ESettingsCalModelPrivate;
struct _EMailConfigReader {
struct _ESettingsCalModel {
EExtension parent;
EMailConfigReaderPrivate *priv;
ESettingsCalModelPrivate *priv;
};
struct _EMailConfigReaderClass {
struct _ESettingsCalModelClass {
EExtensionClass parent_class;
};
GType e_mail_config_reader_get_type (void) G_GNUC_CONST;
void e_mail_config_reader_type_register
GType e_settings_cal_model_get_type (void) G_GNUC_CONST;
void e_settings_cal_model_type_register
(GTypeModule *type_module);
G_END_DECLS
#endif /* E_MAIL_CONFIG_READER_H */
#endif /* E_SETTINGS_CAL_MODEL_H */
/*
* e-cal-config-calendar-item.c
* e-settings-calendar-item.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -20,25 +20,25 @@
#include <config.h>
#endif
#include "e-cal-config-calendar-item.h"
#include "e-settings-calendar-item.h"
#include <shell/e-shell.h>
#define E_CAL_CONFIG_CALENDAR_ITEM_GET_PRIVATE(obj) \
#define E_SETTINGS_CALENDAR_ITEM_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_CAL_CONFIG_CALENDAR_ITEM, ECalConfigCalendarItemPrivate))
((obj), E_TYPE_SETTINGS_CALENDAR_ITEM, ESettingsCalendarItemPrivate))
struct _ECalConfigCalendarItemPrivate {
struct _ESettingsCalendarItemPrivate {
gint placeholder;
};
G_DEFINE_DYNAMIC_TYPE (
ECalConfigCalendarItem,
e_cal_config_calendar_item,
ESettingsCalendarItem,
e_settings_calendar_item,
E_TYPE_EXTENSION)
static void
cal_config_calendar_item_constructed (GObject *object)
settings_calendar_item_constructed (GObject *object)
{
EExtension *extension;
EExtensible *extensible;
......@@ -62,43 +62,43 @@ cal_config_calendar_item_constructed (GObject *object)
G_BINDING_SYNC_CREATE);
<