evolution r35526 - in trunk: addressbook addressbook/conduit addressbook/gui/contact-editor addressbook/gui/widgets addressbook/printing calendar calendar/conduits/calendar calendar/conduits/memo calendar/conduits/todo calendar/gui calendar/gui/dialogs filter mail plugins/email-custom-header plugins/exchange-operations plugins/groupwise-features plugins/itip-formatter shell smime smime/gui widgets widgets/e-timezone-dialog widgets/menus widgets/misc widgets/table widgets/text
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35526 - in trunk: addressbook addressbook/conduit addressbook/gui/contact-editor addressbook/gui/widgets addressbook/printing calendar calendar/conduits/calendar calendar/conduits/memo calendar/conduits/todo calendar/gui calendar/gui/dialogs filter mail plugins/email-custom-header plugins/exchange-operations plugins/groupwise-features plugins/itip-formatter shell smime smime/gui widgets widgets/e-timezone-dialog widgets/menus widgets/misc widgets/table widgets/text
- Date: Thu, 22 May 2008 17:27:51 +0000 (UTC)
Author: mbarnes
Date: Thu May 22 17:27:48 2008
New Revision: 35526
URL: http://svn.gnome.org/viewvc/evolution?rev=35526&view=rev
Log:
2008-05-22 Matthew Barnes <mbarnes redhat com>
** Fixes bug #534360
Migrate from deprecated GtkObject symbols to GObject equivalents.
Touches over 150 files in all components; too many to list.
Modified:
trunk/addressbook/ChangeLog
trunk/addressbook/conduit/address-conduit.c
trunk/addressbook/gui/contact-editor/e-contact-editor.c
trunk/addressbook/gui/widgets/e-addressbook-view.c
trunk/addressbook/gui/widgets/e-minicard-view-widget.c
trunk/addressbook/gui/widgets/e-minicard.c
trunk/addressbook/gui/widgets/eab-contact-display.h
trunk/addressbook/printing/e-contact-print-style-editor.c
trunk/addressbook/printing/e-contact-print-style-editor.h
trunk/calendar/ChangeLog
trunk/calendar/conduits/calendar/calendar-conduit.c
trunk/calendar/conduits/memo/memo-conduit.c
trunk/calendar/conduits/todo/todo-conduit.c
trunk/calendar/gui/cal-search-bar.c
trunk/calendar/gui/cal-search-bar.h
trunk/calendar/gui/calendar-commands.c
trunk/calendar/gui/calendar-view-factory.h
trunk/calendar/gui/calendar-view.h
trunk/calendar/gui/comp-editor-factory.h
trunk/calendar/gui/dialogs/comp-editor-page.c
trunk/calendar/gui/dialogs/comp-editor-page.h
trunk/calendar/gui/dialogs/comp-editor.h
trunk/calendar/gui/dialogs/e-delegate-dialog.h
trunk/calendar/gui/dialogs/event-editor.h
trunk/calendar/gui/dialogs/event-page.h
trunk/calendar/gui/dialogs/memo-editor.h
trunk/calendar/gui/dialogs/memo-page.h
trunk/calendar/gui/dialogs/recurrence-page.c
trunk/calendar/gui/dialogs/recurrence-page.h
trunk/calendar/gui/dialogs/schedule-page.h
trunk/calendar/gui/dialogs/task-details-page.h
trunk/calendar/gui/dialogs/task-editor.h
trunk/calendar/gui/dialogs/task-page.h
trunk/calendar/gui/e-alarm-list.c
trunk/calendar/gui/e-alarm-list.h
trunk/calendar/gui/e-cal-component-memo-preview.h
trunk/calendar/gui/e-cal-component-preview.h
trunk/calendar/gui/e-cal-list-view-config.h
trunk/calendar/gui/e-cal-list-view.h
trunk/calendar/gui/e-calendar-table-config.h
trunk/calendar/gui/e-calendar-table.h
trunk/calendar/gui/e-calendar-view.h
trunk/calendar/gui/e-cell-date-edit-config.h
trunk/calendar/gui/e-cell-date-edit-text.h
trunk/calendar/gui/e-date-edit-config.h
trunk/calendar/gui/e-date-time-list.c
trunk/calendar/gui/e-date-time-list.h
trunk/calendar/gui/e-day-view-config.h
trunk/calendar/gui/e-day-view-main-item.c
trunk/calendar/gui/e-day-view-main-item.h
trunk/calendar/gui/e-day-view-time-item.c
trunk/calendar/gui/e-day-view-time-item.h
trunk/calendar/gui/e-day-view-top-item.c
trunk/calendar/gui/e-day-view-top-item.h
trunk/calendar/gui/e-day-view.c
trunk/calendar/gui/e-day-view.h
trunk/calendar/gui/e-itip-control.h
trunk/calendar/gui/e-meeting-time-sel-item.c
trunk/calendar/gui/e-meeting-time-sel-item.h
trunk/calendar/gui/e-meeting-time-sel.c
trunk/calendar/gui/e-meeting-time-sel.h
trunk/calendar/gui/e-memo-table-config.h
trunk/calendar/gui/e-memo-table.h
trunk/calendar/gui/e-memos.c
trunk/calendar/gui/e-memos.h
trunk/calendar/gui/e-mini-calendar-config.h
trunk/calendar/gui/e-tasks.c
trunk/calendar/gui/e-tasks.h
trunk/calendar/gui/e-timezone-entry.c
trunk/calendar/gui/e-timezone-entry.h
trunk/calendar/gui/e-week-view-config.h
trunk/calendar/gui/e-week-view-event-item.c
trunk/calendar/gui/e-week-view-event-item.h
trunk/calendar/gui/e-week-view-main-item.c
trunk/calendar/gui/e-week-view-main-item.h
trunk/calendar/gui/e-week-view-titles-item.c
trunk/calendar/gui/e-week-view-titles-item.h
trunk/calendar/gui/e-week-view.c
trunk/calendar/gui/e-week-view.h
trunk/calendar/gui/gnome-cal.c
trunk/calendar/gui/gnome-cal.h
trunk/calendar/gui/weekday-picker.c
trunk/calendar/gui/weekday-picker.h
trunk/filter/ChangeLog
trunk/filter/rule-editor.c
trunk/filter/rule-editor.h
trunk/mail/ChangeLog
trunk/mail/em-account-prefs.h
trunk/mail/em-filter-editor.c
trunk/mail/em-filter-editor.h
trunk/mail/em-folder-selector.h
trunk/mail/em-format-html-display.c
trunk/mail/em-mailer-prefs.c
trunk/mail/em-mailer-prefs.h
trunk/mail/em-utils.c
trunk/mail/em-vfolder-editor.c
trunk/mail/em-vfolder-editor.h
trunk/mail/em-vfolder-rule.c
trunk/mail/mail-vfolder.c
trunk/mail/message-list.h
trunk/mail/message-tag-editor.h
trunk/mail/message-tag-followup.h
trunk/plugins/email-custom-header/ChangeLog
trunk/plugins/email-custom-header/email-custom-header.h
trunk/plugins/exchange-operations/ChangeLog
trunk/plugins/exchange-operations/exchange-account-setup.c
trunk/plugins/exchange-operations/exchange-send-options.h
trunk/plugins/groupwise-features/ChangeLog
trunk/plugins/groupwise-features/proxy-login.h
trunk/plugins/groupwise-features/proxy.h
trunk/plugins/itip-formatter/ChangeLog
trunk/plugins/itip-formatter/itip-view.c
trunk/shell/ChangeLog
trunk/shell/e-component-view.h
trunk/shell/e-corba-config-page.h
trunk/shell/e-history.h
trunk/shell/e-shell-folder-title-bar.h
trunk/shell/e-shell-settings-dialog.h
trunk/shell/e-shell-view.h
trunk/shell/e-shell.h
trunk/shell/e-user-creatable-items-handler.h
trunk/shell/evolution-config-control.h
trunk/smime/ChangeLog
trunk/smime/gui/e-cert-selector.h
trunk/widgets/ChangeLog
trunk/widgets/e-timezone-dialog/e-timezone-dialog.h
trunk/widgets/menus/gal-view-instance.c
trunk/widgets/menus/gal-view-menus.h
trunk/widgets/misc/ChangeLog
trunk/widgets/misc/e-activity-handler.h
trunk/widgets/misc/e-attachment-bar.h
trunk/widgets/misc/e-attachment.c
trunk/widgets/misc/e-calendar-item.c
trunk/widgets/misc/e-calendar-item.h
trunk/widgets/misc/e-calendar.h
trunk/widgets/misc/e-canvas-background.h
trunk/widgets/misc/e-canvas-vbox.h
trunk/widgets/misc/e-canvas.c
trunk/widgets/misc/e-canvas.h
trunk/widgets/misc/e-cell-date-edit.c
trunk/widgets/misc/e-cell-date-edit.h
trunk/widgets/misc/e-combo-button.c
trunk/widgets/misc/e-combo-button.h
trunk/widgets/misc/e-config-page.h
trunk/widgets/misc/e-dateedit.c
trunk/widgets/misc/e-dateedit.h
trunk/widgets/misc/e-dropdown-button.c
trunk/widgets/misc/e-dropdown-button.h
trunk/widgets/misc/e-filter-bar.c
trunk/widgets/misc/e-gui-utils.c
trunk/widgets/misc/e-gui-utils.h
trunk/widgets/misc/e-image-chooser.c
trunk/widgets/misc/e-map.c
trunk/widgets/misc/e-map.h
trunk/widgets/misc/e-multi-config-dialog.h
trunk/widgets/misc/e-popup-menu.h
trunk/widgets/misc/e-printable.h
trunk/widgets/misc/e-reflow.h
trunk/widgets/misc/e-send-options.h
trunk/widgets/misc/e-task-bar.h
trunk/widgets/misc/e-task-widget.h
trunk/widgets/misc/e-url-entry.c
trunk/widgets/misc/e-url-entry.h
trunk/widgets/table/ChangeLog
trunk/widgets/table/e-table-memory-callbacks.c
trunk/widgets/table/e-table-memory-store.c
trunk/widgets/table/e-table-model.c
trunk/widgets/table/e-table-simple.c
trunk/widgets/table/e-tree-memory-callbacks.c
trunk/widgets/table/e-tree-model.c
trunk/widgets/table/e-tree-simple.c
trunk/widgets/text/e-text.h
Modified: trunk/addressbook/conduit/address-conduit.c
==============================================================================
--- trunk/addressbook/conduit/address-conduit.c (original)
+++ trunk/addressbook/conduit/address-conduit.c Thu May 22 17:27:48 2008
@@ -173,8 +173,8 @@
g_object_ref_sink (config);
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (config);
+ g_object_unref (management);
/* Custom settings */
gnome_config_push_prefix (prefix);
@@ -1870,33 +1870,33 @@
g_assert (retval != NULL);
ctxt = e_addr_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "addrconduit_context", ctxt);
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
+ g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
+ g_signal_connect (retval, "display_settings", G_CALLBACK (display_settings), ctxt);
+ g_signal_connect (retval, "save_settings", G_CALLBACK (save_settings), ctxt);
+ g_signal_connect (retval, "revert_settings", G_CALLBACK (revert_settings), ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -1906,8 +1906,8 @@
{
EAddrConduitContext *ctxt;
- ctxt = gtk_object_get_data (GTK_OBJECT (conduit),
- "addrconduit_context");
+ ctxt = g_object_get_data (G_OBJECT (conduit),
+ "addrconduit_context");
e_addr_context_destroy (ctxt);
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor.c Thu May 22 17:27:48 2008
@@ -3385,7 +3385,7 @@
/* Connect to the deletion of the dialog */
g_signal_connect (e_contact_editor->app, "delete_event",
- GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
+ G_CALLBACK (app_delete_event_cb), e_contact_editor);
/* set the icon */
icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL);
Modified: trunk/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.c (original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.c Thu May 22 17:27:48 2008
@@ -74,7 +74,7 @@
#define d(x)
static void eab_view_init (EABView *card);
-static void eab_view_class_init (EABViewClass *klass);
+static void eab_view_class_init (EABViewClass *class);
static void eab_view_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void eab_view_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -109,8 +109,7 @@
static void search_menu_activated (ESearchBar *esb, int id, EABView *view);
static GList *get_master_list (gboolean force_rebuild);
-#define PARENT_TYPE GTK_TYPE_VBOX
-static GtkVBoxClass *parent_class = NULL;
+static gpointer parent_class;
/* The arguments we take */
enum {
@@ -194,21 +193,20 @@
(GInstanceInitFunc) eab_view_init,
};
- type = g_type_register_static (PARENT_TYPE, "EABView", &info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX, "EABView", &info, 0);
}
return type;
}
static void
-eab_view_class_init (EABViewClass *klass)
+eab_view_class_init (EABViewClass *class)
{
GObjectClass *object_class;
- object_class = G_OBJECT_CLASS(klass);
-
- parent_class = gtk_type_class (PARENT_TYPE);
+ parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS(class);
object_class->set_property = eab_view_set_property;
object_class->get_property = eab_view_get_property;
object_class->dispose = eab_view_dispose;
@@ -377,8 +375,7 @@
eav->search_rule = NULL;
}
- if (G_OBJECT_CLASS(parent_class)->dispose)
- G_OBJECT_CLASS(parent_class)->dispose(object);
+ G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
Modified: trunk/addressbook/gui/widgets/e-minicard-view-widget.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard-view-widget.c (original)
+++ trunk/addressbook/gui/widgets/e-minicard-view-widget.c Thu May 22 17:27:48 2008
@@ -30,7 +30,7 @@
#include "e-minicard-view-widget.h"
static void e_minicard_view_widget_init (EMinicardViewWidget *widget);
-static void e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass);
+static void e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class);
static void e_minicard_view_widget_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void e_minicard_view_widget_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void e_minicard_view_widget_dispose (GObject *object);
@@ -40,8 +40,7 @@
static void e_minicard_view_widget_realize (GtkWidget *widget);
static gboolean e_minicard_view_widget_real_focus_in_event (GtkWidget *widget, GdkEventFocus *event);
-
-static ECanvasClass *parent_class = NULL;
+static gpointer parent_class;
/* The arguments we take */
enum {
@@ -86,21 +85,31 @@
}
static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
+e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
ECanvasClass *canvas_class;
- object_class = (GObjectClass*) klass;
- widget_class = GTK_WIDGET_CLASS (klass);
- canvas_class = E_CANVAS_CLASS (klass);
-
- parent_class = gtk_type_class (e_canvas_get_type ());
-
- object_class->set_property = e_minicard_view_widget_set_property;
- object_class->get_property = e_minicard_view_widget_get_property;
- object_class->dispose = e_minicard_view_widget_dispose;
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_minicard_view_widget_set_property;
+ object_class->get_property = e_minicard_view_widget_get_property;
+ object_class->dispose = e_minicard_view_widget_dispose;
+
+ widget_class = GTK_WIDGET_CLASS (class);
+ widget_class->style_set = e_minicard_view_widget_style_set;
+ widget_class->realize = e_minicard_view_widget_realize;
+ widget_class->size_allocate = e_minicard_view_widget_size_allocate;
+ widget_class->focus_in_event = e_minicard_view_widget_real_focus_in_event;
+
+ canvas_class = E_CANVAS_CLASS (class);
+ canvas_class->reflow = e_minicard_view_widget_reflow;
+
+ class->selection_change = NULL;
+ class->column_width_changed = NULL;
+ class->right_click = NULL;
g_object_class_install_property (object_class, PROP_BOOK,
g_param_spec_object ("book",
@@ -156,18 +165,6 @@
NULL, NULL,
eab_marshal_INT__POINTER,
G_TYPE_INT, 1, G_TYPE_POINTER);
-
- widget_class->style_set = e_minicard_view_widget_style_set;
- widget_class->realize = e_minicard_view_widget_realize;
- widget_class->size_allocate = e_minicard_view_widget_size_allocate;
- widget_class->focus_in_event = e_minicard_view_widget_real_focus_in_event;
-
-
- canvas_class->reflow = e_minicard_view_widget_reflow;
-
- klass->selection_change = NULL;
- klass->column_width_changed = NULL;
- klass->right_click = NULL;
}
static void
Modified: trunk/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard.c (original)
+++ trunk/addressbook/gui/widgets/e-minicard.c Thu May 22 17:27:48 2008
@@ -45,7 +45,7 @@
#include "a11y/addressbook/ea-addressbook.h"
static void e_minicard_init (EMinicard *card);
-static void e_minicard_class_init (EMinicardClass *klass);
+static void e_minicard_class_init (EMinicardClass *class);
static void e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void e_minicard_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void e_minicard_dispose (GObject *object);
@@ -61,7 +61,7 @@
static gint e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event);
-static GnomeCanvasGroupClass *parent_class = NULL;
+static gpointer parent_class;
#define d(x)
@@ -131,19 +131,26 @@
}
static void
-e_minicard_class_init (EMinicardClass *klass)
+e_minicard_class_init (EMinicardClass *class)
{
- GObjectClass *object_class = (GObjectClass*) klass;
- GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) klass;
+ GObjectClass *object_class;
+ GnomeCanvasItemClass *item_class;
- object_class->set_property = e_minicard_set_property;
- object_class->get_property = e_minicard_get_property;
- object_class->dispose = e_minicard_dispose;
- object_class->finalize = e_minicard_finalize;
+ parent_class = g_type_class_peek_parent (class);
- klass->style_set = e_minicard_style_set;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_minicard_set_property;
+ object_class->get_property = e_minicard_get_property;
+ object_class->dispose = e_minicard_dispose;
+ object_class->finalize = e_minicard_finalize;
+
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->realize = e_minicard_realize;
+ item_class->unrealize = e_minicard_unrealize;
+ item_class->event = e_minicard_event;
- parent_class = gtk_type_class (gnome_canvas_group_get_type ());
+ class->style_set = e_minicard_style_set;
+ class->selected = NULL;
g_object_class_install_property (object_class, PROP_WIDTH,
g_param_spec_double ("width",
@@ -224,13 +231,6 @@
G_TYPE_NONE, 1,
GTK_TYPE_STYLE);
- /* GnomeCanvasItem method overrides */
- item_class->realize = e_minicard_realize;
- item_class->unrealize = e_minicard_unrealize;
- item_class->event = e_minicard_event;
-
- klass->selected = NULL;
-
/* init the accessibility support for e_minicard */
e_minicard_a11y_init();
}
Modified: trunk/addressbook/gui/widgets/eab-contact-display.h
==============================================================================
--- trunk/addressbook/gui/widgets/eab-contact-display.h (original)
+++ trunk/addressbook/gui/widgets/eab-contact-display.h Thu May 22 17:27:48 2008
@@ -51,7 +51,7 @@
GtkHTMLClass parent_class;
};
-GtkType eab_contact_display_get_type (void);
+GType eab_contact_display_get_type (void);
GtkWidget * eab_contact_display_new (void);
void eab_contact_display_render (EABContactDisplay *display, EContact *contact,
Modified: trunk/addressbook/printing/e-contact-print-style-editor.c
==============================================================================
--- trunk/addressbook/printing/e-contact-print-style-editor.c (original)
+++ trunk/addressbook/printing/e-contact-print-style-editor.c Thu May 22 17:27:48 2008
@@ -23,57 +23,47 @@
#include "e-util/e-util-private.h"
static void e_contact_print_style_editor_init (EContactPrintStyleEditor *card);
-static void e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass);
-static void e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy (GtkObject *object);
+static void e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *class);
+static void e_contact_print_style_editor_finalize (GObject *object);
-static GtkVBoxClass *parent_class = NULL;
+static gpointer parent_class;
-
-/* The arguments we take */
-enum {
- ARG_0,
- ARG_CARD
-};
-
-GtkType
+GType
e_contact_print_style_editor_get_type (void)
{
- static GtkType contact_print_style_editor_type = 0;
+ static GType type = 0;
- if (!contact_print_style_editor_type)
- {
- static const GtkTypeInfo contact_print_style_editor_info =
- {
- "EContactPrintStyleEditor",
- sizeof (EContactPrintStyleEditor),
- sizeof (EContactPrintStyleEditorClass),
- (GtkClassInitFunc) e_contact_print_style_editor_class_init,
- (GtkObjectInitFunc) e_contact_print_style_editor_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
- }
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EContactPrintStyleEditorClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) e_contact_print_style_editor_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EContactPrintStyleEditor),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) e_contact_print_style_editor_init,
+ NULL /* value_table */
+ };
+
+ type = g_type_register_static (
+ GTK_TYPE_VBOX, "EContactPrintStyleEditor",
+ &type_info, 0);
+ }
- return contact_print_style_editor_type;
+ return type;
}
static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
+e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = (GtkObjectClass*) klass;
+ parent_class = g_type_class_peek_parent (class);
- parent_class = gtk_type_class (gtk_vbox_get_type ());
-
- object_class->set_arg = e_contact_print_style_editor_set_arg;
- object_class->get_arg = e_contact_print_style_editor_get_arg;
- object_class->destroy = e_contact_print_style_editor_destroy;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->finalize = e_contact_print_style_editor_finalize;
}
#if 0
@@ -113,7 +103,7 @@
}
static void
-e_contact_print_style_editor_destroy (GtkObject *object)
+e_contact_print_style_editor_finalize (GObject *object)
{
EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);
@@ -122,7 +112,7 @@
e_contact_print_style_editor->gui = NULL;
}
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
GtkWidget*
@@ -130,22 +120,3 @@
{
return g_object_new (e_contact_print_style_editor_get_type (), NULL);
}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
- switch (arg_id){
- default:
- break;
- }
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
- switch (arg_id) {
- default:
- arg->type = GTK_TYPE_INVALID;
- break;
- }
-}
Modified: trunk/addressbook/printing/e-contact-print-style-editor.h
==============================================================================
--- trunk/addressbook/printing/e-contact-print-style-editor.h (original)
+++ trunk/addressbook/printing/e-contact-print-style-editor.h Thu May 22 17:27:48 2008
@@ -39,10 +39,10 @@
*/
#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE (e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj) (GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj) (GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
+#define E_CONTACT_PRINT_STYLE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
+#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
+#define E_IS_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
+#define E_IS_MINICARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
typedef struct _EContactPrintStyleEditor EContactPrintStyleEditor;
@@ -63,7 +63,7 @@
GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType e_contact_print_style_editor_get_type (void);
+GType e_contact_print_style_editor_get_type (void);
#ifdef __cplusplus
}
Modified: trunk/calendar/conduits/calendar/calendar-conduit.c
==============================================================================
--- trunk/calendar/conduits/calendar/calendar-conduit.c (original)
+++ trunk/calendar/conduits/calendar/calendar-conduit.c Thu May 22 17:27:48 2008
@@ -126,8 +126,8 @@
g_object_ref_sink (config);
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (config);
+ g_object_unref (management);
/* Custom settings */
g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);
@@ -2109,34 +2109,34 @@
g_assert (retval != NULL);
ctxt = e_calendar_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "calconduit_context", ctxt);
/* Sync signals */
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
+ g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
+ g_signal_connect (retval, "display_settings", G_CALLBACK (display_settings), ctxt);
+ g_signal_connect (retval, "save_settings", G_CALLBACK (save_settings), ctxt);
+ g_signal_connect (retval, "revert_settings", G_CALLBACK (revert_settings), ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -2147,7 +2147,7 @@
GtkObject *obj = GTK_OBJECT (conduit);
ECalConduitContext *ctxt;
- ctxt = gtk_object_get_data (obj, "calconduit_context");
+ ctxt = g_object_get_data (G_OBJECT (obj), "calconduit_context");
e_calendar_context_destroy (ctxt);
gtk_object_destroy (obj);
Modified: trunk/calendar/conduits/memo/memo-conduit.c
==============================================================================
--- trunk/calendar/conduits/memo/memo-conduit.c (original)
+++ trunk/calendar/conduits/memo/memo-conduit.c Thu May 22 17:27:48 2008
@@ -131,8 +131,8 @@
g_object_ref_sink (config);
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (config);
+ g_object_unref (management);
/* Custom settings */
gnome_config_push_prefix (prefix);
@@ -1393,33 +1393,33 @@
g_assert (retval != NULL);
ctxt = e_memo_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "memoconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "memoconduit_context", ctxt);
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
+ g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
+ g_signal_connect (retval, "display_settings", G_CALLBACK (display_settings), ctxt);
+ g_signal_connect (retval, "save_settings", G_CALLBACK (save_settings), ctxt);
+ g_signal_connect (retval, "revert_settings", G_CALLBACK (revert_settings), ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -1430,7 +1430,7 @@
GtkObject *obj = GTK_OBJECT (conduit);
EMemoConduitContext *ctxt;
- ctxt = gtk_object_get_data (obj, "memoconduit_context");
+ ctxt = g_object_get_data (G_OBJECT (obj), "memoconduit_context");
e_memo_context_destroy (ctxt);
gtk_object_destroy (obj);
Modified: trunk/calendar/conduits/todo/todo-conduit.c
==============================================================================
--- trunk/calendar/conduits/todo/todo-conduit.c (original)
+++ trunk/calendar/conduits/todo/todo-conduit.c Thu May 22 17:27:48 2008
@@ -133,8 +133,8 @@
g_object_ref_sink (config);
if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
c->sync_type = GnomePilotConduitSyncTypeNotSet;
- gtk_object_unref (GTK_OBJECT (config));
- gtk_object_unref (GTK_OBJECT (management));
+ g_object_unref (config);
+ g_object_unref (management);
/* Custom settings */
gnome_config_push_prefix (prefix);
@@ -1582,33 +1582,33 @@
g_assert (retval != NULL);
ctxt = e_todo_context_new (pilot_id);
- gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
+ g_object_set_data (G_OBJECT (retval), "todoconduit_context", ctxt);
- gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
- gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
+ g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
+ g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
- gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
- gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
- gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
- gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
- gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
- gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
- gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
- gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
- gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
- gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
- gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
+ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
+ g_signal_connect (retval, "display_settings", G_CALLBACK (display_settings), ctxt);
+ g_signal_connect (retval, "save_settings", G_CALLBACK (save_settings), ctxt);
+ g_signal_connect (retval, "revert_settings", G_CALLBACK (revert_settings), ctxt);
return GNOME_PILOT_CONDUIT (retval);
}
@@ -1619,7 +1619,7 @@
GtkObject *obj = GTK_OBJECT (conduit);
EToDoConduitContext *ctxt;
- ctxt = gtk_object_get_data (obj, "todoconduit_context");
+ ctxt = g_object_get_data (G_OBJECT (obj), "todoconduit_context");
e_todo_context_destroy (ctxt);
gtk_object_destroy (obj);
Modified: trunk/calendar/gui/cal-search-bar.c
==============================================================================
--- trunk/calendar/gui/cal-search-bar.c (original)
+++ trunk/calendar/gui/cal-search-bar.c Thu May 22 17:27:48 2008
@@ -147,22 +147,24 @@
ESearchBarClass *search_bar_class = E_SEARCH_BAR_CLASS (klass);
cal_search_bar_signals[SEXP_CHANGED] =
- gtk_signal_new ("sexp_changed",
- GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ g_signal_new ("sexp_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (CalSearchBarClass, sexp_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
cal_search_bar_signals[CATEGORY_CHANGED] =
- gtk_signal_new ("category_changed",
- GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),
- gtk_marshal_NONE__STRING,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ g_signal_new ("category_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (CalSearchBarClass, category_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
klass->sexp_changed = NULL;
klass->category_changed = NULL;
@@ -246,8 +248,7 @@
static void
notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)
{
- gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED],
- sexp);
+ g_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED], 0, sexp);
}
/* Returns the string of the currently selected category, NULL for "Unmatched" and "All
@@ -522,8 +523,7 @@
notify_category_is (cal_search);
category = cal_search_bar_get_category (cal_search);
- gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],
- category);
+ g_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED], 0, category);
}
#endif
Modified: trunk/calendar/gui/cal-search-bar.h
==============================================================================
--- trunk/calendar/gui/cal-search-bar.h (original)
+++ trunk/calendar/gui/cal-search-bar.h Thu May 22 17:27:48 2008
@@ -29,11 +29,11 @@
#define TYPE_CAL_SEARCH_BAR (cal_search_bar_get_type ())
-#define CAL_SEARCH_BAR(obj) (GTK_CHECK_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))
-#define CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR, \
+#define CAL_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))
+#define CAL_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR, \
CalSearchBarClass))
-#define IS_CAL_SEARCH_BAR(obj) (GTK_CHECK_TYPE ((obj), TYPE_CAL_SEARCH_BAR))
-#define IS_CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))
+#define IS_CAL_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CAL_SEARCH_BAR))
+#define IS_CAL_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))
typedef struct CalSearchBarPrivate CalSearchBarPrivate;
@@ -67,7 +67,7 @@
void (* category_changed) (CalSearchBar *cal_search, const char *category);
} CalSearchBarClass;
-GtkType cal_search_bar_get_type (void);
+GType cal_search_bar_get_type (void);
CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags);
Modified: trunk/calendar/gui/calendar-commands.c
==============================================================================
--- trunk/calendar/gui/calendar-commands.c (original)
+++ trunk/calendar/gui/calendar-commands.c Thu May 22 17:27:48 2008
@@ -522,9 +522,8 @@
calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
focus->calendar_focused = TRUE;
} else if (focus->calendar_focused) {
- gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
- G_CALLBACK (gcal_calendar_selection_changed_cb),
- control);
+ g_signal_handlers_disconnect_by_func (
+ gcal, G_CALLBACK (gcal_calendar_selection_changed_cb), control);
calendar_control_sensitize_calendar_commands (control, gcal, FALSE);
focus->calendar_focused = FALSE;
}
@@ -553,9 +552,8 @@
* of blindly assumming that we are getting this event because
* the taskpad was in fact focused.
*/
- gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
- G_CALLBACK (gcal_taskpad_selection_changed_cb),
- control);
+ g_signal_handlers_disconnect_by_func (
+ gcal, G_CALLBACK (gcal_taskpad_selection_changed_cb), control);
sensitize_taskpad_commands (gcal, control, FALSE);
focus->taskpad_focused = FALSE;
}
Modified: trunk/calendar/gui/calendar-view-factory.h
==============================================================================
--- trunk/calendar/gui/calendar-view-factory.h (original)
+++ trunk/calendar/gui/calendar-view-factory.h Thu May 22 17:27:48 2008
@@ -29,12 +29,12 @@
#define TYPE_CALENDAR_VIEW_FACTORY (calendar_view_factory_get_type ())
-#define CALENDAR_VIEW_FACTORY(obj) (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY, \
+#define CALENDAR_VIEW_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY, \
CalendarViewFactory))
-#define CALENDAR_VIEW_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
+#define CALENDAR_VIEW_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
TYPE_CALENDAR_VIEW_FACTORY, CalendarViewClass))
-#define IS_CALENDAR_VIEW_FACTORY(obj) (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))
-#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
+#define IS_CALENDAR_VIEW_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))
+#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
TYPE_CALENDAR_VIEW_FACTORY))
typedef struct _CalendarViewFactoryPrivate CalendarViewFactoryPrivate;
@@ -50,7 +50,7 @@
GalViewFactoryClass parent_class;
} CalendarViewFactoryClass;
-GtkType calendar_view_factory_get_type (void);
+GType calendar_view_factory_get_type (void);
CalendarViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
GnomeCalendarViewType view_type);
Modified: trunk/calendar/gui/calendar-view.h
==============================================================================
--- trunk/calendar/gui/calendar-view.h (original)
+++ trunk/calendar/gui/calendar-view.h Thu May 22 17:27:48 2008
@@ -29,11 +29,11 @@
#define TYPE_CALENDAR_VIEW (calendar_view_get_type ())
-#define CALENDAR_VIEW(obj) (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
-#define CALENDAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
+#define CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
+#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
CalendarViewClass))
-#define IS_CALENDAR_VIEW(obj) (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW))
-#define IS_CALENDAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
+#define IS_CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW))
+#define IS_CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
typedef struct _CalendarViewPrivate CalendarViewPrivate;
@@ -48,7 +48,7 @@
GalViewClass parent_class;
} CalendarViewClass;
-GtkType calendar_view_get_type (void);
+GType calendar_view_get_type (void);
CalendarView *calendar_view_construct (CalendarView *cal_view,
GnomeCalendarViewType view_type,
Modified: trunk/calendar/gui/comp-editor-factory.h
==============================================================================
--- trunk/calendar/gui/comp-editor-factory.h (original)
+++ trunk/calendar/gui/comp-editor-factory.h Thu May 22 17:27:48 2008
@@ -27,12 +27,12 @@
#define TYPE_COMP_EDITOR_FACTORY (comp_editor_factory_get_type ())
-#define COMP_EDITOR_FACTORY(obj) (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_FACTORY, \
+#define COMP_EDITOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR_FACTORY, \
CompEditorFactory))
-#define COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
+#define COMP_EDITOR_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
TYPE_COMP_EDITOR_FACTORY, CompEditorFactoryClass))
-#define IS_COMP_EDITOR_FACTORY(obj) (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))
-#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))
+#define IS_COMP_EDITOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))
+#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))
typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;
@@ -49,7 +49,7 @@
POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;
} CompEditorFactoryClass;
-GtkType comp_editor_factory_get_type (void);
+GType comp_editor_factory_get_type (void);
CompEditorFactory *comp_editor_factory_new (void);
Modified: trunk/calendar/gui/dialogs/comp-editor-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-page.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor-page.c Thu May 22 17:27:48 2008
@@ -33,9 +33,9 @@
static void comp_editor_page_class_init (CompEditorPageClass *class);
static void comp_editor_page_init (CompEditorPage *page);
-static void comp_editor_page_destroy (GtkObject *object);
+static void comp_editor_page_dispose (GObject *object);
-static GtkObjectClass *parent_class = NULL;
+static gpointer parent_class;
/* Signal IDs */
@@ -64,40 +64,54 @@
*
* Return value: The type ID of the #CompEditorPage class.
**/
-GtkType
+GType
comp_editor_page_get_type (void)
{
- static GtkType comp_editor_page_type = 0;
+ static GType type = 0;
- if (!comp_editor_page_type) {
- static const GtkTypeInfo comp_editor_page_info = {
- "CompEditorPage",
- sizeof (CompEditorPage),
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
sizeof (CompEditorPageClass),
- (GtkClassInitFunc) comp_editor_page_class_init,
- (GtkObjectInitFunc) comp_editor_page_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) comp_editor_page_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (CompEditorPage),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) comp_editor_page_init,
+ NULL /* value_table */
};
- comp_editor_page_type =
- gtk_type_unique (GTK_TYPE_OBJECT,
- &comp_editor_page_info);
+ type = g_type_register_static (
+ G_TYPE_OBJECT, "CompEditorPage", &type_info, 0);
}
- return comp_editor_page_type;
+ return type;
}
/* Class initialization function for the abstract editor page */
static void
comp_editor_page_class_init (CompEditorPageClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
+
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class = G_OBJECT_CLASS (class);
+ object_class->dispose = comp_editor_page_dispose;
- object_class = (GtkObjectClass *) class;
+ class->changed = NULL;
+ class->summary_changed = NULL;
+ class->dates_changed = NULL;
- parent_class = g_type_class_ref(GTK_TYPE_OBJECT);
+ class->get_widget = NULL;
+ class->focus_main_widget = NULL;
+ class->fill_widgets = NULL;
+ class->fill_component = NULL;
+ class->fill_timezones = NULL;
+ class->set_summary = NULL;
+ class->set_dates = NULL;
comp_editor_page_signals[CHANGED] =
g_signal_new ("changed",
@@ -159,20 +173,6 @@
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
-
- class->changed = NULL;
- class->summary_changed = NULL;
- class->dates_changed = NULL;
-
- class->get_widget = NULL;
- class->focus_main_widget = NULL;
- class->fill_widgets = NULL;
- class->fill_component = NULL;
- class->fill_timezones = NULL;
- class->set_summary = NULL;
- class->set_dates = NULL;
-
- object_class->destroy = comp_editor_page_destroy;
}
@@ -186,7 +186,7 @@
static void
-comp_editor_page_destroy (GtkObject *object)
+comp_editor_page_dispose (GObject *object)
{
CompEditorPage *page;
@@ -205,8 +205,7 @@
page->accel_group = NULL;
}
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ G_OBJECT_CLASS (parent_class)->dispose (object);
}
@@ -362,9 +361,9 @@
g_return_if_fail (page!= NULL);
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page),
- comp_editor_page_signals[FOCUS_OUT],
- widget);
+ g_signal_emit (page,
+ comp_editor_page_signals[FOCUS_OUT], 0,
+ widget);
}
@@ -379,9 +378,9 @@
g_return_if_fail (page!= NULL);
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page),
- comp_editor_page_signals[FOCUS_IN],
- widget);
+ g_signal_emit (page,
+ comp_editor_page_signals[FOCUS_IN], 0,
+ widget);
}
/**
@@ -414,7 +413,7 @@
g_return_if_fail (page != NULL);
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[CHANGED]);
+ g_signal_emit (page, comp_editor_page_signals[CHANGED], 0);
}
/**
@@ -429,7 +428,7 @@
g_return_if_fail (page != NULL);
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[NEEDS_SEND]);
+ g_signal_emit (page, comp_editor_page_signals[NEEDS_SEND], 0);
}
/**
@@ -447,9 +446,9 @@
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page),
- comp_editor_page_signals[SUMMARY_CHANGED],
- summary);
+ g_signal_emit (page,
+ comp_editor_page_signals[SUMMARY_CHANGED], 0,
+ summary);
}
/**
@@ -466,9 +465,9 @@
g_return_if_fail (page != NULL);
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
- gtk_signal_emit (GTK_OBJECT (page),
- comp_editor_page_signals[DATES_CHANGED],
- dates);
+ g_signal_emit (page,
+ comp_editor_page_signals[DATES_CHANGED], 0,
+ dates);
}
/**
@@ -486,9 +485,9 @@
g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
comp_editor_page_set_e_cal (page, client);
- gtk_signal_emit (GTK_OBJECT (page),
- comp_editor_page_signals[CLIENT_CHANGED],
- client);
+ g_signal_emit (page,
+ comp_editor_page_signals[CLIENT_CHANGED], 0,
+ client);
}
/**
Modified: trunk/calendar/gui/dialogs/comp-editor-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-page.h (original)
+++ trunk/calendar/gui/dialogs/comp-editor-page.h Thu May 22 17:27:48 2008
@@ -53,7 +53,7 @@
} CompEditorPageFlags;
typedef struct {
- GtkObject object;
+ GObject object;
/* Some of the pages need the ECal to access timezone data. Also,
* the event page needs to know it to fill the source option menu. */
@@ -70,7 +70,7 @@
} CompEditorPage;
typedef struct {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
/* Notification signals */
@@ -95,7 +95,7 @@
void (* set_dates) (CompEditorPage *page, CompEditorPageDates *dates);
} CompEditorPageClass;
-GtkType comp_editor_page_get_type (void);
+GType comp_editor_page_get_type (void);
GtkWidget *comp_editor_page_get_widget (CompEditorPage *page);
void comp_editor_page_focus_main_widget (CompEditorPage *page);
void comp_editor_page_unset_focused_widget (CompEditorPage *page, GtkWidget *widget);
Modified: trunk/calendar/gui/dialogs/comp-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.h (original)
+++ trunk/calendar/gui/dialogs/comp-editor.h Thu May 22 17:27:48 2008
@@ -68,7 +68,7 @@
COMP_EDITOR_IS_SHARED = 1 << 5
} CompEditorFlags;
-GtkType comp_editor_get_type (void);
+GType comp_editor_get_type (void);
void comp_editor_set_changed (CompEditor *editor,
gboolean changed);
gboolean comp_editor_get_changed (CompEditor *editor);
Modified: trunk/calendar/gui/dialogs/e-delegate-dialog.h
==============================================================================
--- trunk/calendar/gui/dialogs/e-delegate-dialog.h (original)
+++ trunk/calendar/gui/dialogs/e-delegate-dialog.h Thu May 22 17:27:48 2008
@@ -48,7 +48,7 @@
GtkObjectClass parent_class;
};
-GtkType e_delegate_dialog_get_type (void);
+GType e_delegate_dialog_get_type (void);
EDelegateDialog* e_delegate_dialog_construct (EDelegateDialog *etd,
const char *name,
Modified: trunk/calendar/gui/dialogs/event-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/event-editor.h (original)
+++ trunk/calendar/gui/dialogs/event-editor.h Thu May 22 17:27:48 2008
@@ -50,7 +50,7 @@
CompEditorClass parent_class;
};
-GtkType event_editor_get_type (void);
+GType event_editor_get_type (void);
EventEditor *event_editor_construct (EventEditor *ee,
ECal *client);
EventEditor *event_editor_new (ECal *client, CompEditorFlags flags);
Modified: trunk/calendar/gui/dialogs/event-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/event-page.h (original)
+++ trunk/calendar/gui/dialogs/event-page.h Thu May 22 17:27:48 2008
@@ -56,7 +56,7 @@
} EventPageClass;
-GtkType event_page_get_type (void);
+GType event_page_get_type (void);
EventPage *event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client);
EventPage *event_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic);
ECalComponent *event_page_get_cancel_comp (EventPage *page);
Modified: trunk/calendar/gui/dialogs/memo-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/memo-editor.h (original)
+++ trunk/calendar/gui/dialogs/memo-editor.h Thu May 22 17:27:48 2008
@@ -50,7 +50,7 @@
CompEditorClass parent_class;
};
-GtkType memo_editor_get_type (void);
+GType memo_editor_get_type (void);
MemoEditor *memo_editor_construct (MemoEditor *te,
ECal *client);
MemoEditor *memo_editor_new (ECal *client, CompEditorFlags flags);
Modified: trunk/calendar/gui/dialogs/memo-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/memo-page.h (original)
+++ trunk/calendar/gui/dialogs/memo-page.h Thu May 22 17:27:48 2008
@@ -50,7 +50,7 @@
CompEditorPageClass parent_class;
} MemoPageClass;
-GtkType memo_page_get_type (void);
+GType memo_page_get_type (void);
MemoPage *memo_page_construct (MemoPage *epage);
MemoPage *memo_page_new (BonoboUIComponent *uic, CompEditorPageFlags flags);
void memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
Modified: trunk/calendar/gui/dialogs/recurrence-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/recurrence-page.c (original)
+++ trunk/calendar/gui/dialogs/recurrence-page.c Thu May 22 17:27:48 2008
@@ -966,8 +966,8 @@
item = gtk_menu_get_active (GTK_MENU (menu_shell));
item = gtk_menu_get_active (GTK_MENU (gtk_menu_item_get_submenu (GTK_MENU_ITEM (item))));
- month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
- gtk_object_set_user_data (GTK_OBJECT (data), GINT_TO_POINTER (month_index));
+ month_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "data"));
+ g_object_set_data (G_OBJECT (data), "data", GINT_TO_POINTER (month_index));
}
/* Creates the option menu for the monthly recurrence number */
@@ -981,7 +981,7 @@
for (i = start; i < end; i++) {
item = gtk_menu_item_new_with_label (_(e_cal_recur_nth[i]));
gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
- gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1));
+ g_object_set_data (G_OBJECT (item), "data", GINT_TO_POINTER (i + 1));
gtk_widget_show (item);
}
@@ -1071,7 +1071,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (submenu_item), submenu);
- gtk_object_set_user_data (GTK_OBJECT (submenu_item), GINT_TO_POINTER (month_index));
+ g_object_set_data (G_OBJECT (submenu_item), "data", GINT_TO_POINTER (month_index));
g_signal_connect((submenu), "selection_done",
G_CALLBACK (month_num_submenu_selection_done_cb),
submenu_item);
@@ -1140,7 +1140,7 @@
GtkWidget *label, *item;
item = gtk_menu_get_active (GTK_MENU (menu_shell));
- priv->month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));
+ priv->month_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "data"));
month_num = MONTH_NUM_DAY;
e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map);
Modified: trunk/calendar/gui/dialogs/recurrence-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/recurrence-page.h (original)
+++ trunk/calendar/gui/dialogs/recurrence-page.h Thu May 22 17:27:48 2008
@@ -51,7 +51,7 @@
} RecurrencePageClass;
-GtkType recurrence_page_get_type (void);
+GType recurrence_page_get_type (void);
RecurrencePage *recurrence_page_construct (RecurrencePage *rpage);
RecurrencePage *recurrence_page_new (void);
Modified: trunk/calendar/gui/dialogs/schedule-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/schedule-page.h (original)
+++ trunk/calendar/gui/dialogs/schedule-page.h Thu May 22 17:27:48 2008
@@ -49,7 +49,7 @@
} SchedulePageClass;
-GtkType schedule_page_get_type (void);
+GType schedule_page_get_type (void);
SchedulePage *schedule_page_construct (SchedulePage *mpage, EMeetingStore *ems);
SchedulePage *schedule_page_new (EMeetingStore *ems);
void schedule_page_set_name_selector (SchedulePage *spage, ENameSelector *name_selector);
Modified: trunk/calendar/gui/dialogs/task-details-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/task-details-page.h (original)
+++ trunk/calendar/gui/dialogs/task-details-page.h Thu May 22 17:27:48 2008
@@ -50,7 +50,7 @@
} TaskDetailsPageClass;
-GtkType task_details_page_get_type (void);
+GType task_details_page_get_type (void);
TaskDetailsPage *task_details_page_construct (TaskDetailsPage *tdpage);
TaskDetailsPage *task_details_page_new (void);
Modified: trunk/calendar/gui/dialogs/task-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/task-editor.h (original)
+++ trunk/calendar/gui/dialogs/task-editor.h Thu May 22 17:27:48 2008
@@ -51,7 +51,7 @@
CompEditorClass parent_class;
};
-GtkType task_editor_get_type (void);
+GType task_editor_get_type (void);
TaskEditor *task_editor_construct (TaskEditor *te,
ECal *client);
TaskEditor *task_editor_new (ECal *client, CompEditorFlags flags);
Modified: trunk/calendar/gui/dialogs/task-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/task-page.h (original)
+++ trunk/calendar/gui/dialogs/task-page.h Thu May 22 17:27:48 2008
@@ -55,7 +55,7 @@
CompEditorPageClass parent_class;
} TaskPageClass;
-GtkType task_page_get_type (void);
+GType task_page_get_type (void);
TaskPage *task_page_construct (TaskPage *epage, EMeetingStore *model, ECal *client);
TaskPage *task_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic);
ECalComponent * task_page_get_cancel_comp (TaskPage *page);
Modified: trunk/calendar/gui/e-alarm-list.c
==============================================================================
--- trunk/calendar/gui/e-alarm-list.c (original)
+++ trunk/calendar/gui/e-alarm-list.c Thu May 22 17:27:48 2008
@@ -75,7 +75,7 @@
static GObjectClass *parent_class = NULL;
-GtkType
+GType
e_alarm_list_get_type (void)
{
static GType alarm_list_type = 0;
Modified: trunk/calendar/gui/e-alarm-list.h
==============================================================================
--- trunk/calendar/gui/e-alarm-list.h (original)
+++ trunk/calendar/gui/e-alarm-list.h Thu May 22 17:27:48 2008
@@ -29,11 +29,11 @@
G_BEGIN_DECLS
#define E_TYPE_ALARM_LIST (e_alarm_list_get_type ())
-#define E_ALARM_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
-#define E_ALARM_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass))
-#define E_IS_ALARM_LIST(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_ALARM_LIST))
-#define E_IS_ALARM_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST))
-#define E_ALARM_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ALARM_LIST, EAlarmListClass))
+#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
+#define E_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass))
+#define E_IS_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ALARM_LIST))
+#define E_IS_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST))
+#define E_ALARM_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_ALARM_LIST, EAlarmListClass))
typedef struct _EAlarmList EAlarmList;
typedef struct _EAlarmListClass EAlarmListClass;
@@ -63,7 +63,7 @@
GObjectClass parent_class;
};
-GtkType e_alarm_list_get_type (void);
+GType e_alarm_list_get_type (void);
EAlarmList *e_alarm_list_new (void);
const ECalComponentAlarm *e_alarm_list_get_alarm (EAlarmList *alarm_list, GtkTreeIter *iter);
Modified: trunk/calendar/gui/e-cal-component-memo-preview.h
==============================================================================
--- trunk/calendar/gui/e-cal-component-memo-preview.h (original)
+++ trunk/calendar/gui/e-cal-component-memo-preview.h Thu May 22 17:27:48 2008
@@ -29,11 +29,11 @@
#include <libecal/e-cal.h>
#define E_TYPE_CAL_COMPONENT_MEMO_PREVIEW (e_cal_component_memo_preview_get_type ())
-#define E_CAL_COMPONENT_MEMO_PREVIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, ECalComponentMemoPreview))
-#define E_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, \
+#define E_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, ECalComponentMemoPreview))
+#define E_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, \
ECalComponentMemoPreviewClass))
-#define E_IS_CAL_COMPONENT_MEMO_PREVIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
-#define E_IS_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
+#define E_IS_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
+#define E_IS_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
typedef struct _ECalComponentMemoPreview ECalComponentMemoPreview;
typedef struct _ECalComponentMemoPreviewClass ECalComponentMemoPreviewClass;
@@ -54,7 +54,7 @@
};
-GtkType e_cal_component_memo_preview_get_type (void);
+GType e_cal_component_memo_preview_get_type (void);
GtkWidget *e_cal_component_memo_preview_new (void);
icaltimezone *e_cal_component_memo_preview_get_default_timezone (ECalComponentMemoPreview *preview);
Modified: trunk/calendar/gui/e-cal-component-preview.h
==============================================================================
--- trunk/calendar/gui/e-cal-component-preview.h (original)
+++ trunk/calendar/gui/e-cal-component-preview.h Thu May 22 17:27:48 2008
@@ -30,11 +30,11 @@
#include <gtkhtml/gtkhtml-stream.h>
#define E_TYPE_CAL_COMPONENT_PREVIEW (e_cal_component_preview_get_type ())
-#define E_CAL_COMPONENT_PREVIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview))
-#define E_CAL_COMPONENT_PREVIEW_CLASS(klass) (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_PREVIEW, \
+#define E_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview))
+#define E_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_PREVIEW, \
ECalComponentPreviewClass))
-#define E_IS_CAL_COMPONENT_PREVIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_CAL_COMPONENT_PREVIEW))
-#define E_IS_CAL_COMPONENT_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_PREVIEW))
+#define E_IS_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_PREVIEW))
+#define E_IS_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_PREVIEW))
typedef struct _ECalComponentPreview ECalComponentPreview;
typedef struct _ECalComponentPreviewClass ECalComponentPreviewClass;
@@ -55,7 +55,7 @@
};
-GtkType e_cal_component_preview_get_type (void);
+GType e_cal_component_preview_get_type (void);
GtkWidget *e_cal_component_preview_new (void);
icaltimezone *e_cal_component_preview_get_default_timezone (ECalComponentPreview *preview);
Modified: trunk/calendar/gui/e-cal-list-view-config.h
==============================================================================
--- trunk/calendar/gui/e-cal-list-view-config.h (original)
+++ trunk/calendar/gui/e-cal-list-view-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_CAL_LIST_VIEW_CONFIG(obj) GTK_CHECK_CAST (obj, e_cal_list_view_config_get_type (), ECalListViewConfig)
-#define E_CAL_LIST_VIEW_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_cal_list_view_config_get_type (), ECalListViewConfigClass)
-#define E_IS_CAL_LIST_VIEW_CONFIG(obj) GTK_CHECK_TYPE (obj, e_cal_list_view_config_get_type ())
+#define E_CAL_LIST_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_cal_list_view_config_get_type (), ECalListViewConfig)
+#define E_CAL_LIST_VIEW_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_cal_list_view_config_get_type (), ECalListViewConfigClass)
+#define E_IS_CAL_LIST_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cal_list_view_config_get_type ())
typedef struct _ECalListViewConfig ECalListViewConfig;
typedef struct _ECalListViewConfigClass ECalListViewConfigClass;
Modified: trunk/calendar/gui/e-cal-list-view.h
==============================================================================
--- trunk/calendar/gui/e-cal-list-view.h (original)
+++ trunk/calendar/gui/e-cal-list-view.h Thu May 22 17:27:48 2008
@@ -36,9 +36,9 @@
* ECalListView - displays calendar events in an ETable.
*/
-#define E_CAL_LIST_VIEW(obj) GTK_CHECK_CAST (obj, e_cal_list_view_get_type (), ECalListView)
-#define E_CAL_LIST_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass)
-#define E_IS_CAL_LIST_VIEW(obj) GTK_CHECK_TYPE (obj, e_cal_list_view_get_type ())
+#define E_CAL_LIST_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_cal_list_view_get_type (), ECalListView)
+#define E_CAL_LIST_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass)
+#define E_IS_CAL_LIST_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cal_list_view_get_type ())
typedef struct _ECalListView ECalListView;
@@ -73,7 +73,7 @@
};
-GtkType e_cal_list_view_get_type (void);
+GType e_cal_list_view_get_type (void);
GtkWidget *e_cal_list_view_construct (ECalListView *cal_list_view);
GtkWidget *e_cal_list_view_new (void);
Modified: trunk/calendar/gui/e-calendar-table-config.h
==============================================================================
--- trunk/calendar/gui/e-calendar-table-config.h (original)
+++ trunk/calendar/gui/e-calendar-table-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_CALENDAR_TABLE_CONFIG(obj) GTK_CHECK_CAST (obj, e_calendar_table_config_get_type (), ECalendarTableConfig)
-#define E_CALENDAR_TABLE_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_calendar_table_config_get_type (), ECalendarTableConfigClass)
-#define E_IS_CALENDAR_TABLE_CONFIG(obj) GTK_CHECK_TYPE (obj, e_calendar_table_config_get_type ())
+#define E_CALENDAR_TABLE_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_calendar_table_config_get_type (), ECalendarTableConfig)
+#define E_CALENDAR_TABLE_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_table_config_get_type (), ECalendarTableConfigClass)
+#define E_IS_CALENDAR_TABLE_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_table_config_get_type ())
typedef struct _ECalendarTableConfig ECalendarTableConfig;
typedef struct _ECalendarTableConfigClass ECalendarTableConfigClass;
Modified: trunk/calendar/gui/e-calendar-table.h
==============================================================================
--- trunk/calendar/gui/e-calendar-table.h (original)
+++ trunk/calendar/gui/e-calendar-table.h Thu May 22 17:27:48 2008
@@ -38,9 +38,9 @@
*/
-#define E_CALENDAR_TABLE(obj) GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
-#define E_CALENDAR_TABLE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
-#define E_IS_CALENDAR_TABLE(obj) GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())
+#define E_CALENDAR_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
+#define E_CALENDAR_TABLE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
+#define E_IS_CALENDAR_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_table_get_type ())
typedef struct _ECalendarTable ECalendarTable;
@@ -78,7 +78,7 @@
};
-GtkType e_calendar_table_get_type (void);
+GType e_calendar_table_get_type (void);
GtkWidget* e_calendar_table_new (void);
ECalModel *e_calendar_table_get_model (ECalendarTable *cal_table);
Modified: trunk/calendar/gui/e-calendar-view.h
==============================================================================
--- trunk/calendar/gui/e-calendar-view.h (original)
+++ trunk/calendar/gui/e-calendar-view.h Thu May 22 17:27:48 2008
@@ -36,9 +36,9 @@
*/
#define E_TYPE_CALENDAR_VIEW (e_calendar_view_get_type ())
-#define E_CALENDAR_VIEW(obj) GTK_CHECK_CAST (obj, e_calendar_view_get_type (), ECalendarView)
-#define E_CALENDAR_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_calendar_view_get_type (), ECalendarViewClass)
-#define E_IS_CALENDAR_VIEW(obj) GTK_CHECK_TYPE (obj, e_calendar_view_get_type ())
+#define E_CALENDAR_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_calendar_view_get_type (), ECalendarView)
+#define E_CALENDAR_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_view_get_type (), ECalendarViewClass)
+#define E_IS_CALENDAR_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_view_get_type ())
typedef enum {
E_CALENDAR_VIEW_POS_OUTSIDE,
Modified: trunk/calendar/gui/e-cell-date-edit-config.h
==============================================================================
--- trunk/calendar/gui/e-cell-date-edit-config.h (original)
+++ trunk/calendar/gui/e-cell-date-edit-config.h Thu May 22 17:27:48 2008
@@ -28,9 +28,9 @@
G_BEGIN_DECLS
-#define E_CELL_DATE_EDIT_CONFIG(obj) GTK_CHECK_CAST (obj, e_cell_date_edit_config_get_type (), ECellDateEditConfig)
-#define E_CELL_DATE_EDIT_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_cell_date_edit_config_get_type (), ECellDateEditConfigClass)
-#define E_IS_CELL_DATE_EDIT_CONFIG(obj) GTK_CHECK_TYPE (obj, e_cell_date_edit_config_get_type ())
+#define E_CELL_DATE_EDIT_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_cell_date_edit_config_get_type (), ECellDateEditConfig)
+#define E_CELL_DATE_EDIT_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_cell_date_edit_config_get_type (), ECellDateEditConfigClass)
+#define E_IS_CELL_DATE_EDIT_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cell_date_edit_config_get_type ())
typedef struct _ECellDateEditConfig ECellDateEditConfig;
typedef struct _ECellDateEditConfigClass ECellDateEditConfigClass;
Modified: trunk/calendar/gui/e-cell-date-edit-text.h
==============================================================================
--- trunk/calendar/gui/e-cell-date-edit-text.h (original)
+++ trunk/calendar/gui/e-cell-date-edit-text.h Thu May 22 17:27:48 2008
@@ -35,10 +35,10 @@
G_BEGIN_DECLS
#define E_CELL_DATE_EDIT_TEXT_TYPE (e_cell_date_edit_text_get_type ())
-#define E_CELL_DATE_EDIT_TEXT(o) (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditText))
-#define E_CELL_DATE_EDIT_TEXT_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditTextClass))
-#define E_IS_CELL_DATE_EDIT_TEXT(o) (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TEXT_TYPE))
-#define E_IS_CELL_DATE_EDIT_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TEXT_TYPE))
+#define E_CELL_DATE_EDIT_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditText))
+#define E_CELL_DATE_EDIT_TEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditTextClass))
+#define E_IS_CELL_DATE_EDIT_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_DATE_EDIT_TEXT_TYPE))
+#define E_IS_CELL_DATE_EDIT_TEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TEXT_TYPE))
typedef struct _ECellDateEditValue ECellDateEditValue;
struct _ECellDateEditValue {
@@ -60,7 +60,7 @@
ECellTextClass parent_class;
} ECellDateEditTextClass;
-GtkType e_cell_date_edit_text_get_type (void);
+GType e_cell_date_edit_text_get_type (void);
ECell *e_cell_date_edit_text_new (const char *fontname,
GtkJustification justify);
Modified: trunk/calendar/gui/e-date-edit-config.h
==============================================================================
--- trunk/calendar/gui/e-date-edit-config.h (original)
+++ trunk/calendar/gui/e-date-edit-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_DATE_EDIT_CONFIG(obj) GTK_CHECK_CAST (obj, e_date_edit_config_get_type (), EDateEditConfig)
-#define E_DATE_EDIT_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_date_edit_config_get_type (), EDateEditConfigClass)
-#define E_IS_DATE_EDIT_CONFIG(obj) GTK_CHECK_TYPE (obj, e_date_edit_config_get_type ())
+#define E_DATE_EDIT_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_date_edit_config_get_type (), EDateEditConfig)
+#define E_DATE_EDIT_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_date_edit_config_get_type (), EDateEditConfigClass)
+#define E_IS_DATE_EDIT_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_date_edit_config_get_type ())
typedef struct _EDateEditConfig EDateEditConfig;
typedef struct _EDateEditConfigClass EDateEditConfigClass;
Modified: trunk/calendar/gui/e-date-time-list.c
==============================================================================
--- trunk/calendar/gui/e-date-time-list.c (original)
+++ trunk/calendar/gui/e-date-time-list.c Thu May 22 17:27:48 2008
@@ -73,7 +73,7 @@
static GObjectClass *parent_class = NULL;
-GtkType
+GType
e_date_time_list_get_type (void)
{
static GType date_time_list_type = 0;
Modified: trunk/calendar/gui/e-date-time-list.h
==============================================================================
--- trunk/calendar/gui/e-date-time-list.h (original)
+++ trunk/calendar/gui/e-date-time-list.h Thu May 22 17:27:48 2008
@@ -29,11 +29,11 @@
G_BEGIN_DECLS
#define E_TYPE_DATE_TIME_LIST (e_date_time_list_get_type ())
-#define E_DATE_TIME_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
-#define E_DATE_TIME_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
-#define E_IS_DATE_TIME_LIST(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_DATE_TIME_LIST))
-#define E_IS_DATE_TIME_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST))
-#define E_DATE_TIME_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
+#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
+#define E_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
+#define E_IS_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DATE_TIME_LIST))
+#define E_IS_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST))
+#define E_DATE_TIME_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
typedef struct _EDateTimeList EDateTimeList;
typedef struct _EDateTimeListClass EDateTimeListClass;
@@ -63,7 +63,7 @@
GObjectClass parent_class;
};
-GtkType e_date_time_list_get_type (void);
+GType e_date_time_list_get_type (void);
EDateTimeList *e_date_time_list_new (void);
const ECalComponentDateTime *e_date_time_list_get_date_time (EDateTimeList *date_time_list,
Modified: trunk/calendar/gui/e-day-view-config.h
==============================================================================
--- trunk/calendar/gui/e-day-view-config.h (original)
+++ trunk/calendar/gui/e-day-view-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_DAY_VIEW_CONFIG(obj) GTK_CHECK_CAST (obj, e_day_view_config_get_type (), EDayViewConfig)
-#define E_DAY_VIEW_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_day_view_config_get_type (), EDayViewConfigClass)
-#define E_IS_DAY_VIEW_CONFIG(obj) GTK_CHECK_TYPE (obj, e_day_view_config_get_type ())
+#define E_DAY_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_day_view_config_get_type (), EDayViewConfig)
+#define E_DAY_VIEW_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_day_view_config_get_type (), EDayViewConfigClass)
+#define E_IS_DAY_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_day_view_config_get_type ())
typedef struct _EDayViewConfig EDayViewConfig;
typedef struct _EDayViewConfigClass EDayViewConfigClass;
Modified: trunk/calendar/gui/e-day-view-main-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-main-item.c (original)
+++ trunk/calendar/gui/e-day-view-main-item.c Thu May 22 17:27:48 2008
@@ -40,8 +40,10 @@
#include <libecal/e-cal-time-util.h>
#include <e-calendar-view.h>
-static void e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg ,
- guint arg_id);
+static void e_day_view_main_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_day_view_main_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path, int flags);
@@ -80,8 +82,8 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_DAY_VIEW
+ PROP_0,
+ PROP_DAY_VIEW
};
G_DEFINE_TYPE (EDayViewMainItem, e_day_view_main_item, GNOME_TYPE_CANVAS_ITEM)
@@ -89,23 +91,26 @@
static void
e_day_view_main_item_class_init (EDayViewMainItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_day_view_main_item_set_property;
- gtk_object_add_arg_type ("EDayViewMainItem::day_view",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_DAY_VIEW);
-
- object_class->set_arg = e_day_view_main_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_day_view_main_item_update;
- item_class->draw = e_day_view_main_item_draw;
- item_class->point = e_day_view_main_item_point;
- item_class->event = e_day_view_main_item_event;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_day_view_main_item_update;
+ item_class->draw = e_day_view_main_item_draw;
+ item_class->point = e_day_view_main_item_point;
+ item_class->event = e_day_view_main_item_event;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_DAY_VIEW,
+ g_param_spec_pointer (
+ "day_view",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
/* init the accessibility support for e_day_view */
e_day_view_main_item_a11y_init ();
@@ -120,17 +125,22 @@
static void
-e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_day_view_main_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EDayViewMainItem *dvmitem;
- dvmitem = E_DAY_VIEW_MAIN_ITEM (o);
+ dvmitem = E_DAY_VIEW_MAIN_ITEM (object);
- switch (arg_id){
- case ARG_DAY_VIEW:
- dvmitem->day_view = GTK_VALUE_POINTER (*arg);
- break;
+ switch (property_id) {
+ case PROP_DAY_VIEW:
+ dvmitem->day_view = g_value_get_pointer (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-day-view-main-item.h
==============================================================================
--- trunk/calendar/gui/e-day-view-main-item.h (original)
+++ trunk/calendar/gui/e-day-view-main-item.h Thu May 22 17:27:48 2008
@@ -35,11 +35,11 @@
* data in the main Day/Work Week display.
*/
-#define E_DAY_VIEW_MAIN_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_DAY_VIEW_MAIN_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_day_view_main_item_get_type (), EDayViewMainItem))
-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_day_view_main_item_get_type ()))
-#define E_IS_DAY_VIEW_MAIN_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_DAY_VIEW_MAIN_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_day_view_main_item_get_type ()))
typedef struct {
@@ -55,7 +55,7 @@
} EDayViewMainItemClass;
-GtkType e_day_view_main_item_get_type (void);
+GType e_day_view_main_item_get_type (void);
#ifdef __cplusplus
Modified: trunk/calendar/gui/e-day-view-time-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-time-item.c (original)
+++ trunk/calendar/gui/e-day-view-time-item.c Thu May 22 17:27:48 2008
@@ -63,9 +63,10 @@
#define E_DVTMI_LARGE_HOUR_Y_PAD 1
#define E_DVTMI_SMALL_FONT_Y_PAD 1
-static void e_day_view_time_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_day_view_time_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_day_view_time_item_update (GnomeCanvasItem *item,
double *affine,
@@ -99,8 +100,8 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_DAY_VIEW
+ PROP_0,
+ PROP_DAY_VIEW
};
G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM)
@@ -108,23 +109,26 @@
static void
e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_day_view_time_item_set_property;
- gtk_object_add_arg_type ("EDayViewTimeItem::day_view",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_DAY_VIEW);
-
- object_class->set_arg = e_day_view_time_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_day_view_time_item_update;
- item_class->draw = e_day_view_time_item_draw;
- item_class->point = e_day_view_time_item_point;
- item_class->event = e_day_view_time_item_event;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_day_view_time_item_update;
+ item_class->draw = e_day_view_time_item_draw;
+ item_class->point = e_day_view_time_item_point;
+ item_class->event = e_day_view_time_item_event;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_DAY_VIEW,
+ g_param_spec_pointer (
+ "day_view",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
}
@@ -136,17 +140,22 @@
static void
-e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_day_view_time_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EDayViewTimeItem *dvtmitem;
- dvtmitem = E_DAY_VIEW_TIME_ITEM (o);
+ dvtmitem = E_DAY_VIEW_TIME_ITEM (object);
- switch (arg_id){
- case ARG_DAY_VIEW:
- dvtmitem->day_view = GTK_VALUE_POINTER (*arg);
- break;
+ switch (property_id) {
+ case PROP_DAY_VIEW:
+ dvtmitem->day_view = g_value_get_pointer (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-day-view-time-item.h
==============================================================================
--- trunk/calendar/gui/e-day-view-time-item.h (original)
+++ trunk/calendar/gui/e-day-view-time-item.h Thu May 22 17:27:48 2008
@@ -35,11 +35,11 @@
* the EDayView.
*/
-#define E_DAY_VIEW_TIME_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_DAY_VIEW_TIME_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_day_view_time_item_get_type (), EDayViewTimeItem))
-#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_day_view_time_item_get_type ()))
-#define E_IS_DAY_VIEW_TIME_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_DAY_VIEW_TIME_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_day_view_time_item_get_type ()))
typedef struct {
@@ -61,7 +61,7 @@
} EDayViewTimeItemClass;
-GtkType e_day_view_time_item_get_type (void);
+GType e_day_view_time_item_get_type (void);
gint e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
Modified: trunk/calendar/gui/e-day-view-top-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-top-item.c (original)
+++ trunk/calendar/gui/e-day-view-top-item.c Thu May 22 17:27:48 2008
@@ -37,9 +37,10 @@
#include "e-calendar-view.h"
#include "e-day-view-top-item.h"
-static void e_day_view_top_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_day_view_top_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_day_view_top_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
@@ -76,9 +77,9 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_DAY_VIEW,
- ARG_SHOW_DATES
+ PROP_0,
+ PROP_DAY_VIEW,
+ PROP_SHOW_DATES
};
G_DEFINE_TYPE (EDayViewTopItem, e_day_view_top_item, GNOME_TYPE_CANVAS_ITEM)
@@ -86,27 +87,36 @@
static void
e_day_view_top_item_class_init (EDayViewTopItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_day_view_top_item_set_property;
- gtk_object_add_arg_type ("EDayViewTopItem::day_view",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_DAY_VIEW);
-
- gtk_object_add_arg_type ("EDayViewTopItem::show_dates",
- GTK_TYPE_BOOL, GTK_ARG_WRITABLE,
- ARG_SHOW_DATES);
-
- object_class->set_arg = e_day_view_top_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_day_view_top_item_update;
- item_class->draw = e_day_view_top_item_draw;
- item_class->point = e_day_view_top_item_point;
- item_class->event = e_day_view_top_item_event;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_day_view_top_item_update;
+ item_class->draw = e_day_view_top_item_draw;
+ item_class->point = e_day_view_top_item_point;
+ item_class->event = e_day_view_top_item_event;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_DAY_VIEW,
+ g_param_spec_pointer (
+ "day_view",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SHOW_DATES,
+ g_param_spec_boolean (
+ "show_dates",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_WRITABLE));
}
@@ -119,20 +129,25 @@
static void
-e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_day_view_top_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EDayViewTopItem *dvtitem;
- dvtitem = E_DAY_VIEW_TOP_ITEM (o);
+ dvtitem = E_DAY_VIEW_TOP_ITEM (object);
- switch (arg_id){
- case ARG_DAY_VIEW:
- dvtitem->day_view = GTK_VALUE_POINTER (*arg);
- break;
- case ARG_SHOW_DATES:
- dvtitem->show_dates = GTK_VALUE_BOOL (*arg);
- break;
+ switch (property_id) {
+ case PROP_DAY_VIEW:
+ dvtitem->day_view = g_value_get_pointer (value);
+ return;
+ case PROP_SHOW_DATES:
+ dvtitem->show_dates = g_value_get_boolean (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-day-view-top-item.h
==============================================================================
--- trunk/calendar/gui/e-day-view-top-item.h (original)
+++ trunk/calendar/gui/e-day-view-top-item.h Thu May 22 17:27:48 2008
@@ -34,11 +34,11 @@
* EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
*/
-#define E_DAY_VIEW_TOP_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_DAY_VIEW_TOP_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_day_view_top_item_get_type (), EDayViewTopItem))
-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_day_view_top_item_get_type ()))
-#define E_IS_DAY_VIEW_TOP_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_DAY_VIEW_TOP_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_day_view_top_item_get_type ()))
typedef struct {
@@ -57,7 +57,7 @@
} EDayViewTopItemClass;
-GtkType e_day_view_top_item_get_type (void);
+GType e_day_view_top_item_get_type (void);
void e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
gchar *buffer, gint buffer_len);
Modified: trunk/calendar/gui/e-day-view.c
==============================================================================
--- trunk/calendar/gui/e-day-view.c (original)
+++ trunk/calendar/gui/e-day-view.c Thu May 22 17:27:48 2008
@@ -3010,8 +3010,7 @@
} else if (event->type == GDK_2BUTTON_PRESS) {
e_day_view_on_event_double_click (day_view, -1,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->top_canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name (day_view->top_canvas, "button_press_event");
return TRUE;
}
} else if (event->button == 3) {
@@ -3050,8 +3049,7 @@
e_day_view_on_event_double_click (day_view, day,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view->main_canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name (day_view->main_canvas, "button_press_event");
return TRUE;
}
} else if (event->button == 3) {
@@ -5776,12 +5774,11 @@
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name (item, "event");
return TRUE;
} else if (event->key.keyval == GDK_Escape) {
cancel_editing (day_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ g_signal_stop_emission_by_name (item, "event");
/* focus should go to day view when stop editing */
gtk_widget_grab_focus (GTK_WIDGET (day_view));
return TRUE;
@@ -5816,8 +5813,7 @@
tooltip_destroy (day_view, item);
/* Only let the EText handle the event while editing. */
if (!E_TEXT (item)->editing)
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name (item, "event");
break;
case GDK_FOCUS_CHANGE:
if (event->focus_change.in)
Modified: trunk/calendar/gui/e-day-view.h
==============================================================================
--- trunk/calendar/gui/e-day-view.h (original)
+++ trunk/calendar/gui/e-day-view.h Thu May 22 17:27:48 2008
@@ -182,9 +182,9 @@
};
-#define E_DAY_VIEW(obj) GTK_CHECK_CAST (obj, e_day_view_get_type (), EDayView)
-#define E_DAY_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
-#define E_IS_DAY_VIEW(obj) GTK_CHECK_TYPE (obj, e_day_view_get_type ())
+#define E_DAY_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_day_view_get_type (), EDayView)
+#define E_DAY_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
+#define E_IS_DAY_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_day_view_get_type ())
typedef struct _EDayView EDayView;
@@ -474,7 +474,7 @@
};
-GtkType e_day_view_get_type (void);
+GType e_day_view_get_type (void);
GtkWidget* e_day_view_new (void);
/* Whether we are displaying a work-week, in which case the display always
Modified: trunk/calendar/gui/e-itip-control.h
==============================================================================
--- trunk/calendar/gui/e-itip-control.h (original)
+++ trunk/calendar/gui/e-itip-control.h Thu May 22 17:27:48 2008
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
#define E_TYPE_ITIP_CONTROL (e_itip_control_get_type ())
-#define E_ITIP_CONTROL(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ITIP_CONTROL, EItipControl))
-#define E_ITIP_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITIP_CONTROL, EItipControlClass))
-#define E_IS_ITIP_CONTROL(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_ITIP_CONTROL))
-#define E_IS_ITIP_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_ITIP_CONTROL))
+#define E_ITIP_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ITIP_CONTROL, EItipControl))
+#define E_ITIP_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ITIP_CONTROL, EItipControlClass))
+#define E_IS_ITIP_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ITIP_CONTROL))
+#define E_IS_ITIP_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ITIP_CONTROL))
typedef struct _EItipControl EItipControl;
@@ -50,7 +50,7 @@
-GtkType e_itip_control_get_type (void);
+GType e_itip_control_get_type (void);
GtkWidget * e_itip_control_new (void);
void e_itip_control_set_data (EItipControl *itip,
const gchar *text);
Modified: trunk/calendar/gui/e-meeting-time-sel-item.c
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel-item.c (original)
+++ trunk/calendar/gui/e-meeting-time-sel-item.c Thu May 22 17:27:48 2008
@@ -45,10 +45,12 @@
lines across the top of cells. */
#define E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM 0
-static void e_meeting_time_selector_item_destroy (GtkObject *object);
+static void e_meeting_time_selector_item_dispose (GObject *object);
-static void e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg,
- guint arg_id);
+static void e_meeting_time_selector_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
@@ -96,35 +98,38 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_MEETING_TIME_SELECTOR
+ PROP_0,
+ PROP_MEETING_TIME_SELECTOR
};
G_DEFINE_TYPE (EMeetingTimeSelectorItem, e_meeting_time_selector_item, GNOME_TYPE_CANVAS_ITEM)
static void
-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
+e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) mts_item_class;
- item_class = (GnomeCanvasItemClass *) mts_item_class;
-
- gtk_object_add_arg_type ("EMeetingTimeSelectorItem::meeting_time_selector",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_MEETING_TIME_SELECTOR);
-
- object_class->destroy = e_meeting_time_selector_item_destroy;
- object_class->set_arg = e_meeting_time_selector_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->realize = e_meeting_time_selector_item_realize;
- item_class->unrealize = e_meeting_time_selector_item_unrealize;
- item_class->update = e_meeting_time_selector_item_update;
- item_class->draw = e_meeting_time_selector_item_draw;
- item_class->point = e_meeting_time_selector_item_point;
- item_class->event = e_meeting_time_selector_item_event;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->dispose = e_meeting_time_selector_item_dispose;
+ object_class->set_property = e_meeting_time_selector_item_set_property;
+
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->realize = e_meeting_time_selector_item_realize;
+ item_class->unrealize = e_meeting_time_selector_item_unrealize;
+ item_class->update = e_meeting_time_selector_item_update;
+ item_class->draw = e_meeting_time_selector_item_draw;
+ item_class->point = e_meeting_time_selector_item_point;
+ item_class->event = e_meeting_time_selector_item_event;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MEETING_TIME_SELECTOR,
+ g_param_spec_pointer (
+ "meeting_time_selector",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
}
@@ -152,7 +157,7 @@
static void
-e_meeting_time_selector_item_destroy (GtkObject *object)
+e_meeting_time_selector_item_dispose (GObject *object)
{
EMeetingTimeSelectorItem *mts_item;
@@ -171,23 +176,27 @@
mts_item->busy_cursor = NULL;
}
- if (GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)
- (*GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)(object);
+ G_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->dispose (object);
}
static void
-e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_meeting_time_selector_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EMeetingTimeSelectorItem *mts_item;
- mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);
+ mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
- switch (arg_id){
- case ARG_MEETING_TIME_SELECTOR:
- mts_item->mts = GTK_VALUE_POINTER (*arg);
- break;
+ switch (property_id) {
+ case PROP_MEETING_TIME_SELECTOR:
+ mts_item->mts = g_value_get_pointer (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-meeting-time-sel-item.h
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel-item.h (original)
+++ trunk/calendar/gui/e-meeting-time-sel-item.h Thu May 22 17:27:48 2008
@@ -38,9 +38,9 @@
#endif /* __cplusplus */
-#define E_MEETING_TIME_SELECTOR_ITEM(obj) (GTK_CHECK_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
-#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_ITEM(o) (GTK_CHECK_TYPE((o), e_meeting_time_selector_item_get_type ()))
+#define E_MEETING_TIME_SELECTOR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
+#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
+#define IS_E_MEETING_TIME_SELECTOR_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), e_meeting_time_selector_item_get_type ()))
typedef struct _EMeetingTimeSelectorItem EMeetingTimeSelectorItem;
@@ -73,7 +73,7 @@
GnomeCanvasItemClass parent_class;
};
-GtkType e_meeting_time_selector_item_get_type (void);
+GType e_meeting_time_selector_item_get_type (void);
void e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item);
Modified: trunk/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.c (original)
+++ trunk/calendar/gui/e-meeting-time-sel.c Thu May 22 17:27:48 2008
@@ -224,12 +224,13 @@
widget_class = (GtkWidgetClass *) klass;
mts_signals [CHANGED] =
- gtk_signal_new ("changed", GTK_RUN_FIRST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (EMeetingTimeSelectorClass,
- changed),
- gtk_signal_default_marshaller,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EMeetingTimeSelectorClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = e_meeting_time_selector_destroy;
@@ -688,7 +689,7 @@
e_meeting_time_selector_update_end_date_edit (mts);
e_meeting_time_selector_update_date_popup_menus (mts);
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
}
@@ -707,7 +708,7 @@
darea = gtk_drawing_area_new ();
gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0);
- gtk_object_set_user_data (GTK_OBJECT (darea), mts);
+ g_object_set_data (G_OBJECT (darea), "data", mts);
gtk_widget_set_size_request (darea, 14, 14);
gtk_widget_show (darea);
@@ -730,7 +731,7 @@
GdkGC *gc;
gint width, height;
- mts = gtk_object_get_user_data (GTK_OBJECT (darea));
+ mts = g_object_get_data (G_OBJECT (darea), "data");
gc = mts->color_key_gc;
width = darea->allocation.width;
height = darea->allocation.height;
@@ -1112,7 +1113,7 @@
e_meeting_time_selector_update_start_date_edit (mts);
e_meeting_time_selector_update_end_date_edit (mts);
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
return TRUE;
}
@@ -1240,7 +1241,7 @@
if (mts->display_main != NULL)
gtk_widget_queue_draw (mts->display_main);
- gtk_object_unref (GTK_OBJECT (mts));
+ g_object_unref (GTK_OBJECT (mts));
return FALSE;
}
@@ -1273,9 +1274,9 @@
int i;
for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++)
- gtk_object_ref (GTK_OBJECT (mts));
+ g_object_ref (GTK_OBJECT (mts));
} else {
- gtk_object_ref (GTK_OBJECT (mts));
+ g_object_ref (GTK_OBJECT (mts));
}
if (all)
@@ -1671,7 +1672,7 @@
e_meeting_time_selector_update_start_date_edit (mts);
e_meeting_time_selector_update_end_date_edit (mts);
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
return;
}
@@ -2237,7 +2238,7 @@
gtk_widget_queue_draw (mts->display_top);
gtk_widget_queue_draw (mts->display_main);
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
}
@@ -2287,7 +2288,7 @@
gtk_widget_queue_draw (mts->display_top);
gtk_widget_queue_draw (mts->display_main);
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
}
@@ -2494,7 +2495,7 @@
if (set_both_times
|| mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
|| mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
}
@@ -2634,7 +2635,7 @@
if (set_both_times
|| mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END
|| mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
- gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);
+ g_signal_emit (mts, mts_signals [CHANGED], 0);
scroll:
/* Redraw the canvases. We freeze and thaw the layouts so that they
Modified: trunk/calendar/gui/e-meeting-time-sel.h
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.h (original)
+++ trunk/calendar/gui/e-meeting-time-sel.h Thu May 22 17:27:48 2008
@@ -91,9 +91,9 @@
extern const gchar *EMeetingTimeSelectorHours12[24];
-#define E_MEETING_TIME_SELECTOR(obj) GTK_CHECK_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
-#define E_MEETING_TIME_SELECTOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
-#define IS_E_MEETING_TIME_SELECTOR(obj) GTK_CHECK_TYPE (obj, e_meeting_time_selector_get_type ())
+#define E_MEETING_TIME_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
+#define E_MEETING_TIME_SELECTOR_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
+#define IS_E_MEETING_TIME_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_meeting_time_selector_get_type ())
typedef struct _EMeetingTimeSelector EMeetingTimeSelector;
@@ -280,7 +280,7 @@
* know where the data is coming from. This is mainly just for testing for now.
*/
-GtkType e_meeting_time_selector_get_type (void);
+GType e_meeting_time_selector_get_type (void);
GtkWidget* e_meeting_time_selector_new (EMeetingStore *ems);
void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems);
Modified: trunk/calendar/gui/e-memo-table-config.h
==============================================================================
--- trunk/calendar/gui/e-memo-table-config.h (original)
+++ trunk/calendar/gui/e-memo-table-config.h Thu May 22 17:27:48 2008
@@ -28,9 +28,9 @@
G_BEGIN_DECLS
-#define E_MEMO_TABLE_CONFIG(obj) GTK_CHECK_CAST (obj, e_memo_table_config_get_type (), EMemoTableConfig)
-#define E_MEMO_TABLE_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_memo_table_config_get_type (), EMemoTableConfigClass)
-#define E_IS_MEMO_TABLE_CONFIG(obj) GTK_CHECK_TYPE (obj, e_memo_table_config_get_type ())
+#define E_MEMO_TABLE_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_memo_table_config_get_type (), EMemoTableConfig)
+#define E_MEMO_TABLE_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_memo_table_config_get_type (), EMemoTableConfigClass)
+#define E_IS_MEMO_TABLE_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_memo_table_config_get_type ())
typedef struct _EMemoTableConfig EMemoTableConfig;
typedef struct _EMemoTableConfigClass EMemoTableConfigClass;
Modified: trunk/calendar/gui/e-memo-table.h
==============================================================================
--- trunk/calendar/gui/e-memo-table.h (original)
+++ trunk/calendar/gui/e-memo-table.h Thu May 22 17:27:48 2008
@@ -39,9 +39,9 @@
*/
-#define E_MEMO_TABLE(obj) GTK_CHECK_CAST (obj, e_memo_table_get_type (), EMemoTable)
-#define E_MEMO_TABLE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_memo_table_get_type (), EMemoTableClass)
-#define E_IS_MEMO_TABLE(obj) GTK_CHECK_TYPE (obj, e_memo_table_get_type ())
+#define E_MEMO_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_memo_table_get_type (), EMemoTable)
+#define E_MEMO_TABLE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_memo_table_get_type (), EMemoTableClass)
+#define E_IS_MEMO_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_memo_table_get_type ())
typedef struct _EMemoTable EMemoTable;
@@ -79,7 +79,7 @@
};
-GtkType e_memo_table_get_type (void);
+GType e_memo_table_get_type (void);
GtkWidget* e_memo_table_new (void);
ECalModel *e_memo_table_get_model (EMemoTable *memo_table);
Modified: trunk/calendar/gui/e-memos.c
==============================================================================
--- trunk/calendar/gui/e-memos.c (original)
+++ trunk/calendar/gui/e-memos.c Thu May 22 17:27:48 2008
@@ -170,8 +170,7 @@
memos = E_MEMOS (data);
n_selected = e_table_selected_count (etable);
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SELECTION_CHANGED],
- n_selected);
+ g_signal_emit (memos, e_memos_signals[SELECTION_CHANGED], 0, n_selected);
if (n_selected != 1)
e_cal_component_memo_preview_clear (E_CAL_COMPONENT_MEMO_PREVIEW (memos->priv->preview));
@@ -558,13 +557,14 @@
object_class = (GtkObjectClass *) klass;
e_memos_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (EMemosClass, selection_changed),
- g_cclosure_marshal_VOID__INT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_INT);
+ g_signal_new ("selection_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EMemosClass, selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE, 1,
+ G_TYPE_INT);
e_memos_signals[SOURCE_ADDED] =
g_signal_new ("source_added",
@@ -781,7 +781,7 @@
priv->clients_list = g_list_remove (priv->clients_list, client);
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SOURCE_REMOVED], source);
+ g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
e_memo_table_set_status_message (E_MEMO_TABLE (e_memos_get_calendar_table (memos)), NULL);
@@ -830,7 +830,7 @@
/* Do this last because it unrefs the client */
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SOURCE_REMOVED], source);
+ g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
set_status_message (memos, NULL);
g_object_unref (source);
@@ -872,7 +872,7 @@
/* Do this last because it unrefs the client */
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SOURCE_REMOVED], source);
+ g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
set_status_message (memos, NULL);
g_object_unref (priv->default_client);
@@ -956,7 +956,7 @@
g_hash_table_insert (priv->clients, g_strdup (uid) , client);
priv->clients_list = g_list_prepend (priv->clients_list, client);
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SOURCE_ADDED], source);
+ g_signal_emit (memos, e_memos_signals[SOURCE_ADDED], 0, source);
open_ecal (memos, client, FALSE, client_cal_opened_cb);
@@ -993,7 +993,7 @@
g_hash_table_remove (priv->clients, uid);
- gtk_signal_emit (GTK_OBJECT (memos), e_memos_signals[SOURCE_REMOVED], source);
+ g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
return TRUE;
}
Modified: trunk/calendar/gui/e-memos.h
==============================================================================
--- trunk/calendar/gui/e-memos.h (original)
+++ trunk/calendar/gui/e-memos.h Thu May 22 17:27:48 2008
@@ -33,11 +33,11 @@
#include "e-memo-table.h"
#define E_TYPE_MEMOS (e_memos_get_type ())
-#define E_MEMOS(obj) (GTK_CHECK_CAST ((obj), E_TYPE_MEMOS, EMemos))
-#define E_MEMOS_CLASS(klass) (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_MEMOS, \
+#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) (GTK_CHECK_TYPE ((obj), E_TYPE_MEMOS))
-#define E_IS_MEMOS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_MEMOS))
+#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;
@@ -60,7 +60,7 @@
};
-GtkType e_memos_get_type (void);
+GType e_memos_get_type (void);
GtkWidget *e_memos_construct (EMemos *memos);
GtkWidget *e_memos_new (void);
Modified: trunk/calendar/gui/e-mini-calendar-config.h
==============================================================================
--- trunk/calendar/gui/e-mini-calendar-config.h (original)
+++ trunk/calendar/gui/e-mini-calendar-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_MINI_CALENDAR_CONFIG(obj) GTK_CHECK_CAST (obj, e_mini_calendar_config_get_type (), EMiniCalendarConfig)
-#define E_MINI_CALENDAR_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_mini_calendar_config_get_type (), EMiniCalendarConfigClass)
-#define E_IS_MINI_CALENDAR_CONFIG(obj) GTK_CHECK_TYPE (obj, e_mini_calendar_config_get_type ())
+#define E_MINI_CALENDAR_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_mini_calendar_config_get_type (), EMiniCalendarConfig)
+#define E_MINI_CALENDAR_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_mini_calendar_config_get_type (), EMiniCalendarConfigClass)
+#define E_IS_MINI_CALENDAR_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_mini_calendar_config_get_type ())
typedef struct _EMiniCalendarConfig EMiniCalendarConfig;
typedef struct _EMiniCalendarConfigClass EMiniCalendarConfigClass;
Modified: trunk/calendar/gui/e-tasks.c
==============================================================================
--- trunk/calendar/gui/e-tasks.c (original)
+++ trunk/calendar/gui/e-tasks.c Thu May 22 17:27:48 2008
@@ -184,8 +184,7 @@
tasks = E_TASKS (data);
n_selected = e_table_selected_count (etable);
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SELECTION_CHANGED],
- n_selected);
+ g_signal_emit (tasks, e_tasks_signals[SELECTION_CHANGED], 0, n_selected);
if (n_selected != 1)
e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (tasks->priv->preview));
@@ -702,13 +701,14 @@
object_class = (GtkObjectClass *) class;
e_tasks_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (ETasksClass, selection_changed),
- g_cclosure_marshal_VOID__INT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_INT);
+ g_signal_new ("selection_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ETasksClass, selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE, 1,
+ G_TYPE_INT);
e_tasks_signals[SOURCE_ADDED] =
g_signal_new ("source_added",
@@ -932,7 +932,7 @@
priv->clients_list = g_list_remove (priv->clients_list, client);
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
+ g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), NULL, -1);
@@ -982,7 +982,7 @@
/* Do this last because it unrefs the client */
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
+ g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
set_status_message (tasks, NULL);
g_object_unref (source);
@@ -1026,7 +1026,7 @@
/* Do this last because it unrefs the client */
g_hash_table_remove (priv->clients, e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
+ g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
set_status_message (tasks, NULL);
g_object_unref (priv->default_client);
@@ -1192,7 +1192,7 @@
g_hash_table_insert (priv->clients, g_strdup (uid) , client);
priv->clients_list = g_list_prepend (priv->clients_list, client);
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_ADDED], source);
+ g_signal_emit (tasks, e_tasks_signals[SOURCE_ADDED], 0, source);
open_ecal (tasks, client, FALSE, client_cal_opened_cb);
@@ -1229,7 +1229,7 @@
g_hash_table_remove (priv->clients, uid);
- gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
+ g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
return TRUE;
}
Modified: trunk/calendar/gui/e-tasks.h
==============================================================================
--- trunk/calendar/gui/e-tasks.h (original)
+++ trunk/calendar/gui/e-tasks.h Thu May 22 17:27:48 2008
@@ -32,11 +32,11 @@
#include "e-calendar-table.h"
#define E_TYPE_TASKS (e_tasks_get_type ())
-#define E_TASKS(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks))
-#define E_TASKS_CLASS(klass) (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_TASKS, \
+#define E_TASKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASKS, ETasks))
+#define E_TASKS_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_TASKS, \
ETasksClass))
-#define E_IS_TASKS(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TASKS))
-#define E_IS_TASKS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TASKS))
+#define E_IS_TASKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TASKS))
+#define E_IS_TASKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TASKS))
typedef struct _ETasks ETasks;
typedef struct _ETasksClass ETasksClass;
@@ -59,7 +59,7 @@
};
-GtkType e_tasks_get_type (void);
+GType e_tasks_get_type (void);
GtkWidget *e_tasks_construct (ETasks *tasks);
GtkWidget *e_tasks_new (void);
Modified: trunk/calendar/gui/e-timezone-entry.c
==============================================================================
--- trunk/calendar/gui/e-timezone-entry.c (original)
+++ trunk/calendar/gui/e-timezone-entry.c Thu May 22 17:27:48 2008
@@ -92,14 +92,13 @@
widget_class->mnemonic_activate = e_timezone_entry_mnemonic_activate;
widget_class->focus = e_timezone_entry_focus;
timezone_entry_signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_LAST,
- G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (ETimezoneEntryClass,
- changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ETimezoneEntryClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = e_timezone_entry_destroy;
@@ -210,7 +209,7 @@
on_entry_changed (GtkEntry *entry,
ETimezoneEntry *tentry)
{
- gtk_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED]);
+ g_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED], 0);
}
Modified: trunk/calendar/gui/e-timezone-entry.h
==============================================================================
--- trunk/calendar/gui/e-timezone-entry.h (original)
+++ trunk/calendar/gui/e-timezone-entry.h Thu May 22 17:27:48 2008
@@ -39,10 +39,10 @@
#define E_TYPE_TIMEZONE_ENTRY (e_timezone_entry_get_type ())
-#define E_TIMEZONE_ENTRY(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
-#define E_TIMEZONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
-#define E_IS_TIMEZONE_ENTRY(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
-#define E_IS_TIMEZONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
+#define E_TIMEZONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
+#define E_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
+#define E_IS_TIMEZONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
+#define E_IS_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
typedef struct _ETimezoneEntry ETimezoneEntry;
Modified: trunk/calendar/gui/e-week-view-config.h
==============================================================================
--- trunk/calendar/gui/e-week-view-config.h (original)
+++ trunk/calendar/gui/e-week-view-config.h Thu May 22 17:27:48 2008
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define E_WEEK_VIEW_CONFIG(obj) GTK_CHECK_CAST (obj, e_week_view_config_get_type (), EWeekViewConfig)
-#define E_WEEK_VIEW_CONFIG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_week_view_config_get_type (), EWeekViewConfigClass)
-#define E_IS_WEEK_VIEW_CONFIG(obj) GTK_CHECK_TYPE (obj, e_week_view_config_get_type ())
+#define E_WEEK_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_week_view_config_get_type (), EWeekViewConfig)
+#define E_WEEK_VIEW_CONFIG_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_week_view_config_get_type (), EWeekViewConfigClass)
+#define E_IS_WEEK_VIEW_CONFIG(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_week_view_config_get_type ())
typedef struct _EWeekViewConfig EWeekViewConfig;
typedef struct _EWeekViewConfigClass EWeekViewConfigClass;
Modified: trunk/calendar/gui/e-week-view-event-item.c
==============================================================================
--- trunk/calendar/gui/e-week-view-event-item.c (original)
+++ trunk/calendar/gui/e-week-view-event-item.c Thu May 22 17:27:48 2008
@@ -41,9 +41,10 @@
#include <text/e-text.h>
-static void e_week_view_event_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_week_view_event_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_week_view_event_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
@@ -93,9 +94,9 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_EVENT_NUM,
- ARG_SPAN_NUM
+ PROP_0,
+ PROP_EVENT_NUM,
+ PROP_SPAN_NUM
};
G_DEFINE_TYPE (EWeekViewEventItem, e_week_view_event_item, GNOME_TYPE_CANVAS_ITEM)
@@ -103,26 +104,41 @@
static void
e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_week_view_event_item_set_property;
- gtk_object_add_arg_type ("EWeekViewEventItem::event_num",
- GTK_TYPE_INT, GTK_ARG_WRITABLE,
- ARG_EVENT_NUM);
- gtk_object_add_arg_type ("EWeekViewEventItem::span_num",
- GTK_TYPE_INT, GTK_ARG_WRITABLE,
- ARG_SPAN_NUM);
-
- object_class->set_arg = e_week_view_event_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_week_view_event_item_update;
- item_class->draw = e_week_view_event_item_draw;
- item_class->point = e_week_view_event_item_point;
- item_class->event = e_week_view_event_item_event;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_week_view_event_item_update;
+ item_class->draw = e_week_view_event_item_draw;
+ item_class->point = e_week_view_event_item_point;
+ item_class->event = e_week_view_event_item_event;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_EVENT_NUM,
+ g_param_spec_int (
+ "event_num",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ -1,
+ G_PARAM_WRITABLE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SPAN_NUM,
+ g_param_spec_int (
+ "span_num",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ -1,
+ G_PARAM_WRITABLE));
}
@@ -135,28 +151,29 @@
static void
-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_week_view_event_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GnomeCanvasItem *item;
EWeekViewEventItem *wveitem;
- gboolean needs_update = FALSE;
- item = GNOME_CANVAS_ITEM (o);
- wveitem = E_WEEK_VIEW_EVENT_ITEM (o);
+ item = GNOME_CANVAS_ITEM (object);
+ wveitem = E_WEEK_VIEW_EVENT_ITEM (object);
- switch (arg_id){
- case ARG_EVENT_NUM:
- wveitem->event_num = GTK_VALUE_INT (*arg);
- needs_update = TRUE;
- break;
- case ARG_SPAN_NUM:
- wveitem->span_num = GTK_VALUE_INT (*arg);
- needs_update = TRUE;
- break;
+ switch (property_id) {
+ case PROP_EVENT_NUM:
+ wveitem->event_num = g_value_get_int (value);
+ gnome_canvas_item_request_update (item);
+ return;
+ case PROP_SPAN_NUM:
+ wveitem->span_num = g_value_get_int (value);
+ gnome_canvas_item_request_update (item);
+ return;
}
- if (needs_update)
- gnome_canvas_item_request_update (item);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -1021,8 +1038,7 @@
e_week_view_show_popup_menu (week_view,
(GdkEventButton*) bevent,
wveitem->event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name (item->canvas, "button_press_event");
return TRUE;
}
Modified: trunk/calendar/gui/e-week-view-event-item.h
==============================================================================
--- trunk/calendar/gui/e-week-view-event-item.h (original)
+++ trunk/calendar/gui/e-week-view-event-item.h Thu May 22 17:27:48 2008
@@ -36,11 +36,11 @@
* edit the text.
*/
-#define E_WEEK_VIEW_EVENT_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_WEEK_VIEW_EVENT_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_week_view_event_item_get_type (), EWeekViewEventItem))
-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_week_view_event_item_get_type ()))
-#define E_IS_WEEK_VIEW_EVENT_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_WEEK_VIEW_EVENT_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_week_view_event_item_get_type ()))
typedef struct {
@@ -59,7 +59,7 @@
} EWeekViewEventItemClass;
-GtkType e_week_view_event_item_get_type (void);
+GType e_week_view_event_item_get_type (void);
Modified: trunk/calendar/gui/e-week-view-main-item.c
==============================================================================
--- trunk/calendar/gui/e-week-view-main-item.c (original)
+++ trunk/calendar/gui/e-week-view-main-item.c Thu May 22 17:27:48 2008
@@ -36,9 +36,10 @@
#include "e-week-view-main-item.h"
#include "ea-calendar.h"
-static void e_week_view_main_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_week_view_main_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_week_view_main_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
@@ -66,8 +67,8 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_WEEK_VIEW
+ PROP_0,
+ PROP_WEEK_VIEW
};
G_DEFINE_TYPE (EWeekViewMainItem, e_week_view_main_item, GNOME_TYPE_CANVAS_ITEM)
@@ -75,22 +76,25 @@
static void
e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_week_view_main_item_set_property;
- gtk_object_add_arg_type ("EWeekViewMainItem::week_view",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_WEEK_VIEW);
-
- object_class->set_arg = e_week_view_main_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_week_view_main_item_update;
- item_class->draw = e_week_view_main_item_draw;
- item_class->point = e_week_view_main_item_point;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_week_view_main_item_update;
+ item_class->draw = e_week_view_main_item_draw;
+ item_class->point = e_week_view_main_item_point;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_WEEK_VIEW,
+ g_param_spec_pointer (
+ "week_view",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
/* init the accessibility support for e_week_view_main_item */
e_week_view_main_item_a11y_init ();
@@ -105,17 +109,22 @@
static void
-e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_week_view_main_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EWeekViewMainItem *wvmitem;
- wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);
+ wvmitem = E_WEEK_VIEW_MAIN_ITEM (object);
- switch (arg_id){
- case ARG_WEEK_VIEW:
- wvmitem->week_view = GTK_VALUE_POINTER (*arg);
- break;
+ switch (property_id) {
+ case PROP_WEEK_VIEW:
+ wvmitem->week_view = g_value_get_pointer (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-week-view-main-item.h
==============================================================================
--- trunk/calendar/gui/e-week-view-main-item.h (original)
+++ trunk/calendar/gui/e-week-view-main-item.h Thu May 22 17:27:48 2008
@@ -35,11 +35,11 @@
* Month calendar views.
*/
-#define E_WEEK_VIEW_MAIN_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_WEEK_VIEW_MAIN_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_week_view_main_item_get_type (), EWeekViewMainItem))
-#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_week_view_main_item_get_type ()))
-#define E_IS_WEEK_VIEW_MAIN_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_WEEK_VIEW_MAIN_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_week_view_main_item_get_type ()))
typedef struct {
@@ -55,7 +55,7 @@
} EWeekViewMainItemClass;
-GtkType e_week_view_main_item_get_type (void);
+GType e_week_view_main_item_get_type (void);
Modified: trunk/calendar/gui/e-week-view-titles-item.c
==============================================================================
--- trunk/calendar/gui/e-week-view-titles-item.c (original)
+++ trunk/calendar/gui/e-week-view-titles-item.c Thu May 22 17:27:48 2008
@@ -34,9 +34,10 @@
#include <e-util/e-util.h>
#include "e-week-view-titles-item.h"
-static void e_week_view_titles_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_week_view_titles_item_set_property(GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_week_view_titles_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
@@ -56,8 +57,8 @@
/* The arguments we take */
enum {
- ARG_0,
- ARG_WEEK_VIEW
+ PROP_0,
+ PROP_WEEK_VIEW
};
G_DEFINE_TYPE (EWeekViewTitlesItem, e_week_view_titles_item, GNOME_TYPE_CANVAS_ITEM)
@@ -65,22 +66,25 @@
static void
e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = (GtkObjectClass *) class;
- item_class = (GnomeCanvasItemClass *) class;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = e_week_view_titles_item_set_property;
- gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",
- GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
- ARG_WEEK_VIEW);
-
- object_class->set_arg = e_week_view_titles_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->update = e_week_view_titles_item_update;
- item_class->draw = e_week_view_titles_item_draw;
- item_class->point = e_week_view_titles_item_point;
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->update = e_week_view_titles_item_update;
+ item_class->draw = e_week_view_titles_item_draw;
+ item_class->point = e_week_view_titles_item_point;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_WEEK_VIEW,
+ g_param_spec_pointer (
+ "week_view",
+ NULL,
+ NULL,
+ G_PARAM_WRITABLE));
}
@@ -92,17 +96,22 @@
static void
-e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_week_view_titles_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EWeekViewTitlesItem *wvtitem;
- wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
+ wvtitem = E_WEEK_VIEW_TITLES_ITEM (object);
- switch (arg_id){
- case ARG_WEEK_VIEW:
- wvtitem->week_view = GTK_VALUE_POINTER (*arg);
- break;
+ switch (property_id) {
+ case PROP_WEEK_VIEW:
+ wvtitem->week_view = g_value_get_pointer (value);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
Modified: trunk/calendar/gui/e-week-view-titles-item.h
==============================================================================
--- trunk/calendar/gui/e-week-view-titles-item.h (original)
+++ trunk/calendar/gui/e-week-view-titles-item.h Thu May 22 17:27:48 2008
@@ -35,11 +35,11 @@
* the Month calendar view.
*/
-#define E_WEEK_VIEW_TITLES_ITEM(obj) (GTK_CHECK_CAST((obj), \
+#define E_WEEK_VIEW_TITLES_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
e_week_view_titles_item_get_type (), EWeekViewTitlesItem))
-#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
+#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
e_week_view_titles_item_get_type ()))
-#define E_IS_WEEK_VIEW_TITLES_ITEM(o) (GTK_CHECK_TYPE((o), \
+#define E_IS_WEEK_VIEW_TITLES_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), \
e_week_view_titles_item_get_type ()))
typedef struct {
@@ -55,7 +55,7 @@
} EWeekViewTitlesItemClass;
-GtkType e_week_view_titles_item_get_type (void);
+GType e_week_view_titles_item_get_type (void);
Modified: trunk/calendar/gui/e-week-view.c
==============================================================================
--- trunk/calendar/gui/e-week-view.c (original)
+++ trunk/calendar/gui/e-week-view.c Thu May 22 17:27:48 2008
@@ -3088,12 +3088,11 @@
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item), "event");
return TRUE;
} else if (gdkevent->key.keyval == GDK_Escape) {
cancel_editing (week_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item), "event");
/* focus should go to week view when stop editing */
gtk_widget_grab_focus (GTK_WIDGET (week_view));
return TRUE;
@@ -3111,7 +3110,7 @@
event->comp_data->client,
event->comp_data->icalcomp, FALSE);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item), "event");
return TRUE;
case GDK_BUTTON_PRESS:
tooltip_destroy (week_view, item);
@@ -3139,8 +3138,8 @@
(GdkEventButton*) gdkevent,
event_num);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
- "button_press_event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item->canvas),
+ "button_press_event");
return TRUE;
}
@@ -3151,8 +3150,7 @@
/* Only let the EText handle the event while editing. */
if (!E_TEXT (item)->editing) {
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item), "event");
if (gdkevent) {
week_view->drag_event_x = gdkevent->button.x;
@@ -3187,8 +3185,7 @@
/* Stop the signal last or we will also stop any
other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
+ g_signal_stop_emission_by_name (GTK_OBJECT (item), "event");
return TRUE;
}
week_view->pressed_event_num = -1;
Modified: trunk/calendar/gui/e-week-view.h
==============================================================================
--- trunk/calendar/gui/e-week-view.h (original)
+++ trunk/calendar/gui/e-week-view.h Thu May 22 17:27:48 2008
@@ -149,9 +149,9 @@
};
-#define E_WEEK_VIEW(obj) GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)
-#define E_WEEK_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
-#define E_IS_WEEK_VIEW(obj) GTK_CHECK_TYPE (obj, e_week_view_get_type ())
+#define E_WEEK_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_week_view_get_type (), EWeekView)
+#define E_WEEK_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
+#define E_IS_WEEK_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_week_view_get_type ())
typedef struct _EWeekView EWeekView;
@@ -347,7 +347,7 @@
};
-GtkType e_week_view_get_type (void);
+GType e_week_view_get_type (void);
GtkWidget* e_week_view_new (void);
/* The first day shown. Note that it will be rounded down to the start of a
Modified: trunk/calendar/gui/gnome-cal.c
==============================================================================
--- trunk/calendar/gui/gnome-cal.c (original)
+++ trunk/calendar/gui/gnome-cal.c Thu May 22 17:27:48 2008
@@ -263,65 +263,71 @@
object_class = (GtkObjectClass *) class;
gnome_calendar_signals[DATES_SHOWN_CHANGED] =
- gtk_signal_new ("dates_shown_changed",
- GTK_RUN_LAST,
+ g_signal_new ("dates_shown_changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass,
- dates_shown_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, dates_shown_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnome_calendar_signals[CALENDAR_SELECTION_CHANGED] =
- gtk_signal_new ("calendar_selection_changed",
- GTK_RUN_LAST,
+ g_signal_new ("calendar_selection_changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, calendar_selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnome_calendar_signals[TASKPAD_SELECTION_CHANGED] =
- gtk_signal_new ("taskpad_selection_changed",
- GTK_RUN_LAST,
+ g_signal_new ("taskpad_selection_changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, taskpad_selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnome_calendar_signals[MEMOPAD_SELECTION_CHANGED] =
- gtk_signal_new ("memopad_selection_changed",
- GTK_RUN_LAST,
+ g_signal_new ("memopad_selection_changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, memopad_selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, memopad_selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =
- gtk_signal_new ("calendar_focus_change",
- GTK_RUN_FIRST,
+ g_signal_new ("calendar_focus_change",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_focus_change),
- gtk_marshal_NONE__BOOL,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_BOOL);
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, calendar_focus_change),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1,
+ G_TYPE_BOOLEAN);
gnome_calendar_signals[TASKPAD_FOCUS_CHANGE] =
- gtk_signal_new ("taskpad_focus_change",
- GTK_RUN_FIRST,
+ g_signal_new ("taskpad_focus_change",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_focus_change),
- gtk_marshal_NONE__BOOL,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_BOOL);
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, taskpad_focus_change),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1,
+ G_TYPE_BOOLEAN);
gnome_calendar_signals[MEMOPAD_FOCUS_CHANGE] =
- gtk_signal_new ("memopad_focus_change",
- GTK_RUN_FIRST,
+ g_signal_new ("memopad_focus_change",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (GnomeCalendarClass, memopad_focus_change),
- gtk_marshal_NONE__BOOL,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_BOOL);
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GnomeCalendarClass, memopad_focus_change),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1,
+ G_TYPE_BOOLEAN);
gnome_calendar_signals[SOURCE_ADDED] =
g_signal_new ("source_added",
@@ -994,8 +1000,7 @@
static void
view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
{
- gtk_signal_emit (GTK_OBJECT (gcal),
- gnome_calendar_signals[CALENDAR_SELECTION_CHANGED]);
+ g_signal_emit (gcal, gnome_calendar_signals[CALENDAR_SELECTION_CHANGED], 0);
}
@@ -1050,8 +1055,8 @@
gcal = GNOME_CALENDAR (data);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [TASKPAD_FOCUS_CHANGE],
- event->in ? TRUE : FALSE);
+ g_signal_emit (gcal, gnome_calendar_signals [TASKPAD_FOCUS_CHANGE], 0,
+ event->in ? TRUE : FALSE);
return FALSE;
}
@@ -1063,8 +1068,8 @@
gcal = GNOME_CALENDAR (data);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [MEMOPAD_FOCUS_CHANGE],
- event->in ? TRUE : FALSE);
+ g_signal_emit (gcal, gnome_calendar_signals [MEMOPAD_FOCUS_CHANGE], 0,
+ event->in ? TRUE : FALSE);
return FALSE;
}
@@ -1076,8 +1081,8 @@
gcal = GNOME_CALENDAR (data);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [CALENDAR_FOCUS_CHANGE],
- event->in ? TRUE : FALSE);
+ g_signal_emit (gcal, gnome_calendar_signals [CALENDAR_FOCUS_CHANGE], 0,
+ event->in ? TRUE : FALSE);
return FALSE;
}
@@ -1133,7 +1138,7 @@
gcal = GNOME_CALENDAR (data);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[TASKPAD_SELECTION_CHANGED]);
+ g_signal_emit (gcal, gnome_calendar_signals[TASKPAD_SELECTION_CHANGED], 0);
}
static void
@@ -1143,7 +1148,7 @@
gcal = GNOME_CALENDAR (data);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[MEMOPAD_SELECTION_CHANGED]);
+ g_signal_emit (gcal, gnome_calendar_signals[MEMOPAD_SELECTION_CHANGED], 0);
}
static void
@@ -2668,7 +2673,7 @@
priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], ecal);
g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
g_object_unref (source);
g_warning ("Unable to load the calendar %s \n", e_cal_get_error_message (status));
@@ -2771,7 +2776,7 @@
g_object_unref (priv->default_client[source_type]);
priv->default_client[source_type] = NULL;
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
g_object_unref (source);
g_warning ("Unable to load the calendar %s \n", e_cal_get_error_message (status));
@@ -2893,7 +2898,7 @@
e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
break;
case E_CAL_SOURCE_TYPE_TODO:
@@ -2901,7 +2906,7 @@
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL, -1);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
break;
case E_CAL_SOURCE_TYPE_JOURNAL:
@@ -2909,7 +2914,7 @@
e_memo_table_set_status_message (E_MEMO_TABLE (priv->memo), NULL);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
break;
default:
g_return_if_reached ();
@@ -3068,7 +3073,7 @@
g_hash_table_insert (priv->clients[source_type], g_strdup (e_source_peek_uid (source)), client);
priv->clients_list[source_type] = g_list_prepend (priv->clients_list[source_type], client);
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_ADDED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_ADDED], 0, source_type, source);
open_ecal (gcal, client, FALSE, client_cal_opened_cb);
@@ -3096,7 +3101,7 @@
result = gnome_calendar_remove_source_by_uid (gcal, source_type, e_source_peek_uid (source));
if (result)
- gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
+ g_signal_emit (gcal, gnome_calendar_signals[SOURCE_REMOVED], 0, source_type, source);
return result;
}
@@ -3653,8 +3658,7 @@
priv->visible_start = start_time;
priv->visible_end = end_time;
- gtk_signal_emit (GTK_OBJECT (gcal),
- gnome_calendar_signals[DATES_SHOWN_CHANGED]);
+ g_signal_emit (gcal, gnome_calendar_signals[DATES_SHOWN_CHANGED], 0);
}
update_memo_view (gcal);
}
Modified: trunk/calendar/gui/gnome-cal.h
==============================================================================
--- trunk/calendar/gui/gnome-cal.h (original)
+++ trunk/calendar/gui/gnome-cal.h Thu May 22 17:27:48 2008
@@ -40,11 +40,11 @@
struct _EPopup;
#define GNOME_TYPE_CALENDAR (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass) (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR, \
+#define GNOME_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
+#define GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR, \
GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
+#define GNOME_IS_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_CALENDAR))
+#define GNOME_IS_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
typedef struct _GnomeCalendar GnomeCalendar;
typedef struct _GnomeCalendarClass GnomeCalendarClass;
@@ -102,7 +102,7 @@
};
-GtkType gnome_calendar_get_type (void);
+GType gnome_calendar_get_type (void);
GtkWidget *gnome_calendar_construct (GnomeCalendar *gcal);
GtkWidget *gnome_calendar_new (void);
Modified: trunk/calendar/gui/weekday-picker.c
==============================================================================
--- trunk/calendar/gui/weekday-picker.c (original)
+++ trunk/calendar/gui/weekday-picker.c Thu May 22 17:27:48 2008
@@ -92,12 +92,13 @@
widget_class = (GtkWidgetClass *) class;
wp_signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_FIRST,
+ g_signal_new ("changed",
G_TYPE_FROM_CLASS (object_class),
- GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (WeekdayPickerClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = weekday_picker_destroy;
@@ -504,7 +505,7 @@
priv->day_mask = day_mask;
colorize_items (wp);
- gtk_signal_emit (GTK_OBJECT (wp), wp_signals[CHANGED]);
+ g_signal_emit (GTK_OBJECT (wp), wp_signals[CHANGED], 0);
}
/**
Modified: trunk/calendar/gui/weekday-picker.h
==============================================================================
--- trunk/calendar/gui/weekday-picker.h (original)
+++ trunk/calendar/gui/weekday-picker.h Thu May 22 17:27:48 2008
@@ -28,11 +28,11 @@
#define TYPE_WEEKDAY_PICKER (weekday_picker_get_type ())
-#define WEEKDAY_PICKER(obj) (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
-#define WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER, \
+#define WEEKDAY_PICKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
+#define WEEKDAY_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER, \
WeekdayPickerClass))
-#define IS_WEEKDAY_PICKER(obj) (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))
-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
+#define IS_WEEKDAY_PICKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WEEKDAY_PICKER))
+#define IS_WEEKDAY_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
typedef struct _WeekdayPicker WeekdayPicker;
typedef struct _WeekdayPickerClass WeekdayPickerClass;
@@ -51,7 +51,7 @@
void (* changed) (WeekdayPicker *wp);
};
-GtkType weekday_picker_get_type (void);
+GType weekday_picker_get_type (void);
GtkWidget *weekday_picker_new (void);
Modified: trunk/filter/rule-editor.c
==============================================================================
--- trunk/filter/rule-editor.c (original)
+++ trunk/filter/rule-editor.c Thu May 22 17:27:48 2008
@@ -72,10 +72,10 @@
static GtkDialogClass *parent_class = NULL;
-GtkType
+GType
rule_editor_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
static const GTypeInfo info = {
@@ -626,7 +626,7 @@
static struct {
char *name;
- GtkSignalFunc func;
+ GCallback func;
} edit_buttons[] = {
{ "rule_add", G_CALLBACK (rule_add) },
{ "rule_edit", G_CALLBACK (rule_edit) },
Modified: trunk/filter/rule-editor.h
==============================================================================
--- trunk/filter/rule-editor.h (original)
+++ trunk/filter/rule-editor.h Thu May 22 17:27:48 2008
@@ -35,7 +35,7 @@
#define RULE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RULE_TYPE_EDITOR, RuleEditorClass))
#define IS_RULE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RULE_TYPE_EDITOR))
#define IS_RULE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RULE_TYPE_EDITOR))
-#define RULE_EDITOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), RULE_TYPE_EDITOR, RuleEditorClass))
+#define RULE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RULE_TYPE_EDITOR, RuleEditorClass))
typedef struct _RuleEditor RuleEditor;
typedef struct _RuleEditorClass RuleEditorClass;
@@ -89,7 +89,7 @@
int newrank;
};
-GtkType rule_editor_get_type(void);
+GType rule_editor_get_type(void);
RuleEditor *rule_editor_new(RuleContext *rc, const char *source, const char *label);
void rule_editor_construct(RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label);
Modified: trunk/mail/em-account-prefs.h
==============================================================================
--- trunk/mail/em-account-prefs.h (original)
+++ trunk/mail/em-account-prefs.h Thu May 22 17:27:48 2008
@@ -80,7 +80,7 @@
};
-GtkType em_account_prefs_get_type (void);
+GType em_account_prefs_get_type (void);
GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell);
Modified: trunk/mail/em-filter-editor.c
==============================================================================
--- trunk/mail/em-filter-editor.c (original)
+++ trunk/mail/em-filter-editor.c Thu May 22 17:27:48 2008
@@ -45,10 +45,10 @@
static RuleEditorClass *parent_class = NULL;
-GtkType
+GType
em_filter_editor_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
static const GTypeInfo info = {
Modified: trunk/mail/em-filter-editor.h
==============================================================================
--- trunk/mail/em-filter-editor.h (original)
+++ trunk/mail/em-filter-editor.h Thu May 22 17:27:48 2008
@@ -30,7 +30,7 @@
#define EM_FILTER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), em_filter_editor_get_type(), EMFilterEditorClass))
#define EM_IS_FILTER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_filter_editor_get_type()))
#define EM_IS_FILTER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_filter_editor_get_type()))
-#define EM_FILTER_EDITOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), em_filter_editor_get_type(), EMFilterEditorClass))
+#define EM_FILTER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), em_filter_editor_get_type(), EMFilterEditorClass))
typedef struct _EMFilterEditor EMFilterEditor;
typedef struct _EMFilterEditorClass EMFilterEditorClass;
@@ -50,7 +50,7 @@
RuleEditorClass parent_class;
};
-GtkType em_filter_editor_get_type (void);
+GType em_filter_editor_get_type (void);
EMFilterEditor *em_filter_editor_new (EMFilterContext *f, const EMFilterSource *source_names);
void em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *gui, const EMFilterSource *source_names);
Modified: trunk/mail/em-folder-selector.h
==============================================================================
--- trunk/mail/em-folder-selector.h (original)
+++ trunk/mail/em-folder-selector.h Thu May 22 17:27:48 2008
@@ -31,10 +31,10 @@
#endif /* cplusplus */
#define EM_TYPE_FOLDER_SELECTOR (em_folder_selector_get_type ())
-#define EM_FOLDER_SELECTOR(obj) (GTK_CHECK_CAST ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector))
-#define EM_FOLDER_SELECTOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass))
-#define EM_IS_FOLDER_SELECTOR(obj) (GTK_CHECK_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
-#define EM_IS_FOLDER_SELECTOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR))
+#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;
typedef struct _EMFolderSelectorPrivate EMFolderSelectorPrivate;
Modified: trunk/mail/em-format-html-display.c
==============================================================================
--- trunk/mail/em-format-html-display.c (original)
+++ trunk/mail/em-format-html-display.c Thu May 22 17:27:48 2008
@@ -611,7 +611,7 @@
gtk_entry_set_text (GTK_ENTRY (p->search_entry), "");
- gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
+ g_signal_emit_by_name (p->search_entry, "activate", efhd);
}
/* Controlls the visibility of icon_entry's visibility */
@@ -755,7 +755,7 @@
gtk_widget_hide (p->search_entry_box);
/* Trigger the search */
- gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
+ g_signal_emit_by_name (p->search_entry, "activate", efhd);
}
}
Modified: trunk/mail/em-mailer-prefs.c
==============================================================================
--- trunk/mail/em-mailer-prefs.c (original)
+++ trunk/mail/em-mailer-prefs.c Thu May 22 17:27:48 2008
@@ -111,7 +111,7 @@
{ N_("Once per month"), 30 },
};
-GtkType
+GType
em_mailer_prefs_get_type (void)
{
static GType type = 0;
Modified: trunk/mail/em-mailer-prefs.h
==============================================================================
--- trunk/mail/em-mailer-prefs.h (original)
+++ trunk/mail/em-mailer-prefs.h Thu May 22 17:27:48 2008
@@ -146,7 +146,7 @@
};
-GtkType em_mailer_prefs_get_type (void);
+GType em_mailer_prefs_get_type (void);
GtkWidget * create_combo_text_widget (void);
struct _GtkWidget *em_mailer_prefs_new (void);
Modified: trunk/mail/em-utils.c
==============================================================================
--- trunk/mail/em-utils.c (original)
+++ trunk/mail/em-utils.c Thu May 22 17:27:48 2008
@@ -314,7 +314,7 @@
e_dialog_set_transient_for ((GtkWindow *) filter_editor, parent);
gtk_window_set_title (GTK_WINDOW (filter_editor), _("Message Filters"));
- g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GtkDestroyNotify) g_object_unref);
+ g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GDestroyNotify) g_object_unref);
g_signal_connect (filter_editor, "response", G_CALLBACK (em_filter_editor_response), NULL);
gtk_widget_show (GTK_WIDGET (filter_editor));
}
Modified: trunk/mail/em-vfolder-editor.c
==============================================================================
--- trunk/mail/em-vfolder-editor.c (original)
+++ trunk/mail/em-vfolder-editor.c Thu May 22 17:27:48 2008
@@ -65,10 +65,10 @@
;
}
-GtkType
+GType
em_vfolder_editor_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
static const GTypeInfo info = {
Modified: trunk/mail/em-vfolder-editor.h
==============================================================================
--- trunk/mail/em-vfolder-editor.h (original)
+++ trunk/mail/em-vfolder-editor.h Thu May 22 17:27:48 2008
@@ -30,7 +30,7 @@
#define EM_VFOLDER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), em_vfolder_editor_get_type(), EMVFolderEditorClass))
#define EM_IS_VFOLDER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_vfolder_editor_get_type()))
#define EM_IS_VFOLDER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_vfolder_editor_get_type()))
-#define EM_VFOLDER_EDITOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), em_vfolder_editor_get_type(), EMVFolderEditorClass))
+#define EM_VFOLDER_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), em_vfolder_editor_get_type(), EMVFolderEditorClass))
typedef struct _EMVFolderEditor EMVFolderEditor;
typedef struct _EMVFolderEditorClass EMVFolderEditorClass;
@@ -44,7 +44,7 @@
RuleEditorClass parent_class;
};
-GtkType em_vfolder_editor_get_type (void);
+GType em_vfolder_editor_get_type (void);
EMVFolderEditor *em_vfolder_editor_new (EMVFolderContext *vc);
Modified: trunk/mail/em-vfolder-rule.c
==============================================================================
--- trunk/mail/em-vfolder-rule.c (original)
+++ trunk/mail/em-vfolder-rule.c Thu May 22 17:27:48 2008
@@ -383,7 +383,7 @@
static struct {
char *name;
- GtkSignalFunc func;
+ GCallback func;
} edit_buttons[] = {
{ "source_add", G_CALLBACK(source_add) },
{ "source_remove", G_CALLBACK(source_remove)},
@@ -673,7 +673,7 @@
rb = g_slist_nth_data(gtk_radio_button_get_group (rb), vr->with);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
- gtk_signal_emit_by_name (GTK_OBJECT (rb), "toggled");
+ g_signal_emit_by_name (rb, "toggled");
set_sensitive(data);
Modified: trunk/mail/mail-vfolder.c
==============================================================================
--- trunk/mail/mail-vfolder.c (original)
+++ trunk/mail/mail-vfolder.c Thu May 22 17:27:48 2008
@@ -1070,8 +1070,8 @@
gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
- g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GtkDestroyNotify)g_object_unref);
- g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GtkDestroyNotify)g_object_unref);
+ g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GDestroyNotify)g_object_unref);
+ g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GDestroyNotify)g_object_unref);
g_signal_connect(gd, "response", G_CALLBACK(edit_rule_response), NULL);
gtk_widget_show((GtkWidget *)gd);
} else {
@@ -1160,7 +1160,7 @@
gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
- g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GtkDestroyNotify)g_object_unref);
+ g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GDestroyNotify)g_object_unref);
g_signal_connect(gd, "response", G_CALLBACK(new_rule_clicked), NULL);
gtk_widget_show((GtkWidget *)gd);
}
Modified: trunk/mail/message-list.h
==============================================================================
--- trunk/mail/message-list.h (original)
+++ trunk/mail/message-list.h Thu May 22 17:27:48 2008
@@ -172,7 +172,7 @@
MESSAGE_LIST_SELECT_WRAP = 1<<1, /* option bit */
} MessageListSelectDirection;
-GtkType message_list_get_type (void);
+GType message_list_get_type (void);
GtkWidget *message_list_new (void);
void message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const char *uri, gboolean outgoing);
Modified: trunk/mail/message-tag-editor.h
==============================================================================
--- trunk/mail/message-tag-editor.h (original)
+++ trunk/mail/message-tag-editor.h Thu May 22 17:27:48 2008
@@ -60,7 +60,7 @@
};
-GtkType message_tag_editor_get_type (void);
+GType message_tag_editor_get_type (void);
/* methods */
CamelTag *message_tag_editor_get_tag_list (MessageTagEditor *editor);
Modified: trunk/mail/message-tag-followup.h
==============================================================================
--- trunk/mail/message-tag-followup.h (original)
+++ trunk/mail/message-tag-followup.h Thu May 22 17:27:48 2008
@@ -63,7 +63,7 @@
};
-GtkType message_tag_followup_get_type (void);
+GType message_tag_followup_get_type (void);
MessageTagEditor *message_tag_followup_new (void);
Modified: trunk/plugins/email-custom-header/email-custom-header.h
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.h (original)
+++ trunk/plugins/email-custom-header/email-custom-header.h Thu May 22 17:27:48 2008
@@ -23,10 +23,10 @@
#include <gtk/gtkwidget.h>
#define EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG (epech_dialog_get_type ())
-#define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG(obj) (GTK_CHECK_CAST ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog))
-#define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialogClass))
-#define EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG))
-#define EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG))
+#define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog))
+#define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialogClass))
+#define EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG))
+#define EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG))
typedef struct _CustomHeaderOptionsDialog CustomHeaderOptionsDialog;
typedef struct _CustomHeaderOptionsDialogClass CustomHeaderOptionsDialogClass;
Modified: trunk/plugins/exchange-operations/exchange-account-setup.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-account-setup.c (original)
+++ trunk/plugins/exchange-operations/exchange-account-setup.c Thu May 22 17:27:48 2008
@@ -250,34 +250,34 @@
/* construct page */
- vbox_settings = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
+ vbox_settings = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox_settings), 12);
- frm_oof = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Out Of Office"), NULL);
+ frm_oof = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label", _("Out Of Office"), NULL);
gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_oof), FALSE, FALSE, 0);
- vbox_oof = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, NULL, "homogeneous", FALSE, "spacing", 12, NULL);
+ vbox_oof = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, NULL, "homogeneous", FALSE, "spacing", 12, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox_oof), 6);
gtk_container_add (GTK_CONTAINER (frm_oof), GTK_WIDGET (vbox_oof));
- lbl_oof_desc = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL);
+ lbl_oof_desc = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL);
gtk_misc_set_alignment (GTK_MISC (lbl_oof_desc), 0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (lbl_oof_desc), FALSE, FALSE, 0);
- tbl_oof_status = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
+ tbl_oof_status = (GtkTable*) g_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
txt = g_strdup_printf ("<b>%s</b>", _("Status:"));
- lbl_status = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", txt, "use-markup", TRUE, NULL);
+ lbl_status = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", txt, "use-markup", TRUE, NULL);
g_free (txt);
gtk_misc_set_alignment (GTK_MISC (lbl_status), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (lbl_status), 0, 0);
if (oof_data->state) {
- radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), NULL);
- radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), "group", radio_oof, NULL);
+ radio_oof = (GtkRadioButton*) g_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), NULL);
+ radio_iof = (GtkRadioButton*) g_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), "group", radio_oof, NULL);
}
else {
- radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), NULL);
- radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL);
+ radio_iof = (GtkRadioButton*) g_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), NULL);
+ radio_oof = (GtkRadioButton*) g_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL);
}
g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL);
@@ -289,9 +289,9 @@
gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0);
- scrwnd_oof = (GtkScrolledWindow*) gtk_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL);
+ scrwnd_oof = (GtkScrolledWindow*) g_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL);
gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0);
- txtview_oof = (GtkTextView*) gtk_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL);
+ txtview_oof = (GtkTextView*) g_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL);
buffer = gtk_text_view_get_buffer (txtview_oof);
gtk_text_buffer_get_bounds (buffer, &start, &end);
oof_message = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
@@ -313,27 +313,27 @@
gtk_container_add (GTK_CONTAINER (scrwnd_oof), GTK_WIDGET (txtview_oof));
/* Security settings */
- frm_auth = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Security"), NULL);
+ frm_auth = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label", _("Security"), NULL);
gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_auth), FALSE, FALSE, 0);
- vbox_auth = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
+ vbox_auth = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox_auth), 6);
gtk_container_add (GTK_CONTAINER (frm_auth), GTK_WIDGET (vbox_auth));
- tbl_auth = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
+ tbl_auth = (GtkTable*) g_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
#ifdef HAVE_KRB5
/* Change Password */
- lbl_chpass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Change the password for Exchange account"), NULL);
+ lbl_chpass = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", _("Change the password for Exchange account"), NULL);
gtk_misc_set_alignment (GTK_MISC (lbl_chpass), 0, 0.5);
- btn_chpass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Change Password"), NULL);
- gtk_signal_connect (GTK_OBJECT (btn_chpass), "clicked", G_CALLBACK (btn_chpass_clicked), NULL);
+ btn_chpass = (GtkButton*) g_object_new (GTK_TYPE_BUTTON, "label", _("Change Password"), NULL);
+ g_signal_connect (GTK_OBJECT (btn_chpass), "clicked", G_CALLBACK (btn_chpass_clicked), NULL);
#endif
/* Delegation Assistant */
- lbl_dass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Manage the delegate settings for Exchange account"), NULL);
+ lbl_dass = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", _("Manage the delegate settings for Exchange account"), NULL);
gtk_misc_set_alignment (GTK_MISC (lbl_dass), 0, 0.5);
- btn_dass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Delegation Assistant"), NULL);
+ btn_dass = (GtkButton*) g_object_new (GTK_TYPE_BUTTON, "label", _("Delegation Assistant"), NULL);
g_signal_connect (btn_dass, "clicked", G_CALLBACK (btn_dass_clicked), NULL);
/* Add items to the table */
#ifdef HAVE_KRB5
@@ -345,19 +345,19 @@
gtk_box_pack_start (GTK_BOX (vbox_auth), GTK_WIDGET (tbl_auth), FALSE, FALSE, 0);
/* Miscelleneous settings */
- frm_misc = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Miscelleneous"), NULL);
+ frm_misc = (GtkFrame*) g_object_new (GTK_TYPE_FRAME, "label", _("Miscelleneous"), NULL);
gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_misc), FALSE, FALSE, 0);
- vbox_misc = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
+ vbox_misc = (GtkVBox*) g_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox_misc), 6);
gtk_container_add (GTK_CONTAINER (frm_misc), GTK_WIDGET (vbox_misc));
- tbl_misc = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 1, "n-columns", 1, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
+ tbl_misc = (GtkTable*) g_object_new (GTK_TYPE_TABLE, "n-rows", 1, "n-columns", 1, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
/* Folder Size */
- lbl_fsize = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("View the size of all Exchange folders"), NULL);
+ lbl_fsize = (GtkLabel*) g_object_new (GTK_TYPE_LABEL, "label", _("View the size of all Exchange folders"), NULL);
gtk_misc_set_alignment (GTK_MISC (lbl_fsize), 0, 0.5);
- btn_fsize = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Folders Size"), NULL);
+ btn_fsize = (GtkButton*) g_object_new (GTK_TYPE_BUTTON, "label", _("Folders Size"), NULL);
g_signal_connect (btn_fsize, "clicked", G_CALLBACK (btn_fsize_clicked), NULL);
gtk_table_attach_defaults (tbl_misc, GTK_WIDGET (lbl_fsize), 0, 1, 0, 1);
gtk_table_attach (tbl_misc, GTK_WIDGET (btn_fsize), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
Modified: trunk/plugins/exchange-operations/exchange-send-options.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-send-options.h (original)
+++ trunk/plugins/exchange-operations/exchange-send-options.h Thu May 22 17:27:48 2008
@@ -26,10 +26,10 @@
#define EXCHANGE_TYPE_SENDOPTIONS_DIALOG (exchange_sendoptions_dialog_get_type ())
-#define EXCHANGE_SENDOPTIONS_DIALOG(obj) (GTK_CHECK_CAST ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialog))
-#define EXCHANGE_SENDOPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialogClass))
-#define EXCHANGE_IS_SENDOPTIONS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG))
-#define EXCHANGE_IS_SENDOPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG))
+#define EXCHANGE_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialog))
+#define EXCHANGE_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialogClass))
+#define EXCHANGE_IS_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG))
+#define EXCHANGE_IS_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG))
typedef struct _ExchangeSendOptionsDialog ExchangeSendOptionsDialog;
typedef struct _ExchangeSendOptionsDialogClass ExchangeSendOptionsDialogClass;
Modified: trunk/plugins/groupwise-features/proxy-login.h
==============================================================================
--- trunk/plugins/groupwise-features/proxy-login.h (original)
+++ trunk/plugins/groupwise-features/proxy-login.h Thu May 22 17:27:48 2008
@@ -23,10 +23,10 @@
#include <gtk/gtk.h>
#define TYPE_PROXY_LOGIN (proxy_login_get_type ())
-#define PROXY_LOGIN(obj) (GTK_CHECK_CAST ((obj), TYPE_PROXY_LOGIN, proxyLogin))
-#define PROXY_LOGIN_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_PROXY_LOGIN, proxyLoginClass))
-#define IS_PROXY_LOGIN(obj) (GTK_CHECK_TYPE ((obj), TYPE_PROXY_LOGIN))
-#define IS_PROXY_LOGIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_PROXY_LOGIN))
+#define PROXY_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXY_LOGIN, proxyLogin))
+#define PROXY_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROXY_LOGIN, proxyLoginClass))
+#define IS_PROXY_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROXY_LOGIN))
+#define IS_PROXY_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROXY_LOGIN))
typedef struct _proxyLogin proxyLogin;
typedef struct _proxyLoginClass proxyLoginClass;
Modified: trunk/plugins/groupwise-features/proxy.h
==============================================================================
--- trunk/plugins/groupwise-features/proxy.h (original)
+++ trunk/plugins/groupwise-features/proxy.h Thu May 22 17:27:48 2008
@@ -26,10 +26,10 @@
#include <gtk/gtk.h>
#define TYPE_PROXY_DIALOG (proxy_dialog_get_type ())
-#define PROXY_DIALOG(obj) (GTK_CHECK_CAST ((obj), TYPE_PROXY_DIALOG, proxyDialog))
-#define PROXY_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_PROXY_DIALOG, proxyDialogClass))
-#define IS_PROXY_DIALOG(obj) (GTK_CHECK_TYPE ((obj), TYPE_PROXY_DIALOG))
-#define IS_PROXY_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_PROXY_DIALOG))
+#define PROXY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXY_DIALOG, proxyDialog))
+#define PROXY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROXY_DIALOG, proxyDialogClass))
+#define IS_PROXY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROXY_DIALOG))
+#define IS_PROXY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROXY_DIALOG))
typedef struct _proxyDialog proxyDialog;
typedef struct _proxyDialogClass proxyDialogClass;
Modified: trunk/plugins/itip-formatter/itip-view.c
==============================================================================
--- trunk/plugins/itip-formatter/itip-view.c (original)
+++ trunk/plugins/itip-formatter/itip-view.c Thu May 22 17:27:48 2008
@@ -911,7 +911,7 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ItipViewClass, source_selected),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
+ g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[RESPONSE] =
Modified: trunk/shell/e-component-view.h
==============================================================================
--- trunk/shell/e-component-view.h (original)
+++ trunk/shell/e-component-view.h Thu May 22 17:27:48 2008
@@ -40,10 +40,10 @@
#include "Evolution.h"
#define E_TYPE_COMPONENT_VIEW (e_component_view_get_type ())
-#define E_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_COMPONENT_VIEW, EComponentView))
-#define E_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_VIEW, EComponentViewClass))
-#define E_IS_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
-#define E_IS_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+#define E_COMPONENT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMPONENT_VIEW, EComponentView))
+#define E_COMPONENT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_VIEW, EComponentViewClass))
+#define E_IS_COMPONENT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+#define E_IS_COMPONENT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
struct _EComponentView {
BonoboObject parent;
Modified: trunk/shell/e-corba-config-page.h
==============================================================================
--- trunk/shell/e-corba-config-page.h (original)
+++ trunk/shell/e-corba-config-page.h Thu May 22 17:27:48 2008
@@ -35,10 +35,10 @@
#endif /* __cplusplus */
#define E_TYPE_CORBA_CONFIG_PAGE (e_corba_config_page_get_type ())
-#define E_CORBA_CONFIG_PAGE(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
-#define E_CORBA_CONFIG_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPageClass))
-#define E_IS_CORBA_CONFIG_PAGE(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
-#define E_IS_CORBA_CONFIG_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
+#define E_CORBA_CONFIG_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
+#define E_CORBA_CONFIG_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPageClass))
+#define E_IS_CORBA_CONFIG_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
+#define E_IS_CORBA_CONFIG_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
typedef struct _ECorbaConfigPage ECorbaConfigPage;
@@ -56,7 +56,7 @@
};
-GtkType e_corba_config_page_get_type (void);
+GType e_corba_config_page_get_type (void);
GtkWidget *e_corba_config_page_new_from_objref (GNOME_Evolution_ConfigControl objref);
gboolean e_corba_config_page_construct (ECorbaConfigPage *corba_config_page,
GNOME_Evolution_ConfigControl objref);
Modified: trunk/shell/e-history.h
==============================================================================
--- trunk/shell/e-history.h (original)
+++ trunk/shell/e-history.h Thu May 22 17:27:48 2008
@@ -31,10 +31,10 @@
#endif /* __cplusplus */
#define E_TYPE_HISTORY (e_history_get_type ())
-#define E_HISTORY(obj) (GTK_CHECK_CAST ((obj), E_TYPE_HISTORY, EHistory))
-#define E_HISTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_HISTORY, EHistoryClass))
-#define E_IS_HISTORY(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_HISTORY))
-#define E_IS_HISTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_HISTORY))
+#define E_HISTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_HISTORY, EHistory))
+#define E_HISTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_HISTORY, EHistoryClass))
+#define E_IS_HISTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_HISTORY))
+#define E_IS_HISTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_HISTORY))
typedef struct _EHistory EHistory;
@@ -55,7 +55,7 @@
typedef void (* EHistoryItemFreeFunc) (void *data);
-GtkType e_history_get_type (void);
+GType e_history_get_type (void);
void e_history_construct (EHistory *history,
EHistoryItemFreeFunc item_free_function);
Modified: trunk/shell/e-shell-folder-title-bar.h
==============================================================================
--- trunk/shell/e-shell-folder-title-bar.h (original)
+++ trunk/shell/e-shell-folder-title-bar.h Thu May 22 17:27:48 2008
@@ -32,10 +32,10 @@
#endif /* __cplusplus */
#define E_TYPE_SHELL_FOLDER_TITLE_BAR (e_shell_folder_title_bar_get_type ())
-#define E_SHELL_FOLDER_TITLE_BAR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBar))
-#define E_SHELL_FOLDER_TITLE_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBarClass))
-#define E_IS_SHELL_FOLDER_TITLE_BAR(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
-#define E_IS_SHELL_FOLDER_TITLE_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
+#define E_SHELL_FOLDER_TITLE_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBar))
+#define E_SHELL_FOLDER_TITLE_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_FOLDER_TITLE_BAR, EShellFolderTitleBarClass))
+#define E_IS_SHELL_FOLDER_TITLE_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
+#define E_IS_SHELL_FOLDER_TITLE_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_FOLDER_TITLE_BAR))
typedef struct _EShellFolderTitleBar EShellFolderTitleBar;
@@ -58,7 +58,7 @@
};
-GtkType e_shell_folder_title_bar_get_type (void);
+GType e_shell_folder_title_bar_get_type (void);
void e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar);
GtkWidget *e_shell_folder_title_bar_new (void);
Modified: trunk/shell/e-shell-settings-dialog.h
==============================================================================
--- trunk/shell/e-shell-settings-dialog.h (original)
+++ trunk/shell/e-shell-settings-dialog.h Thu May 22 17:27:48 2008
@@ -32,10 +32,10 @@
#endif /* __cplusplus */
#define E_TYPE_SHELL_SETTINGS_DIALOG (e_shell_settings_dialog_get_type ())
-#define E_SHELL_SETTINGS_DIALOG(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialog))
-#define E_SHELL_SETTINGS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialogClass))
-#define E_IS_SHELL_SETTINGS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
-#define E_IS_SHELL_SETTINGS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
+#define E_SHELL_SETTINGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialog))
+#define E_SHELL_SETTINGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialogClass))
+#define E_IS_SHELL_SETTINGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
+#define E_IS_SHELL_SETTINGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_SETTINGS_DIALOG))
typedef struct _EShellSettingsDialog EShellSettingsDialog;
@@ -53,7 +53,7 @@
};
-GtkType e_shell_settings_dialog_get_type (void);
+GType e_shell_settings_dialog_get_type (void);
GtkWidget *e_shell_settings_dialog_new (void);
void e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog,
const char *type);
Modified: trunk/shell/e-shell-view.h
==============================================================================
--- trunk/shell/e-shell-view.h (original)
+++ trunk/shell/e-shell-view.h Thu May 22 17:27:48 2008
@@ -40,10 +40,10 @@
#include "Evolution.h"
#define E_TYPE_SHELL_VIEW (e_shell_view_get_type ())
-#define E_SHELL_VIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
-#define E_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
-#define E_IS_SHELL_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_VIEW))
-#define E_IS_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
+#define E_SHELL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
+#define E_SHELL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
+#define E_IS_SHELL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_VIEW))
+#define E_IS_SHELL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
struct _EShellView {
BonoboObject parent;
Modified: trunk/shell/e-shell.h
==============================================================================
--- trunk/shell/e-shell.h (original)
+++ trunk/shell/e-shell.h Thu May 22 17:27:48 2008
@@ -42,10 +42,10 @@
#define E_TYPE_SHELL (e_shell_get_type ())
-#define E_SHELL(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL, EShell))
-#define E_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
-#define E_IS_SHELL(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL))
-#define E_IS_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
+#define E_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL, EShell))
+#define E_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
+#define E_IS_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL))
+#define E_IS_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
enum _EShellLineStatus {
@@ -93,7 +93,7 @@
typedef enum _EShellConstructResult EShellConstructResult;
-GtkType e_shell_get_type (void);
+GType e_shell_get_type (void);
EShellConstructResult e_shell_construct (EShell *shell,
const char *iid,
EShellStartupLineMode startup_line_mode);
Modified: trunk/shell/e-user-creatable-items-handler.h
==============================================================================
--- trunk/shell/e-user-creatable-items-handler.h (original)
+++ trunk/shell/e-user-creatable-items-handler.h Thu May 22 17:27:48 2008
@@ -33,10 +33,10 @@
#endif /* __cplusplus */
#define E_TYPE_USER_CREATABLE_ITEMS_HANDLER (e_user_creatable_items_handler_get_type ())
-#define E_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler))
-#define E_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandlerClass))
-#define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
-#define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
+#define E_USER_CREATABLE_ITEMS_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler))
+#define E_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandlerClass))
+#define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
+#define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
typedef struct _EUserCreatableItemsHandler EUserCreatableItemsHandler;
Modified: trunk/shell/evolution-config-control.h
==============================================================================
--- trunk/shell/evolution-config-control.h (original)
+++ trunk/shell/evolution-config-control.h Thu May 22 17:27:48 2008
@@ -34,10 +34,10 @@
#endif /* cplusplus */
#define EVOLUTION_TYPE_CONFIG_CONTROL (evolution_config_control_get_type ())
-#define EVOLUTION_CONFIG_CONTROL(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControl))
-#define EVOLUTION_CONFIG_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControlClass))
-#define EVOLUTION_IS_CONFIG_CONTROL(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
-#define EVOLUTION_IS_CONFIG_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
+#define EVOLUTION_CONFIG_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControl))
+#define EVOLUTION_CONFIG_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_CONFIG_CONTROL, EvolutionConfigControlClass))
+#define EVOLUTION_IS_CONFIG_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
+#define EVOLUTION_IS_CONFIG_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_CONFIG_CONTROL))
typedef struct _EvolutionConfigControl EvolutionConfigControl;
typedef struct _EvolutionConfigControlPrivate EvolutionConfigControlPrivate;
@@ -56,7 +56,7 @@
};
-GtkType evolution_config_control_get_type (void);
+GType evolution_config_control_get_type (void);
EvolutionConfigControl *evolution_config_control_new (GtkWidget *widget);
void evolution_config_control_construct (EvolutionConfigControl *control,
GtkWidget *widget);
Modified: trunk/smime/gui/e-cert-selector.h
==============================================================================
--- trunk/smime/gui/e-cert-selector.h (original)
+++ trunk/smime/gui/e-cert-selector.h Thu May 22 17:27:48 2008
@@ -32,10 +32,10 @@
#endif /* cplusplus */
#define E_TYPE_CERT_SELECTOR (e_cert_selector_get_type ())
-#define E_CERT_SELECTOR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CERT_SELECTOR, ECertSelector))
-#define E_CERT_SELECTOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CERT_SELECTOR, ECertSelectorClass))
-#define E_IS_CERT_SELECTOR(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_CERT_SELECTOR))
-#define E_IS_CERT_SELECTOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_CERT_SELECTOR))
+#define E_CERT_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CERT_SELECTOR, ECertSelector))
+#define E_CERT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CERT_SELECTOR, ECertSelectorClass))
+#define E_IS_CERT_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CERT_SELECTOR))
+#define E_IS_CERT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CERT_SELECTOR))
typedef struct _ECertSelector ECertSelector;
typedef struct _ECertSelectorClass ECertSelectorClass;
@@ -57,7 +57,7 @@
E_CERT_SELECTOR_RECIPIENT,
};
-GtkType e_cert_selector_get_type (void);
+GType e_cert_selector_get_type (void);
GtkWidget *e_cert_selector_new (int type, const char *currentid);
#ifdef cplusplus
Modified: trunk/widgets/e-timezone-dialog/e-timezone-dialog.h
==============================================================================
--- trunk/widgets/e-timezone-dialog/e-timezone-dialog.h (original)
+++ trunk/widgets/e-timezone-dialog/e-timezone-dialog.h Thu May 22 17:27:48 2008
@@ -28,11 +28,11 @@
#define E_TYPE_TIMEZONE_DIALOG (e_timezone_dialog_get_type ())
-#define E_TIMEZONE_DIALOG(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialog))
-#define E_TIMEZONE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_DIALOG, \
+#define E_TIMEZONE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialog))
+#define E_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_DIALOG, \
ETimezoneDialogClass))
-#define E_IS_TIMEZONE_DIALOG(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG))
-#define E_IS_TIMEZONE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG))
+#define E_IS_TIMEZONE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG))
+#define E_IS_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG))
typedef struct _ETimezoneDialog ETimezoneDialog;
Modified: trunk/widgets/menus/gal-view-instance.c
==============================================================================
--- trunk/widgets/menus/gal-view-instance.c (original)
+++ trunk/widgets/menus/gal-view-instance.c Thu May 22 17:27:48 2008
@@ -488,7 +488,7 @@
static void
add_popup_radio_item (EPopupMenu *menu_item,
gchar *title,
- GtkSignalFunc fn,
+ GCallback fn,
gpointer closure,
gboolean value)
{
Modified: trunk/widgets/menus/gal-view-menus.h
==============================================================================
--- trunk/widgets/menus/gal-view-menus.h (original)
+++ trunk/widgets/menus/gal-view-menus.h Thu May 22 17:27:48 2008
@@ -9,10 +9,10 @@
#include <glib-object.h>
#define GAL_VIEW_MENUS_TYPE (gal_view_menus_get_type ())
-#define GAL_VIEW_MENUS(o) (GTK_CHECK_CAST ((o), GAL_VIEW_MENUS_TYPE, GalViewMenus))
-#define GAL_VIEW_MENUS_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MENUS_TYPE, GalViewMenusClass))
-#define GAL_IS_VIEW_MENUS(o) (GTK_CHECK_TYPE ((o), GAL_VIEW_MENUS_TYPE))
-#define GAL_IS_VIEW_MENUS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MENUS_TYPE))
+#define GAL_VIEW_MENUS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_MENUS_TYPE, GalViewMenus))
+#define GAL_VIEW_MENUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_MENUS_TYPE, GalViewMenusClass))
+#define GAL_IS_VIEW_MENUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_MENUS_TYPE))
+#define GAL_IS_VIEW_MENUS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_MENUS_TYPE))
typedef struct _GalViewMenusPrivate GalViewMenusPrivate;
@@ -25,7 +25,7 @@
GObjectClass parent_class;
} GalViewMenusClass;
-GtkType gal_view_menus_get_type (void);
+GType gal_view_menus_get_type (void);
GalViewMenus *gal_view_menus_new (GalViewInstance *instance);
GalViewMenus *gal_view_menus_construct (GalViewMenus *menus,
GalViewInstance *instance);
Modified: trunk/widgets/misc/e-activity-handler.h
==============================================================================
--- trunk/widgets/misc/e-activity-handler.h (original)
+++ trunk/widgets/misc/e-activity-handler.h Thu May 22 17:27:48 2008
@@ -33,10 +33,10 @@
#endif /* __cplusplus */
#define E_TYPE_ACTIVITY_HANDLER (e_activity_handler_get_type ())
-#define E_ACTIVITY_HANDLER(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ACTIVITY_HANDLER, EActivityHandler))
-#define E_ACTIVITY_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ACTIVITY_HANDLER, EActivityHandlerClass))
-#define E_IS_ACTIVITY_HANDLER(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
-#define E_IS_ACTIVITY_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
+#define E_ACTIVITY_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ACTIVITY_HANDLER, EActivityHandler))
+#define E_ACTIVITY_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ACTIVITY_HANDLER, EActivityHandlerClass))
+#define E_IS_ACTIVITY_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
+#define E_IS_ACTIVITY_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
typedef struct _EActivityHandler EActivityHandler;
@@ -57,7 +57,7 @@
};
-GtkType e_activity_handler_get_type (void);
+GType e_activity_handler_get_type (void);
EActivityHandler *e_activity_handler_new (void);
Modified: trunk/widgets/misc/e-attachment-bar.h
==============================================================================
--- trunk/widgets/misc/e-attachment-bar.h (original)
+++ trunk/widgets/misc/e-attachment-bar.h Thu May 22 17:27:48 2008
@@ -66,7 +66,7 @@
};
-GtkType e_attachment_bar_get_type (void);
+GType e_attachment_bar_get_type (void);
GtkWidget *e_attachment_bar_new (GtkAdjustment *adj);
void e_attachment_bar_to_multipart (EAttachmentBar *bar, CamelMultipart *multipart,
Modified: trunk/widgets/misc/e-attachment.c
==============================================================================
--- trunk/widgets/misc/e-attachment.c (original)
+++ trunk/widgets/misc/e-attachment.c Thu May 22 17:27:48 2008
@@ -885,8 +885,5 @@
/* make sure that when the parent gets hidden/closed that our windows also close */
parent = gtk_widget_get_toplevel (parent);
- gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", (GCallback) close_cb, dialog_data,
- GTK_OBJECT (dialog_data->dialog));
- gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", (GCallback) close_cb, dialog_data,
- GTK_OBJECT (dialog_data->dialog));
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog_data->dialog), TRUE);
}
Modified: trunk/widgets/misc/e-calendar-item.c
==============================================================================
--- trunk/widgets/misc/e-calendar-item.c (original)
+++ trunk/widgets/misc/e-calendar-item.c Thu May 22 17:27:48 2008
@@ -56,13 +56,15 @@
&& ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0)
-static void e_calendar_item_destroy (GtkObject *o);
-static void e_calendar_item_get_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
-static void e_calendar_item_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_calendar_item_dispose (GObject *object);
+static void e_calendar_item_get_property(GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void e_calendar_item_set_property(GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void e_calendar_item_realize (GnomeCanvasItem *item);
static void e_calendar_item_unrealize (GnomeCanvasItem *item);
static void e_calendar_item_unmap (GnomeCanvasItem *item);
@@ -203,29 +205,29 @@
/* Our arguments. */
enum {
- ARG_0,
- ARG_YEAR,
- ARG_MONTH,
- ARG_X1,
- ARG_Y1,
- ARG_X2,
- ARG_Y2,
- ARG_FONT_DESC,
- ARG_WEEK_NUMBER_FONT,
- ARG_WEEK_NUMBER_FONT_DESC,
- ARG_ROW_HEIGHT,
- ARG_COLUMN_WIDTH,
- ARG_MINIMUM_ROWS,
- ARG_MINIMUM_COLUMNS,
- ARG_MAXIMUM_ROWS,
- ARG_MAXIMUM_COLUMNS,
- ARG_WEEK_START_DAY,
- ARG_SHOW_WEEK_NUMBERS,
- ARG_MAXIMUM_DAYS_SELECTED,
- ARG_DAYS_TO_START_WEEK_SELECTION,
- ARG_MOVE_SELECTION_WHEN_MOVING,
- ARG_PRESERVE_DAY_WHEN_MOVING,
- ARG_DISPLAY_POPUP
+ PROP_0,
+ PROP_YEAR,
+ PROP_MONTH,
+ PROP_X1,
+ PROP_Y1,
+ PROP_X2,
+ PROP_Y2,
+ PROP_FONT_DESC,
+ PROP_WEEK_NUMBER_FONT,
+ PROP_WEEK_NUMBER_FONT_DESC,
+ PROP_ROW_HEIGHT,
+ PROP_COLUMN_WIDTH,
+ PROP_MINIMUM_ROWS,
+ PROP_MINIMUM_COLUMNS,
+ PROP_MAXIMUM_ROWS,
+ PROP_MAXIMUM_COLUMNS,
+ PROP_WEEK_START_DAY,
+ PROP_SHOW_WEEK_NUMBERS,
+ PROP_MAXIMUM_DAYS_SELECTED,
+ PROP_DAYS_TO_START_WEEK_SELECTION,
+ PROP_MOVE_SELECTION_WHEN_MOVING,
+ PROP_PRESERVE_DAY_WHEN_MOVING,
+ PROP_DISPLAY_POPUP
};
enum {
@@ -244,90 +246,284 @@
static void
e_calendar_item_class_init (ECalendarItemClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = GTK_OBJECT_CLASS (class);
- item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ object_class = G_OBJECT_CLASS (class);
+ object_class->dispose = e_calendar_item_dispose;
+ object_class->get_property = e_calendar_item_get_property;
+ object_class->set_property = e_calendar_item_set_property;
- gtk_object_add_arg_type ("ECalendarItem::year",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_YEAR);
- gtk_object_add_arg_type ("ECalendarItem::month",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MONTH);
- gtk_object_add_arg_type ("ECalendarItem::x1",
- GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
- ARG_X1);
- gtk_object_add_arg_type ("ECalendarItem::y1",
- GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
- ARG_Y1);
- gtk_object_add_arg_type ("ECalendarItem::x2",
- GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
- ARG_X2);
- gtk_object_add_arg_type ("ECalendarItem::y2",
- GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
- ARG_Y2);
- gtk_object_add_arg_type ("ECalendarItem::font_desc",
- GTK_TYPE_POINTER, GTK_ARG_READWRITE,
- ARG_FONT_DESC);
- gtk_object_add_arg_type ("ECalendarItem::week_number_font_desc",
- GTK_TYPE_POINTER, GTK_ARG_READWRITE,
- ARG_WEEK_NUMBER_FONT_DESC);
- gtk_object_add_arg_type ("ECalendarItem::row_height",
- GTK_TYPE_INT, GTK_ARG_READABLE,
- ARG_ROW_HEIGHT);
- gtk_object_add_arg_type ("ECalendarItem::column_width",
- GTK_TYPE_INT, GTK_ARG_READABLE,
- ARG_COLUMN_WIDTH);
- gtk_object_add_arg_type ("ECalendarItem::minimum_rows",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MINIMUM_ROWS);
- gtk_object_add_arg_type ("ECalendarItem::minimum_columns",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MINIMUM_COLUMNS);
- gtk_object_add_arg_type ("ECalendarItem::maximum_rows",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MAXIMUM_ROWS);
- gtk_object_add_arg_type ("ECalendarItem::maximum_columns",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MAXIMUM_COLUMNS);
- gtk_object_add_arg_type ("ECalendarItem::week_start_day",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_WEEK_START_DAY);
- gtk_object_add_arg_type ("ECalendarItem::show_week_numbers",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_SHOW_WEEK_NUMBERS);
- gtk_object_add_arg_type ("ECalendarItem::maximum_days_selected",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_MAXIMUM_DAYS_SELECTED);
- gtk_object_add_arg_type ("ECalendarItem::days_to_start_week_selection",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_DAYS_TO_START_WEEK_SELECTION);
- gtk_object_add_arg_type ("ECalendarItem::move_selection_when_moving",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_MOVE_SELECTION_WHEN_MOVING);
- gtk_object_add_arg_type ("ECalendarItem::preserve_day_when_moving",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_PRESERVE_DAY_WHEN_MOVING);
- gtk_object_add_arg_type ("ECalendarItem::display_popup",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_DISPLAY_POPUP);
+ item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ item_class->realize = e_calendar_item_realize;
+ item_class->unrealize = e_calendar_item_unrealize;
+ item_class->unmap = e_calendar_item_unmap;
+ item_class->update = e_calendar_item_update;
+ item_class->draw = e_calendar_item_draw;
+ item_class->point = e_calendar_item_point;
+ item_class->event = e_calendar_item_event;
+ item_class->bounds = e_calendar_item_bounds;
+
+ class->date_range_changed = NULL;
+ class->selection_changed = NULL;
+ class->selection_preview_changed = NULL;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_YEAR,
+ g_param_spec_int (
+ "year",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MONTH,
+ g_param_spec_int (
+ "month",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_X1,
+ g_param_spec_double (
+ "x1",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_Y1,
+ g_param_spec_double (
+ "y1",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_X2,
+ g_param_spec_double (
+ "x2",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_Y2,
+ g_param_spec_double (
+ "y2",
+ NULL,
+ NULL,
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_FONT_DESC,
+ g_param_spec_boxed (
+ "font_desc",
+ NULL,
+ NULL,
+ PANGO_TYPE_FONT_DESCRIPTION,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_WEEK_NUMBER_FONT_DESC,
+ g_param_spec_boxed (
+ "week_number_font_desc",
+ NULL,
+ NULL,
+ PANGO_TYPE_FONT_DESCRIPTION,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_ROW_HEIGHT,
+ g_param_spec_int (
+ "row_height",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_COLUMN_WIDTH,
+ g_param_spec_int (
+ "column_width",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MINIMUM_ROWS,
+ g_param_spec_int (
+ "minimum_rows",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MINIMUM_COLUMNS,
+ g_param_spec_int (
+ "minimum_columns",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MAXIMUM_ROWS,
+ g_param_spec_int (
+ "maximum_rows",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MAXIMUM_COLUMNS,
+ g_param_spec_int (
+ "maximum_columns",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_WEEK_START_DAY,
+ g_param_spec_int (
+ "week_start_day",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SHOW_WEEK_NUMBERS,
+ g_param_spec_boolean (
+ "show_week_numbers",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MAXIMUM_DAYS_SELECTED,
+ g_param_spec_int (
+ "maximum_days_selected",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_DAYS_TO_START_WEEK_SELECTION,
+ g_param_spec_int (
+ "days_to_start_week_selection",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_MOVE_SELECTION_WHEN_MOVING,
+ g_param_spec_boolean (
+ "move_selection_when_moving",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_PRESERVE_DAY_WHEN_MOVING,
+ g_param_spec_boolean (
+ "preserve_day_when_moving",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_DISPLAY_POPUP,
+ g_param_spec_boolean (
+ "display_popup",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
e_calendar_item_signals[DATE_RANGE_CHANGED] =
- gtk_signal_new ("date_range_changed",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- G_STRUCT_OFFSET (ECalendarItemClass, date_range_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("date_range_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ECalendarItemClass, date_range_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
e_calendar_item_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- G_STRUCT_OFFSET (ECalendarItemClass, selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("selection_changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ECalendarItemClass, selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
e_calendar_item_signals[SELECTION_PREVIEW_CHANGED] =
g_signal_new ("selection_preview_changed",
G_TYPE_FROM_CLASS (object_class),
@@ -337,24 +533,6 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- object_class->destroy = e_calendar_item_destroy;
- object_class->get_arg = e_calendar_item_get_arg;
- object_class->set_arg = e_calendar_item_set_arg;
-
- /* GnomeCanvasItem method overrides */
- item_class->realize = e_calendar_item_realize;
- item_class->unrealize = e_calendar_item_unrealize;
- item_class->unmap = e_calendar_item_unmap;
- item_class->update = e_calendar_item_update;
- item_class->draw = e_calendar_item_draw;
- item_class->point = e_calendar_item_point;
- item_class->event = e_calendar_item_event;
- item_class->bounds = e_calendar_item_bounds;
-
- class->date_range_changed = NULL;
- class->selection_changed = NULL;
- class->selection_preview_changed = NULL;
-
e_calendar_item_a11y_init ();
}
@@ -416,11 +594,11 @@
static void
-e_calendar_item_destroy (GtkObject *o)
+e_calendar_item_dispose (GObject *object)
{
ECalendarItem *calitem;
- calitem = E_CALENDAR_ITEM (o);
+ calitem = E_CALENDAR_ITEM (object);
e_calendar_item_set_style_callback (calitem, NULL, NULL, NULL);
e_calendar_item_set_get_time_callback (calitem, NULL, NULL, NULL);
@@ -447,228 +625,229 @@
if (calitem->selecting_axis)
g_free (calitem->selecting_axis);
- if (GTK_OBJECT_CLASS (e_calendar_item_parent_class)->destroy)
- (* GTK_OBJECT_CLASS (e_calendar_item_parent_class)->destroy) (o);
+
+ G_OBJECT_CLASS (e_calendar_item_parent_class)->dispose (object);
}
static void
-e_calendar_item_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_calendar_item_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ECalendarItem *calitem;
- calitem = E_CALENDAR_ITEM (o);
+ calitem = E_CALENDAR_ITEM (object);
- switch (arg_id) {
- case ARG_YEAR:
- GTK_VALUE_INT (*arg) = calitem->year;
- break;
- case ARG_MONTH:
- GTK_VALUE_INT (*arg) = calitem->month;
- break;
- case ARG_X1:
- GTK_VALUE_DOUBLE (*arg) = calitem->x1;
- break;
- case ARG_Y1:
- GTK_VALUE_DOUBLE (*arg) = calitem->y1;
- break;
- case ARG_X2:
- GTK_VALUE_DOUBLE (*arg) = calitem->x2;
- break;
- case ARG_Y2:
- GTK_VALUE_DOUBLE (*arg) = calitem->y2;
- break;
- case ARG_FONT_DESC:
- GTK_VALUE_BOXED (*arg) = calitem->font_desc;
- break;
- case ARG_WEEK_NUMBER_FONT_DESC:
- GTK_VALUE_BOXED (*arg) = calitem->week_number_font_desc;
- break;
- case ARG_ROW_HEIGHT:
+ switch (property_id) {
+ case PROP_YEAR:
+ g_value_set_int (value, calitem->year);
+ return;
+ case PROP_MONTH:
+ g_value_set_int (value, calitem->month);
+ return;
+ case PROP_X1:
+ g_value_set_double (value, calitem->x1);
+ return;
+ case PROP_Y1:
+ g_value_set_double (value, calitem->y1);
+ return;
+ case PROP_X2:
+ g_value_set_double (value, calitem->x2);
+ return;
+ case PROP_Y2:
+ g_value_set_double (value, calitem->y2);
+ return;
+ case PROP_FONT_DESC:
+ g_value_set_boxed (value, calitem->font_desc);
+ return;
+ case PROP_WEEK_NUMBER_FONT_DESC:
+ g_value_set_boxed (value, calitem->week_number_font_desc);
+ return;
+ case PROP_ROW_HEIGHT:
e_calendar_item_recalc_sizes (calitem);
- GTK_VALUE_INT (*arg) = calitem->min_month_height;
- break;
- case ARG_COLUMN_WIDTH:
+ g_value_set_int (value, calitem->min_month_height);
+ return;
+ case PROP_COLUMN_WIDTH:
e_calendar_item_recalc_sizes (calitem);
- GTK_VALUE_INT (*arg) = calitem->min_month_width;
- break;
- case ARG_MINIMUM_ROWS:
- GTK_VALUE_INT (*arg) = calitem->min_rows;
- break;
- case ARG_MINIMUM_COLUMNS:
- GTK_VALUE_INT (*arg) = calitem->min_cols;
- break;
- case ARG_MAXIMUM_ROWS:
- GTK_VALUE_INT (*arg) = calitem->max_rows;
- break;
- case ARG_MAXIMUM_COLUMNS:
- GTK_VALUE_INT (*arg) = calitem->max_cols;
- break;
- case ARG_WEEK_START_DAY:
- GTK_VALUE_INT (*arg) = calitem->week_start_day;
- break;
- case ARG_SHOW_WEEK_NUMBERS:
- GTK_VALUE_BOOL (*arg) = calitem->show_week_numbers;
- break;
- case ARG_MAXIMUM_DAYS_SELECTED:
- GTK_VALUE_INT (*arg) = e_calendar_item_get_max_days_sel (calitem);
- break;
- case ARG_DAYS_TO_START_WEEK_SELECTION:
- GTK_VALUE_INT (*arg) = e_calendar_item_get_days_start_week_sel (calitem);
- break;
- case ARG_MOVE_SELECTION_WHEN_MOVING:
- GTK_VALUE_BOOL (*arg) = calitem->move_selection_when_moving;
- break;
- case ARG_PRESERVE_DAY_WHEN_MOVING:
- GTK_VALUE_BOOL (*arg) = calitem->preserve_day_when_moving;
- break;
- case ARG_DISPLAY_POPUP:
- GTK_VALUE_BOOL (*arg) = e_calendar_item_get_display_popup (calitem);
- break;
- default:
- g_warning ("Invalid arg");
+ g_value_set_int (value, calitem->min_month_width);
+ return;
+ case PROP_MINIMUM_ROWS:
+ g_value_set_int (value, calitem->min_rows);
+ return;
+ case PROP_MINIMUM_COLUMNS:
+ g_value_set_int (value, calitem->min_cols);
+ return;
+ case PROP_MAXIMUM_ROWS:
+ g_value_set_int (value, calitem->max_rows);
+ return;
+ case PROP_MAXIMUM_COLUMNS:
+ g_value_set_int (value, calitem->max_cols);
+ return;
+ case PROP_WEEK_START_DAY:
+ g_value_set_int (value, calitem->week_start_day);
+ return;
+ case PROP_SHOW_WEEK_NUMBERS:
+ g_value_set_boolean (value, calitem->show_week_numbers);
+ return;
+ case PROP_MAXIMUM_DAYS_SELECTED:
+ g_value_set_int (value, e_calendar_item_get_max_days_sel (calitem));
+ return;
+ case PROP_DAYS_TO_START_WEEK_SELECTION:
+ g_value_set_int (value, e_calendar_item_get_days_start_week_sel (calitem));
+ return;
+ case PROP_MOVE_SELECTION_WHEN_MOVING:
+ g_value_set_boolean (value, calitem->move_selection_when_moving);
+ return;
+ case PROP_PRESERVE_DAY_WHEN_MOVING:
+ g_value_set_boolean (value, calitem->preserve_day_when_moving);
+ return;
+ case PROP_DISPLAY_POPUP:
+ g_value_set_boolean (value, e_calendar_item_get_display_popup (calitem));
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
static void
-e_calendar_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+e_calendar_item_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GnomeCanvasItem *item;
ECalendarItem *calitem;
PangoFontDescription *font_desc;
- gboolean need_update = FALSE;
gdouble dvalue;
gint ivalue;
gboolean bvalue;
- item = GNOME_CANVAS_ITEM (o);
- calitem = E_CALENDAR_ITEM (o);
+ item = GNOME_CANVAS_ITEM (object);
+ calitem = E_CALENDAR_ITEM (object);
- switch (arg_id){
- case ARG_YEAR:
- ivalue = GTK_VALUE_INT (*arg);
+ switch (property_id) {
+ case PROP_YEAR:
+ ivalue = g_value_get_int (value);
e_calendar_item_set_first_month (calitem, ivalue,
calitem->month);
- break;
- case ARG_MONTH:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_MONTH:
+ ivalue = g_value_get_int (value);
e_calendar_item_set_first_month (calitem, calitem->year,
ivalue);
- break;
- case ARG_X1:
- dvalue = GTK_VALUE_DOUBLE (*arg);
+ return;
+ case PROP_X1:
+ dvalue = g_value_get_double (value);
if (calitem->x1 != dvalue) {
calitem->x1 = dvalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_Y1:
- dvalue = GTK_VALUE_DOUBLE (*arg);
+ return;
+ case PROP_Y1:
+ dvalue = g_value_get_double (value);
if (calitem->y1 != dvalue) {
calitem->y1 = dvalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_X2:
- dvalue = GTK_VALUE_DOUBLE (*arg);
+ return;
+ case PROP_X2:
+ dvalue = g_value_get_double (value);
if (calitem->x2 != dvalue) {
calitem->x2 = dvalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_Y2:
- dvalue = GTK_VALUE_DOUBLE (*arg);
+ return;
+ case PROP_Y2:
+ dvalue = g_value_get_double (value);
if (calitem->y2 != dvalue) {
calitem->y2 = dvalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_FONT_DESC:
- font_desc = GTK_VALUE_BOXED (*arg);
+ return;
+ case PROP_FONT_DESC:
+ font_desc = g_value_get_boxed (value);
if (calitem->font_desc)
pango_font_description_free (calitem->font_desc);
calitem->font_desc = pango_font_description_copy (font_desc);
- need_update = TRUE;
- break;
- case ARG_WEEK_NUMBER_FONT_DESC:
- font_desc = GTK_VALUE_BOXED (*arg);
+ gnome_canvas_item_request_update (item);
+ return;
+ case PROP_WEEK_NUMBER_FONT_DESC:
+ font_desc = g_value_get_boxed (value);
if (calitem->week_number_font_desc)
pango_font_description_free (calitem->week_number_font_desc);
calitem->week_number_font_desc = pango_font_description_copy (font_desc);
- need_update = TRUE;
- break;
- case ARG_MINIMUM_ROWS:
- ivalue = GTK_VALUE_INT (*arg);
+ gnome_canvas_item_request_update (item);
+ return;
+ case PROP_MINIMUM_ROWS:
+ ivalue = g_value_get_int (value);
ivalue = MAX (1, ivalue);
if (calitem->min_rows != ivalue) {
calitem->min_rows = ivalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_MINIMUM_COLUMNS:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_MINIMUM_COLUMNS:
+ ivalue = g_value_get_int (value);
ivalue = MAX (1, ivalue);
if (calitem->min_cols != ivalue) {
calitem->min_cols = ivalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_MAXIMUM_ROWS:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_MAXIMUM_ROWS:
+ ivalue = g_value_get_int (value);
if (calitem->max_rows != ivalue) {
calitem->max_rows = ivalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_MAXIMUM_COLUMNS:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_MAXIMUM_COLUMNS:
+ ivalue = g_value_get_int (value);
if (calitem->max_cols != ivalue) {
calitem->max_cols = ivalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_WEEK_START_DAY:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_WEEK_START_DAY:
+ ivalue = g_value_get_int (value);
if (calitem->week_start_day != ivalue) {
calitem->week_start_day = ivalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_SHOW_WEEK_NUMBERS:
- bvalue = GTK_VALUE_BOOL (*arg);
+ return;
+ case PROP_SHOW_WEEK_NUMBERS:
+ bvalue = g_value_get_boolean (value);
if (calitem->show_week_numbers != bvalue) {
calitem->show_week_numbers = bvalue;
- need_update = TRUE;
+ gnome_canvas_item_request_update (item);
}
- break;
- case ARG_MAXIMUM_DAYS_SELECTED:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_MAXIMUM_DAYS_SELECTED:
+ ivalue = g_value_get_int (value);
e_calendar_item_set_max_days_sel (calitem, ivalue);
- break;
- case ARG_DAYS_TO_START_WEEK_SELECTION:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_DAYS_TO_START_WEEK_SELECTION:
+ ivalue = g_value_get_int (value);
e_calendar_item_set_days_start_week_sel (calitem, ivalue);
- break;
- case ARG_MOVE_SELECTION_WHEN_MOVING:
- bvalue = GTK_VALUE_BOOL (*arg);
+ return;
+ case PROP_MOVE_SELECTION_WHEN_MOVING:
+ bvalue = g_value_get_boolean (value);
calitem->move_selection_when_moving = bvalue;
- break;
- case ARG_PRESERVE_DAY_WHEN_MOVING:
- bvalue = GTK_VALUE_BOOL (*arg);
+ return;
+ case PROP_PRESERVE_DAY_WHEN_MOVING:
+ bvalue = g_value_get_boolean (value);
calitem->preserve_day_when_moving = bvalue;
- break;
- case ARG_DISPLAY_POPUP:
- bvalue = GTK_VALUE_BOOL (*arg);
+ return;
+ case PROP_DISPLAY_POPUP:
+ bvalue = g_value_get_boolean (value);
e_calendar_item_set_display_popup (calitem, bvalue);
- break;
- default:
- g_warning ("Invalid arg");
+ return;
}
- if (need_update) {
- gnome_canvas_item_request_update (item);
- }
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
static void
@@ -3195,7 +3374,7 @@
e_calendar_item_set_style_callback (ECalendarItem *calitem,
ECalendarItemStyleCallback cb,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
@@ -3246,14 +3425,12 @@
if (calitem->date_range_changed) {
calitem->date_range_changed = FALSE;
- gtk_signal_emit (GTK_OBJECT (calitem),
- e_calendar_item_signals[DATE_RANGE_CHANGED]);
+ g_signal_emit (calitem, e_calendar_item_signals[DATE_RANGE_CHANGED], 0);
}
if (calitem->selection_changed) {
calitem->selection_changed = FALSE;
- gtk_signal_emit (GTK_OBJECT (calitem),
- e_calendar_item_signals[SELECTION_CHANGED]);
+ g_signal_emit (calitem, e_calendar_item_signals[SELECTION_CHANGED], 0);
}
g_object_unref((calitem));
@@ -3270,7 +3447,7 @@
e_calendar_item_set_get_time_callback (ECalendarItem *calitem,
ECalendarItemGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
Modified: trunk/widgets/misc/e-calendar-item.h
==============================================================================
--- trunk/widgets/misc/e-calendar-item.h (original)
+++ trunk/widgets/misc/e-calendar-item.h Thu May 22 17:27:48 2008
@@ -232,11 +232,11 @@
ECalendarItemStyleCallback style_callback;
gpointer style_callback_data;
- GtkDestroyNotify style_callback_destroy;
+ GDestroyNotify style_callback_destroy;
ECalendarItemGetTimeCallback time_callback;
gpointer time_callback_data;
- GtkDestroyNotify time_callback_destroy;
+ GDestroyNotify time_callback_destroy;
/* Colors for drawing. */
GdkColor colors[E_CALENDAR_ITEM_COLOR_LAST];
@@ -262,7 +262,7 @@
};
-GtkType e_calendar_item_get_type (void);
+GType e_calendar_item_get_type (void);
/* FIXME: months are 0-11 throughout, but 1-12 may be better. */
@@ -351,7 +351,7 @@
void e_calendar_item_set_style_callback (ECalendarItem *calitem,
ECalendarItemStyleCallback cb,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
/* Sets a callback to use to get the current time. This is useful if the
application needs to use its own timezone data rather than rely on the
@@ -359,7 +359,7 @@
void e_calendar_item_set_get_time_callback (ECalendarItem *calitem,
ECalendarItemGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
void e_calendar_item_normalize_date (ECalendarItem *calitem,
gint *year,
gint *month);
Modified: trunk/widgets/misc/e-calendar.h
==============================================================================
--- trunk/widgets/misc/e-calendar.h (original)
+++ trunk/widgets/misc/e-calendar.h Thu May 22 17:27:48 2008
@@ -76,7 +76,7 @@
};
-GtkType e_calendar_get_type (void);
+GType e_calendar_get_type (void);
GtkWidget* e_calendar_new (void);
void e_calendar_set_minimum_size (ECalendar *cal,
Modified: trunk/widgets/misc/e-canvas-background.h
==============================================================================
--- trunk/widgets/misc/e-canvas-background.h (original)
+++ trunk/widgets/misc/e-canvas-background.h Thu May 22 17:27:48 2008
@@ -65,7 +65,7 @@
/* Standard Gtk function */
-GtkType e_canvas_background_get_type (void);
+GType e_canvas_background_get_type (void);
G_END_DECLS
Modified: trunk/widgets/misc/e-canvas-vbox.h
==============================================================================
--- trunk/widgets/misc/e-canvas-vbox.h (original)
+++ trunk/widgets/misc/e-canvas-vbox.h Thu May 22 17:27:48 2008
@@ -83,7 +83,7 @@
*/
void e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
void e_canvas_vbox_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
-GtkType e_canvas_vbox_get_type (void);
+GType e_canvas_vbox_get_type (void);
#ifdef __cplusplus
}
Modified: trunk/widgets/misc/e-canvas.c
==============================================================================
--- trunk/widgets/misc/e-canvas.c (original)
+++ trunk/widgets/misc/e-canvas.c Thu May 22 17:27:48 2008
@@ -649,7 +649,7 @@
if (signal_id >= 1) {
GSignalQuery query;
g_signal_query (signal_id, &query);
- if (query.return_type == GTK_TYPE_NONE && query.n_params == 1 && query.param_types[0] == GTK_TYPE_STYLE) {
+ if (query.return_type == G_TYPE_NONE && query.n_params == 1 && query.param_types[0] == GTK_TYPE_STYLE) {
g_signal_emit (item, signal_id, 0, previous_style);
}
}
Modified: trunk/widgets/misc/e-canvas.h
==============================================================================
--- trunk/widgets/misc/e-canvas.h (original)
+++ trunk/widgets/misc/e-canvas.h Thu May 22 17:27:48 2008
@@ -106,7 +106,7 @@
};
-GtkType e_canvas_get_type (void);
+GType e_canvas_get_type (void);
GtkWidget *e_canvas_new (void);
/* Used to send all of the keystroke events to a specific item as well as
Modified: trunk/widgets/misc/e-cell-date-edit.c
==============================================================================
--- trunk/widgets/misc/e-cell-date-edit.c (original)
+++ trunk/widgets/misc/e-cell-date-edit.c Thu May 22 17:27:48 2008
@@ -52,12 +52,14 @@
#include "e-calendar.h"
static void e_cell_date_edit_destroy (GtkObject *object);
-static void e_cell_date_edit_get_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
-static void e_cell_date_edit_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id);
+static void e_cell_date_edit_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void e_cell_date_edit_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
static gint e_cell_date_edit_do_popup (ECellPopup *ecp,
GdkEvent *event,
@@ -103,57 +105,114 @@
/* Our arguments. */
enum {
- ARG_0,
- ARG_SHOW_TIME,
- ARG_SHOW_NOW_BUTTON,
- ARG_SHOW_TODAY_BUTTON,
- ARG_ALLOW_NO_DATE_SET,
- ARG_USE_24_HOUR_FORMAT,
- ARG_LOWER_HOUR,
- ARG_UPPER_HOUR
+ PROP_0,
+ PROP_SHOW_TIME,
+ PROP_SHOW_NOW_BUTTON,
+ PROP_SHOW_TODAY_BUTTON,
+ PROP_ALLOW_NO_DATE_SET,
+ PROP_USE_24_HOUR_FORMAT,
+ PROP_LOWER_HOUR,
+ PROP_UPPER_HOUR
};
G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE)
static void
-e_cell_date_edit_class_init (ECellDateEditClass *ecdec)
+e_cell_date_edit_class_init (ECellDateEditClass *class)
{
- GtkObjectClass *object_class = (GtkObjectClass *) ecdec;
- ECellPopupClass *ecpc = (ECellPopupClass *) ecdec;
+ GObjectClass *object_class;
+ GtkObjectClass *gtk_object_class;
+ ECellPopupClass *ecpc;
- gtk_object_add_arg_type ("ECellDateEdit::show_time",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_SHOW_TIME);
- gtk_object_add_arg_type ("ECellDateEdit::show_now_button",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_SHOW_NOW_BUTTON);
- gtk_object_add_arg_type ("ECellDateEdit::show_today_button",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_SHOW_TODAY_BUTTON);
- gtk_object_add_arg_type ("ECellDateEdit::allow_no_date_set",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_ALLOW_NO_DATE_SET);
- gtk_object_add_arg_type ("ECellDateEdit::use_24_hour_format",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE,
- ARG_USE_24_HOUR_FORMAT);
- gtk_object_add_arg_type ("ECellDateEdit::lower_hour",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_LOWER_HOUR);
- gtk_object_add_arg_type ("ECellDateEdit::upper_hour",
- GTK_TYPE_INT, GTK_ARG_READWRITE,
- ARG_UPPER_HOUR);
-
- object_class->destroy = e_cell_date_edit_destroy;
- object_class->get_arg = e_cell_date_edit_get_arg;
- object_class->set_arg = e_cell_date_edit_set_arg;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->get_property = e_cell_date_edit_get_property;
+ object_class->set_property = e_cell_date_edit_set_property;
+ gtk_object_class = GTK_OBJECT_CLASS (class);
+ gtk_object_class->destroy = e_cell_date_edit_destroy;
+
+ ecpc = E_CELL_POPUP_CLASS (class);
ecpc->popup = e_cell_date_edit_do_popup;
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SHOW_TIME,
+ g_param_spec_boolean (
+ "show_time",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SHOW_NOW_BUTTON,
+ g_param_spec_boolean (
+ "show_now_button",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_SHOW_TODAY_BUTTON,
+ g_param_spec_boolean (
+ "show_today_button",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_ALLOW_NO_DATE_SET,
+ g_param_spec_boolean (
+ "allow_no_date_set",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_USE_24_HOUR_FORMAT,
+ g_param_spec_boolean (
+ "use_24_hour_format",
+ NULL,
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_LOWER_HOUR,
+ g_param_spec_int (
+ "lower_hour",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
+ PROP_UPPER_HOUR,
+ g_param_spec_int (
+ "upper_hour",
+ NULL,
+ NULL,
+ G_MININT,
+ G_MAXINT,
+ 24,
+ G_PARAM_READWRITE));
}
static void
-e_cell_date_edit_init (ECellDateEdit *ecde)
+e_cell_date_edit_init (ECellDateEdit *ecde)
{
GtkWidget *frame, *vbox, *hbox, *vbox2;
GtkWidget *scrolled_window, *list, *bbox;
@@ -305,120 +364,113 @@
static void
-e_cell_date_edit_get_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id)
+e_cell_date_edit_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ECellDateEdit *ecde;
- ecde = E_CELL_DATE_EDIT (o);
+ ecde = E_CELL_DATE_EDIT (object);
- switch (arg_id) {
- case ARG_SHOW_TIME:
- GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->time_entry) ? TRUE : FALSE;
- break;
- case ARG_SHOW_NOW_BUTTON:
- GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->now_button) ? TRUE : FALSE;
- break;
- case ARG_SHOW_TODAY_BUTTON:
- GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->today_button) ? TRUE : FALSE;
- break;
- case ARG_ALLOW_NO_DATE_SET:
- GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->none_button) ? TRUE : FALSE;
- break;
- case ARG_USE_24_HOUR_FORMAT:
- GTK_VALUE_BOOL (*arg) = ecde->use_24_hour_format;
- break;
- case ARG_LOWER_HOUR:
- GTK_VALUE_INT (*arg) = ecde->lower_hour;
- break;
- case ARG_UPPER_HOUR:
- GTK_VALUE_INT (*arg) = ecde->upper_hour;
- break;
- default:
- g_warning ("Invalid arg");
+ switch (property_id) {
+ case PROP_SHOW_TIME:
+ g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->time_entry));
+ return;
+ case PROP_SHOW_NOW_BUTTON:
+ g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->now_button));
+ return;
+ case PROP_SHOW_TODAY_BUTTON:
+ g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->today_button));
+ return;
+ case PROP_ALLOW_NO_DATE_SET:
+ g_value_set_boolean (value, GTK_WIDGET_VISIBLE (ecde->none_button));
+ return;
+ case PROP_USE_24_HOUR_FORMAT:
+ g_value_set_boolean (value, ecde->use_24_hour_format);
+ return;
+ case PROP_LOWER_HOUR:
+ g_value_set_int (value, ecde->lower_hour);
+ return;
+ case PROP_UPPER_HOUR:
+ g_value_set_int (value, ecde->upper_hour);
+ return;
}
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
static void
-e_cell_date_edit_set_arg (GtkObject *o,
- GtkArg *arg,
- guint arg_id)
+e_cell_date_edit_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
ECellDateEdit *ecde;
gint ivalue;
gboolean bvalue;
- ecde = E_CELL_DATE_EDIT (o);
+ ecde = E_CELL_DATE_EDIT (object);
- switch (arg_id){
- case ARG_SHOW_TIME:
- bvalue = GTK_VALUE_BOOL (*arg);
- if (bvalue) {
+ switch (property_id) {
+ case PROP_SHOW_TIME:
+ if (g_value_get_boolean (value)) {
gtk_widget_show (ecde->time_entry);
gtk_widget_show (ecde->time_list);
} else {
gtk_widget_hide (ecde->time_entry);
gtk_widget_hide (ecde->time_list);
}
- break;
- case ARG_SHOW_NOW_BUTTON:
- bvalue = GTK_VALUE_BOOL (*arg);
- if (bvalue) {
+ return;
+ case PROP_SHOW_NOW_BUTTON:
+ if (g_value_get_boolean (value)) {
gtk_widget_show (ecde->now_button);
} else {
gtk_widget_hide (ecde->now_button);
}
- break;
- case ARG_SHOW_TODAY_BUTTON:
- bvalue = GTK_VALUE_BOOL (*arg);
- if (bvalue) {
+ return;
+ case PROP_SHOW_TODAY_BUTTON:
+ if (g_value_get_boolean (value)) {
gtk_widget_show (ecde->today_button);
} else {
gtk_widget_hide (ecde->today_button);
}
- break;
- case ARG_ALLOW_NO_DATE_SET:
- bvalue = GTK_VALUE_BOOL (*arg);
- if (bvalue) {
+ return;
+ case PROP_ALLOW_NO_DATE_SET:
+ if (g_value_get_boolean (value)) {
gtk_widget_show (ecde->none_button);
} else {
/* FIXME: What if we have no date set now. */
gtk_widget_hide (ecde->none_button);
}
- break;
- case ARG_USE_24_HOUR_FORMAT:
- bvalue = GTK_VALUE_BOOL (*arg);
+ return;
+ case PROP_USE_24_HOUR_FORMAT:
+ bvalue = g_value_get_boolean (value);
if (ecde->use_24_hour_format != bvalue) {
ecde->use_24_hour_format = bvalue;
ecde->need_time_list_rebuild = TRUE;
}
- break;
- case ARG_LOWER_HOUR:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_LOWER_HOUR:
+ ivalue = g_value_get_int (value);
ivalue = CLAMP (ivalue, 0, 24);
if (ecde->lower_hour != ivalue) {
ecde->lower_hour = ivalue;
ecde->need_time_list_rebuild = TRUE;
}
- break;
- case ARG_UPPER_HOUR:
- ivalue = GTK_VALUE_INT (*arg);
+ return;
+ case PROP_UPPER_HOUR:
+ ivalue = g_value_get_int (value);
ivalue = CLAMP (ivalue, 0, 24);
if (ecde->upper_hour != ivalue) {
ecde->upper_hour = ivalue;
ecde->need_time_list_rebuild = TRUE;
}
- break;
- default:
- g_warning ("Invalid arg");
+ return;
}
-#if 0
- if (ecde->need_time_list_rebuild && ecde->freeze_count == 0)
- e_cell_date_edit_rebuild_time_list (ecde);
-#endif
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -949,7 +1001,7 @@
e_cell_date_edit_set_get_time_callback (ECellDateEdit *ecde,
ECellDateEditGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
Modified: trunk/widgets/misc/e-cell-date-edit.h
==============================================================================
--- trunk/widgets/misc/e-cell-date-edit.h (original)
+++ trunk/widgets/misc/e-cell-date-edit.h Thu May 22 17:27:48 2008
@@ -75,7 +75,7 @@
ECellDateEditGetTimeCallback time_callback;
gpointer time_callback_data;
- GtkDestroyNotify time_callback_destroy;
+ GDestroyNotify time_callback_destroy;
};
struct _ECellDateEditClass {
@@ -83,7 +83,7 @@
};
-GtkType e_cell_date_edit_get_type (void);
+GType e_cell_date_edit_get_type (void);
ECell *e_cell_date_edit_new (void);
@@ -100,7 +100,7 @@
void e_cell_date_edit_set_get_time_callback(ECellDateEdit *ecde,
ECellDateEditGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
#endif /* _E_CELL_DATE_EDIT_H_ */
Modified: trunk/widgets/misc/e-combo-button.c
==============================================================================
--- trunk/widgets/misc/e-combo-button.c (original)
+++ trunk/widgets/misc/e-combo-button.c Thu May 22 17:27:48 2008
@@ -391,7 +391,7 @@
gtk_button_clicked (button);
if (! priv->menu_popped_up)
- gtk_signal_emit (GTK_OBJECT (button), signals[ACTIVATE_DEFAULT]);
+ g_signal_emit (button, signals[ACTIVATE_DEFAULT], 0);
}
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
@@ -429,12 +429,13 @@
button_class = GTK_BUTTON_CLASS (object_class);
button_class->released = impl_released;
- signals[ACTIVATE_DEFAULT] = gtk_signal_new ("activate_default",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- G_STRUCT_OFFSET (EComboButtonClass, activate_default),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ signals[ACTIVATE_DEFAULT] = g_signal_new ("activate_default",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EComboButtonClass, activate_default),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
e_combo_button_a11y_init ();
}
Modified: trunk/widgets/misc/e-combo-button.h
==============================================================================
--- trunk/widgets/misc/e-combo-button.h (original)
+++ trunk/widgets/misc/e-combo-button.h Thu May 22 17:27:48 2008
@@ -62,7 +62,7 @@
};
-GtkType e_combo_button_get_type (void);
+GType e_combo_button_get_type (void);
void e_combo_button_construct (EComboButton *combo_button);
GtkWidget *e_combo_button_new (void);
Modified: trunk/widgets/misc/e-config-page.h
==============================================================================
--- trunk/widgets/misc/e-config-page.h (original)
+++ trunk/widgets/misc/e-config-page.h Thu May 22 17:27:48 2008
@@ -57,7 +57,7 @@
};
-GtkType e_config_page_get_type (void);
+GType e_config_page_get_type (void);
GtkWidget *e_config_page_new (void);
#ifdef __cplusplus
Modified: trunk/widgets/misc/e-dateedit.c
==============================================================================
--- trunk/widgets/misc/e-dateedit.c (original)
+++ trunk/widgets/misc/e-dateedit.c Thu May 22 17:27:48 2008
@@ -125,7 +125,7 @@
EDateEditGetTimeCallback time_callback;
gpointer time_callback_data;
- GtkDestroyNotify time_callback_destroy;
+ GDestroyNotify time_callback_destroy;
gboolean twodigit_year_can_future;
};
@@ -219,7 +219,7 @@
/**
* e_date_edit_get_type:
*
- * Returns the GtkType for the EDateEdit widget
+ * Returns the GType for the EDateEdit widget
*/
GType
e_date_edit_get_type (void)
@@ -261,7 +261,7 @@
G_STRUCT_OFFSET (EDateEditClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
object_class->dispose = e_date_edit_dispose;
@@ -2153,7 +2153,7 @@
e_date_edit_set_get_time_callback (EDateEdit *dedit,
EDateEditGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
EDateEditPrivate *priv;
Modified: trunk/widgets/misc/e-dateedit.h
==============================================================================
--- trunk/widgets/misc/e-dateedit.h (original)
+++ trunk/widgets/misc/e-dateedit.h Thu May 22 17:27:48 2008
@@ -180,7 +180,7 @@
void e_date_edit_set_get_time_callback (EDateEdit *dedit,
EDateEditGetTimeCallback cb,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
GtkWidget* e_date_edit_get_entry (EDateEdit *dedit);
Modified: trunk/widgets/misc/e-dropdown-button.c
==============================================================================
--- trunk/widgets/misc/e-dropdown-button.c (original)
+++ trunk/widgets/misc/e-dropdown-button.c Thu May 22 17:27:48 2008
@@ -207,9 +207,9 @@
priv->menu = GTK_WIDGET (menu);
- gtk_signal_connect_while_alive (GTK_OBJECT (priv->menu), "deactivate",
- G_CALLBACK (menu_deactivate_cb),
- dropdown_button, GTK_OBJECT (dropdown_button));
+ g_signal_connect_object (priv->menu, "deactivate",
+ G_CALLBACK (menu_deactivate_cb),
+ dropdown_button, 0);
}
/**
Modified: trunk/widgets/misc/e-dropdown-button.h
==============================================================================
--- trunk/widgets/misc/e-dropdown-button.h (original)
+++ trunk/widgets/misc/e-dropdown-button.h Thu May 22 17:27:48 2008
@@ -57,7 +57,7 @@
};
-GtkType e_dropdown_button_get_type (void);
+GType e_dropdown_button_get_type (void);
void e_dropdown_button_construct (EDropdownButton *dropdown_button,
const char *label_text,
GtkMenu *menu);
Modified: trunk/widgets/misc/e-filter-bar.c
==============================================================================
--- trunk/widgets/misc/e-filter-bar.c (original)
+++ trunk/widgets/misc/e-filter-bar.c Thu May 22 17:27:48 2008
@@ -924,24 +924,24 @@
pspec = g_param_spec_string ("state", NULL, NULL, NULL, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_STATE, pspec);
- /*gtk_object_add_arg_type ("EFilterBar::query", GTK_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);*/
+ /*gtk_object_add_arg_type ("EFilterBar::query", G_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);*/
#if 0
esb_signals [QUERY_CHANGED] =
- gtk_signal_new ("query_changed",
- GTK_RUN_LAST,
+ g_signal_new ("query_changed",
+ G_SIGNAL_RUN_LAST,
object_class->type,
G_STRUCT_OFFSET (EFilterBarClass, query_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
esb_signals [MENU_ACTIVATED] =
- gtk_signal_new ("menu_activated",
- GTK_RUN_LAST,
+ g_signal_new ("menu_activated",
+ G_SIGNAL_RUN_LAST,
object_class->type,
G_STRUCT_OFFSET (EFilterBarClass, menu_activated),
g_cclosure_marshal_VOID__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ G_TYPE_NONE, 1, G_TYPE_INT);
gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL);
#endif
@@ -1007,24 +1007,27 @@
}
-GtkType
+GType
e_filter_bar_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
- if (!type) {
- static const GtkTypeInfo info = {
- "EFilterBar",
- sizeof (EFilterBar),
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
sizeof (EFilterBarClass),
- (GtkClassInitFunc) class_init,
- (GtkObjectInitFunc) init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EFilterBar),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) init,
+ NULL /* value_table */
};
- type = gtk_type_unique (e_search_bar_get_type (), &info);
+ type = g_type_register_static (
+ e_search_bar_get_type (), "EFilterBar", &type_info, 0);
}
return type;
Modified: trunk/widgets/misc/e-gui-utils.c
==============================================================================
--- trunk/widgets/misc/e-gui-utils.c (original)
+++ trunk/widgets/misc/e-gui-utils.c Thu May 22 17:27:48 2008
@@ -164,11 +164,11 @@
GList *list;
list = g_list_copy(widgets);
g_list_foreach(list, (GFunc) g_object_ref, NULL);
- return gtk_signal_connect_full(GTK_OBJECT(container), "focus",
- GTK_SIGNAL_FUNC(e_container_change_tab_order_callback),
- NULL, list,
- e_container_change_tab_order_destroy_notify,
- FALSE, FALSE);
+ return g_signal_connect_data (container, "focus",
+ G_CALLBACK(e_container_change_tab_order_callback),
+ list,
+ (GClosureNotify) e_container_change_tab_order_destroy_notify,
+ 0);
}
struct widgetandint {
Modified: trunk/widgets/misc/e-gui-utils.h
==============================================================================
--- trunk/widgets/misc/e-gui-utils.h (original)
+++ trunk/widgets/misc/e-gui-utils.h Thu May 22 17:27:48 2008
@@ -47,7 +47,7 @@
gboolean e_glade_xml_connect_widget (GladeXML *gui,
char *name,
char *signal,
- GtkSignalFunc cb,
+ GCallback cb,
gpointer closure);
gboolean e_glade_xml_set_sensitive (GladeXML *gui,
char *name,
Modified: trunk/widgets/misc/e-image-chooser.c
==============================================================================
--- trunk/widgets/misc/e-image-chooser.c (original)
+++ trunk/widgets/misc/e-image-chooser.c Thu May 22 17:27:48 2008
@@ -139,7 +139,7 @@
G_STRUCT_OFFSET (EImageChooserClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
/*
object_class->set_property = e_image_chooser_set_property;
Modified: trunk/widgets/misc/e-map.c
==============================================================================
--- trunk/widgets/misc/e-map.c (original)
+++ trunk/widgets/misc/e-map.c Thu May 22 17:27:48 2008
@@ -132,29 +132,30 @@
* Return value: The type ID of the #EMap class.
**/
-GtkType
+GType
e_map_get_type (void)
{
- static GtkType e_map_type = 0;
+ static GType type = 0;
- if (!e_map_type)
- {
- static const GtkTypeInfo e_map_info =
- {
- "EMap",
- sizeof (EMap),
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
sizeof (EMapClass),
- (GtkClassInitFunc) e_map_class_init,
- (GtkObjectInitFunc) e_map_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) e_map_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EMap),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) e_map_init,
+ NULL /* value_table */
};
- e_map_type = gtk_type_unique (GTK_TYPE_WIDGET, &e_map_info);
+ type = g_type_register_static (
+ GTK_TYPE_WIDGET, "EMap", &type_info, 0);
}
- return e_map_type;
+ return type;
}
/* Class initialization function for the map view */
Modified: trunk/widgets/misc/e-map.h
==============================================================================
--- trunk/widgets/misc/e-map.h (original)
+++ trunk/widgets/misc/e-map.h Thu May 22 17:27:48 2008
@@ -69,7 +69,7 @@
/* --- Widget --- */
-GtkType e_map_get_type (void);
+GType e_map_get_type (void);
EMap *e_map_new (void);
Modified: trunk/widgets/misc/e-multi-config-dialog.h
==============================================================================
--- trunk/widgets/misc/e-multi-config-dialog.h (original)
+++ trunk/widgets/misc/e-multi-config-dialog.h Thu May 22 17:27:48 2008
@@ -59,7 +59,7 @@
};
-GtkType e_multi_config_dialog_get_type (void);
+GType e_multi_config_dialog_get_type (void);
GtkWidget *e_multi_config_dialog_new (void);
void e_multi_config_dialog_add_page (EMultiConfigDialog *dialog,
Modified: trunk/widgets/misc/e-popup-menu.h
==============================================================================
--- trunk/widgets/misc/e-popup-menu.h (original)
+++ trunk/widgets/misc/e-popup-menu.h Thu May 22 17:27:48 2008
@@ -97,7 +97,7 @@
struct _EPopupMenu {
char *name;
char *pixname;
- GtkSignalFunc fn;
+ GCallback fn;
EPopupMenu *submenu;
guint32 disable_mask;
Modified: trunk/widgets/misc/e-printable.h
==============================================================================
--- trunk/widgets/misc/e-printable.h (original)
+++ trunk/widgets/misc/e-printable.h Thu May 22 17:27:48 2008
@@ -61,7 +61,7 @@
gboolean (*will_fit) (EPrintable *etm, GtkPrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
} EPrintableClass;
-GtkType e_printable_get_type (void);
+GType e_printable_get_type (void);
EPrintable *e_printable_new (void);
Modified: trunk/widgets/misc/e-reflow.h
==============================================================================
--- trunk/widgets/misc/e-reflow.h (original)
+++ trunk/widgets/misc/e-reflow.h Thu May 22 17:27:48 2008
@@ -138,7 +138,7 @@
* should also do an ECanvas parent reflow request if its size
* changes.
*/
-GtkType e_reflow_get_type (void);
+GType e_reflow_get_type (void);
#ifdef __cplusplus
}
Modified: trunk/widgets/misc/e-send-options.h
==============================================================================
--- trunk/widgets/misc/e-send-options.h (original)
+++ trunk/widgets/misc/e-send-options.h Thu May 22 17:27:48 2008
@@ -27,10 +27,10 @@
#include <time.h>
#define E_TYPE_SENDOPTIONS_DIALOG (e_sendoptions_dialog_get_type ())
-#define E_SENDOPTIONS_DIALOG(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SENDOPTIONS_DIALOG, ESendOptionsDialog))
-#define E_SENDOPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SENDOPTIONS_DIALOG, ESendOptionsDialogClass))
-#define E_IS_SENDOPTIONS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SENDOPTIONS_DIALOG))
-#define E_IS_SENDOPTIONS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SENDOPTIONS_DIALOG))
+#define E_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SENDOPTIONS_DIALOG, ESendOptionsDialog))
+#define E_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SENDOPTIONS_DIALOG, ESendOptionsDialogClass))
+#define E_IS_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SENDOPTIONS_DIALOG))
+#define E_IS_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_SENDOPTIONS_DIALOG))
typedef struct _ESendOptionsDialog ESendOptionsDialog;
typedef struct _ESendOptionsDialogClass ESendOptionsDialogClass;
Modified: trunk/widgets/misc/e-task-bar.h
==============================================================================
--- trunk/widgets/misc/e-task-bar.h (original)
+++ trunk/widgets/misc/e-task-bar.h Thu May 22 17:27:48 2008
@@ -33,10 +33,10 @@
#endif /* __cplusplus */
#define E_TYPE_TASK_BAR (e_task_bar_get_type ())
-#define E_TASK_BAR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TASK_BAR, ETaskBar))
-#define E_TASK_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TASK_BAR, ETaskBarClass))
-#define E_IS_TASK_BAR(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TASK_BAR))
-#define E_IS_TASK_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_TASK_BAR))
+#define E_TASK_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_BAR, ETaskBar))
+#define E_TASK_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TASK_BAR, ETaskBarClass))
+#define E_IS_TASK_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TASK_BAR))
+#define E_IS_TASK_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_TASK_BAR))
typedef struct _ETaskBar ETaskBar;
@@ -54,7 +54,7 @@
};
-GtkType e_task_bar_get_type (void);
+GType e_task_bar_get_type (void);
void e_task_bar_construct (ETaskBar *task_bar);
GtkWidget *e_task_bar_new (void);
Modified: trunk/widgets/misc/e-task-widget.h
==============================================================================
--- trunk/widgets/misc/e-task-widget.h (original)
+++ trunk/widgets/misc/e-task-widget.h Thu May 22 17:27:48 2008
@@ -32,10 +32,10 @@
#endif /* __cplusplus */
#define E_TYPE_TASK_WIDGET (e_task_widget_get_type ())
-#define E_TASK_WIDGET(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TASK_WIDGET, ETaskWidget))
-#define E_TASK_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TASK_WIDGET, ETaskWidgetClass))
-#define E_IS_TASK_WIDGET(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TASK_WIDGET))
-#define E_IS_TASK_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_TASK_WIDGET))
+#define E_TASK_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_WIDGET, ETaskWidget))
+#define E_TASK_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TASK_WIDGET, ETaskWidgetClass))
+#define E_IS_TASK_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TASK_WIDGET))
+#define E_IS_TASK_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_TASK_WIDGET))
typedef struct _ETaskWidget ETaskWidget;
@@ -54,7 +54,7 @@
};
-GtkType e_task_widget_get_type (void);
+GType e_task_widget_get_type (void);
void e_task_widget_construct (ETaskWidget *task_widget,
GdkPixbuf *icon_pixbuf,
const char *component_id,
Modified: trunk/widgets/misc/e-url-entry.c
==============================================================================
--- trunk/widgets/misc/e-url-entry.c (original)
+++ trunk/widgets/misc/e-url-entry.c Thu May 22 17:27:48 2008
@@ -36,56 +36,56 @@
GtkWidget *button;
};
-static void class_init (EUrlEntryClass *klass);
+static void class_init (EUrlEntryClass *class);
static void init (EUrlEntry *url_entry);
-static void destroy (GtkObject *obj);
+static void finalize (GObject *object);
static void button_clicked_cb (GtkWidget *widget, gpointer data);
static void entry_changed_cb (GtkEditable *editable, gpointer data);
static gboolean mnemonic_activate (GtkWidget *widget, gboolean group_cycling);
-static GtkHBoxClass *parent_class = NULL;
+static gpointer parent_class = NULL;
-GtkType
+GType
e_url_entry_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
- if (type == 0)
- {
- static const GtkTypeInfo info =
- {
- "EUrlEntry",
- sizeof (EUrlEntry),
- sizeof (EUrlEntryClass),
- (GtkClassInitFunc) class_init,
- (GtkObjectInitFunc) init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EUrlEntryClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EUrlEntry),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) init,
+ NULL /* value_table */
+ };
- type = gtk_type_unique (gtk_hbox_get_type (), &info);
- }
+ type = g_type_register_static (
+ GTK_TYPE_HBOX, "EUrlEntry", &type_info, 0);
+ }
- return type;
+ return type;
}
static void
-class_init (EUrlEntryClass *klass)
+class_init (EUrlEntryClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
GtkWidgetClass *widget_class;
- object_class = GTK_OBJECT_CLASS (klass);
- widget_class = GTK_WIDGET_CLASS (klass);
-
- parent_class = g_type_class_ref(gtk_hbox_get_type ());
+ parent_class = g_type_class_peek_parent (class);
- object_class->destroy = destroy;
+ object_class = G_OBJECT_CLASS (class);
+ object_class->finalize = finalize;
+ widget_class = GTK_WIDGET_CLASS (class);
widget_class->mnemonic_activate = mnemonic_activate;
}
@@ -119,17 +119,17 @@
}
static void
-destroy (GtkObject *obj)
+finalize (GObject *object)
{
EUrlEntry *url_entry;
- url_entry = E_URL_ENTRY (obj);
+ url_entry = E_URL_ENTRY (object);
if (url_entry->priv) {
g_free (url_entry->priv);
url_entry->priv = NULL;
}
- GTK_OBJECT_CLASS (parent_class)->destroy (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
/* GtkWidget::mnemonic_activate() handler for the EUrlEntry */
Modified: trunk/widgets/misc/e-url-entry.h
==============================================================================
--- trunk/widgets/misc/e-url-entry.h (original)
+++ trunk/widgets/misc/e-url-entry.h Thu May 22 17:27:48 2008
@@ -58,7 +58,7 @@
-GtkType e_url_entry_get_type (void);
+GType e_url_entry_get_type (void);
GtkWidget *e_url_entry_new (void);
GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry);
Modified: trunk/widgets/table/e-table-memory-callbacks.c
==============================================================================
--- trunk/widgets/table/e-table-memory-callbacks.c (original)
+++ trunk/widgets/table/e-table-memory-callbacks.c Thu May 22 17:27:48 2008
@@ -174,7 +174,7 @@
* This initializes a new ETableMemoryCalbacksModel object. ETableMemoryCalbacksModel is
* an implementaiton of the abstract class ETableModel. The ETableMemoryCalbacksModel
* is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
+ * to create a new GType derived from ETableModel every time they need one.
*
* Instead, ETableMemoryCalbacksModel uses a setup based in callback functions, every
* callback function signature mimics the signature of each ETableModel method
Modified: trunk/widgets/table/e-table-memory-store.c
==============================================================================
--- trunk/widgets/table/e-table-memory-store.c (original)
+++ trunk/widgets/table/e-table-memory-store.c Thu May 22 17:27:48 2008
@@ -286,7 +286,7 @@
* This initializes a new ETableMemoryStoreModel object. ETableMemoryStoreModel is
* an implementaiton of the abstract class ETableModel. The ETableMemoryStoreModel
* is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
+ * to create a new GType derived from ETableModel every time they need one.
*
* Instead, ETableMemoryStoreModel uses a setup based in callback functions, every
* callback function signature mimics the signature of each ETableModel method
Modified: trunk/widgets/table/e-table-model.c
==============================================================================
--- trunk/widgets/table/e-table-model.c (original)
+++ trunk/widgets/table/e-table-model.c Thu May 22 17:27:48 2008
@@ -398,7 +398,7 @@
return;
d(print_tabs());
- d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_PRE_CHANGE], 0);
@@ -428,7 +428,7 @@
return;
d(print_tabs());
- d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_NO_CHANGE], 0);
@@ -458,7 +458,7 @@
return;
d(print_tabs());
- d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type)));
+ d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type)));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_CHANGED], 0);
@@ -485,7 +485,7 @@
return;
d(print_tabs());
- d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_ROW_CHANGED], 0, row);
@@ -513,7 +513,7 @@
return;
d(print_tabs());
- d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col));
+ d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_CELL_CHANGED], 0, col, row);
@@ -541,7 +541,7 @@
return;
d(print_tabs());
- d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_ROWS_INSERTED], 0, row, count);
@@ -584,7 +584,7 @@
return;
d(print_tabs());
- d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
+ d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row));
d(depth++);
g_signal_emit (G_OBJECT (e_table_model),
e_table_model_signals [MODEL_ROWS_DELETED], 0, row, count);
Modified: trunk/widgets/table/e-table-simple.c
==============================================================================
--- trunk/widgets/table/e-table-simple.c (original)
+++ trunk/widgets/table/e-table-simple.c Thu May 22 17:27:48 2008
@@ -214,7 +214,7 @@
* This initializes a new ETableSimpleModel object. ETableSimpleModel is
* an implementaiton of the abstract class ETableModel. The ETableSimpleModel
* is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
+ * to create a new GType derived from ETableModel every time they need one.
*
* Instead, ETableSimpleModel uses a setup based in callback functions, every
* callback function signature mimics the signature of each ETableModel method
Modified: trunk/widgets/table/e-tree-memory-callbacks.c
==============================================================================
--- trunk/widgets/table/e-tree-memory-callbacks.c (original)
+++ trunk/widgets/table/e-tree-memory-callbacks.c Thu May 22 17:27:48 2008
@@ -225,7 +225,7 @@
* ETreeMemoryCallbacksModel is an implementaiton of the somewhat
* abstract class ETreeMemory. The ETreeMemoryCallbacksModel is
* designed to allow people to easily create ETreeMemorys without
- * having to create a new GtkType derived from ETreeMemory every time
+ * having to create a new GType derived from ETreeMemory every time
* they need one.
*
* Instead, ETreeMemoryCallbacksModel uses a setup based in callback functions, every
Modified: trunk/widgets/table/e-tree-model.c
==============================================================================
--- trunk/widgets/table/e-tree-model.c (original)
+++ trunk/widgets/table/e-tree-model.c Thu May 22 17:27:48 2008
@@ -216,7 +216,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [PRE_CHANGE], 0);
}
@@ -236,7 +236,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NO_CHANGE], 0);
}
@@ -256,7 +256,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_CHANGED], 0, node);
}
@@ -276,7 +276,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DATA_CHANGED], 0, node);
}
@@ -296,7 +296,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_COL_CHANGED], 0, node, col);
}
@@ -317,7 +317,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_INSERTED], 0,
parent_node, inserted_node);
@@ -337,7 +337,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REMOVED], 0,
parent_node, removed_node, old_position);
@@ -356,7 +356,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DELETED], 0, deleted_node);
}
@@ -374,7 +374,7 @@
g_return_if_fail (tree_model != NULL);
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type)));
+ d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type)));
g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REQUEST_COLLAPSE], 0, collapsed_node);
}
Modified: trunk/widgets/table/e-tree-simple.c
==============================================================================
--- trunk/widgets/table/e-tree-simple.c (original)
+++ trunk/widgets/table/e-tree-simple.c Thu May 22 17:27:48 2008
@@ -162,7 +162,7 @@
* This initializes a new ETreeSimpleModel object. ETreeSimpleModel is
* an implementaiton of the abstract class ETreeModel. The ETreeSimpleModel
* is designed to allow people to easily create ETreeModels without having
- * to create a new GtkType derived from ETreeModel every time they need one.
+ * to create a new GType derived from ETreeModel every time they need one.
*
* Instead, ETreeSimpleModel uses a setup based in callback functions, every
* callback function signature mimics the signature of each ETreeModel method
Modified: trunk/widgets/text/e-text.h
==============================================================================
--- trunk/widgets/text/e-text.h (original)
+++ trunk/widgets/text/e-text.h Thu May 22 17:27:48 2008
@@ -232,7 +232,7 @@
/* Standard Gtk function */
-GtkType e_text_get_type (void);
+GType e_text_get_type (void);
void e_text_cancel_editing (EText *text);
void e_text_stop_editing (EText *text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]