./hildon-1/ubuntu r72: merge cjwatsons fixes for version 2.0.1-1ubuntu7
Oliver Grawert
ogra at ubuntu.com
Thu Nov 27 11:32:14 UTC 2008
------------------------------------------------------------
revno: 72
committer: Oliver Grawert <ogra at ubuntu.com>
branch nick: ubuntu
timestamp: Thu 2008-11-27 12:32:14 +0100
message:
merge cjwatsons fixes for version 2.0.1-1ubuntu7
added:
debian/patches/06-gtk-deprecated.patch
modified:
debian/changelog
debian/control
------------------------------------------------------------
revno: 71.1.1
committer: Colin Watson <cjwatson at canonical.com>
branch nick: libhildon
timestamp: Wed 2008-11-26 18:18:37 +0000
message:
add Vcs-Bzr field for Ubuntu
modified:
debian/control
------------------------------------------------------------
revno: 71.1.2
committer: Colin Watson <cjwatson at canonical.com>
branch nick: libhildon
timestamp: Wed 2008-11-26 23:31:41 +0000
message:
06-gtk-deprecated.patch: Update header files to avoid using deprecated
GTK macros, which caused libhildonhelp to fail to build (LP: #300007).
added:
debian/patches/06-gtk-deprecated.patch
modified:
debian/changelog
------------------------------------------------------------
revno: 71.1.3
committer: Colin Watson <cjwatson at canonical.com>
branch nick: libhildon
timestamp: Wed 2008-11-26 23:33:46 +0000
message:
releasing version 2.0.1-1ubuntu7
modified:
debian/changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-04-16 16:29:29 +0000
+++ b/debian/changelog 2008-11-26 23:33:46 +0000
@@ -1,3 +1,10 @@
+libhildon (2.0.1-1ubuntu7) jaunty; urgency=low
+
+ * 06-gtk-deprecated.patch: Update header files to avoid using deprecated
+ GTK macros, which caused libhildonhelp to fail to build (LP: #300007).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Wed, 26 Nov 2008 23:31:55 +0000
+
libhildon (2.0.1-1ubuntu6) hardy; urgency=low
* Fix the mess I made.
=== modified file 'debian/control'
--- a/debian/control 2008-01-29 19:40:07 +0000
+++ b/debian/control 2008-11-26 18:18:37 +0000
@@ -5,6 +5,7 @@
Maintainer: Ubuntu Mobile Developers <ubuntu-mobile at lists.ubuntu.com>
Build-Depends: debhelper (>= 5.0.0), cdbs, pkg-config, libgtk2.0-dev (>= 2.10), libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools, libesd0-dev, automake
Standards-Version: 3.6.0
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-mobile/hildon-1/ubuntu
Package: libhildon-1-dev
Section: devel
=== added file 'debian/patches/06-gtk-deprecated.patch'
--- a/debian/patches/06-gtk-deprecated.patch 1970-01-01 00:00:00 +0000
+++ b/debian/patches/06-gtk-deprecated.patch 2008-11-26 23:31:41 +0000
@@ -0,0 +1,567 @@
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-calendar-popup.h libhildon.new/src/hildon-calendar-popup.h
+--- libhildon/src/hildon-calendar-popup.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-calendar-popup.h 2008-11-26 23:19:42.000000000 +0000
+@@ -36,17 +36,17 @@
+ #define HILDON_TYPE_CALENDAR_POPUP \
+ (hildon_calendar_popup_get_type())
+
+-#define HILDON_CALENDAR_POPUP(obj) (GTK_CHECK_CAST (obj,\
++#define HILDON_CALENDAR_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_CALENDAR_POPUP, HildonCalendarPopup))
+
+-#define HILDON_CALENDAR_POPUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
++#define HILDON_CALENDAR_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ HILDON_TYPE_CALENDAR_POPUP, HildonCalendarPopupClass))
+
+-#define HILDON_IS_CALENDAR_POPUP(obj) (GTK_CHECK_TYPE (obj,\
++#define HILDON_IS_CALENDAR_POPUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\
+ HILDON_TYPE_CALENDAR_POPUP))
+
+ #define HILDON_IS_CALENDAR_POPUP_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CALENDAR_POPUP))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CALENDAR_POPUP))
+
+ #define HILDON_CALENDAR_POPUP_GET_CLASS(obj) \
+ ((HildonCalendarPopupClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-caption.h libhildon.new/src/hildon-caption.h
+--- libhildon/src/hildon-caption.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-caption.h 2008-11-26 23:19:42.000000000 +0000
+@@ -40,17 +40,17 @@
+ #define HILDON_TYPE_CAPTION (hildon_caption_get_type())
+
+ #define HILDON_CAPTION(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_CAPTION, HildonCaption))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_CAPTION, HildonCaption))
+
+ #define HILDON_CAPTION_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_CAPTION, HildonCaptionClass))
+
+ #define HILDON_IS_CAPTION(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_CAPTION))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CAPTION))
+
+ #define HILDON_IS_CAPTION_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CAPTION))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CAPTION))
+
+ /**
+ * HildonCaptionStatus:
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-code-dialog.h libhildon.new/src/hildon-code-dialog.h
+--- libhildon/src/hildon-code-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-code-dialog.h 2008-11-26 23:19:42.000000000 +0000
+@@ -33,17 +33,17 @@
+ (hildon_code_dialog_get_type())
+
+ #define HILDON_CODE_DIALOG(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_CODE_DIALOG, HildonCodeDialog))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_CODE_DIALOG, HildonCodeDialog))
+
+ #define HILDON_CODE_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_CODE_DIALOG, HildonCodeDialogClass))
+
+ #define HILDON_IS_CODE_DIALOG(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_CODE_DIALOG))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CODE_DIALOG))
+
+ #define HILDON_IS_CODE_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CODE_DIALOG))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_CODE_DIALOG))
+
+ #define HILDON_CODE_DIALOG_GET_CLASS(obj) \
+ ((HildonCodeDialogClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-controlbar.h libhildon.new/src/hildon-controlbar.h
+--- libhildon/src/hildon-controlbar.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-controlbar.h 2008-11-26 23:19:43.000000000 +0000
+@@ -32,18 +32,18 @@
+ #define HILDON_TYPE_CONTROLBAR \
+ (hildon_controlbar_get_type())
+
+-#define HILDON_CONTROLBAR(obj) (GTK_CHECK_CAST (obj,\
++#define HILDON_CONTROLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_CONTROLBAR, HildonControlbar))
+
+ #define HILDON_CONTROLBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_CONTROLBAR, HildonControlbarClass))
+
+ #define HILDON_IS_CONTROLBAR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_CONTROLBAR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_CONTROLBAR))
+
+ #define HILDON_IS_CONTROLBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass),\
++ (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+ HILDON_TYPE_CONTROLBAR))
+
+ #define HILDON_CONTROLBAR_GET_CLASS(obj) \
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-date-editor.h libhildon.new/src/hildon-date-editor.h
+--- libhildon/src/hildon-date-editor.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-date-editor.h 2008-11-26 23:19:43.000000000 +0000
+@@ -34,19 +34,19 @@
+ (hildon_date_editor_get_type())
+
+ #define HILDON_DATE_EDITOR(obj) \
+- (GTK_CHECK_CAST (obj,\
++ (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_DATE_EDITOR, HildonDateEditor))
+
+ #define HILDON_DATE_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_DATE_EDITOR, HildonDateEditorClass))
+
+ #define HILDON_IS_DATE_EDITOR(obj) \
+- (GTK_CHECK_TYPE (obj,\
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj,\
+ HILDON_TYPE_DATE_EDITOR))
+
+ #define HILDON_IS_DATE_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass),\
++ (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+ HILDON_TYPE_DATE_EDITOR))
+
+ typedef struct _HildonDateEditor HildonDateEditor;
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-get-password-dialog.h libhildon.new/src/hildon-get-password-dialog.h
+--- libhildon/src/hildon-get-password-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-get-password-dialog.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,18 +33,18 @@
+ (hildon_get_password_dialog_get_type())
+
+ #define HILDON_GET_PASSWORD_DIALOG(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_GET_PASSWORD_DIALOG,\
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_GET_PASSWORD_DIALOG,\
+ HildonGetPasswordDialog))
+
+ #define HILDON_GET_PASSWORD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG, \
+ HildonGetPasswordDialogClass))
+
+ #define HILDON_IS_GET_PASSWORD_DIALOG(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_GET_PASSWORD_DIALOG))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_GET_PASSWORD_DIALOG))
+
+ #define HILDON_IS_GET_PASSWORD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_GET_PASSWORD_DIALOG))
+
+ typedef struct _HildonGetPasswordDialog HildonGetPasswordDialog;
+
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-hvolumebar.h libhildon.new/src/hildon-hvolumebar.h
+--- libhildon/src/hildon-hvolumebar.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-hvolumebar.h 2008-11-26 23:19:43.000000000 +0000
+@@ -31,17 +31,17 @@
+
+ #define HILDON_TYPE_HVOLUMEBAR (hildon_hvolumebar_get_type())
+
+-#define HILDON_HVOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
++#define HILDON_HVOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_HVOLUMEBAR, HildonHVolumebar))
+
+ #define HILDON_HVOLUMEBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_HVOLUMEBAR, HildonHVolumebarClass))
+
+-#define HILDON_IS_HVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\
++#define HILDON_IS_HVOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\
+ HILDON_TYPE_HVOLUMEBAR))
+
+-#define HILDON_IS_HVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),\
++#define HILDON_IS_HVOLUMEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+ HILDON_TYPE_HVOLUMEBAR))
+
+ #define HILDON_HVOLUMEBAR_GET_CLASS(obj) \
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-login-dialog.h libhildon.new/src/hildon-login-dialog.h
+--- libhildon/src/hildon-login-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-login-dialog.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,18 +33,18 @@
+ (hildon_login_dialog_get_type ())
+
+ #define HILDON_LOGIN_DIALOG(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_LOGIN_DIALOG, \
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_LOGIN_DIALOG, \
+ HildonLoginDialog))
+
+ #define HILDON_LOGIN_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_LOGIN_DIALOG, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_LOGIN_DIALOG, \
+ HildonLoginDialogClass))
+
+ #define HILDON_IS_LOGIN_DIALOG(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_LOGIN_DIALOG))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_LOGIN_DIALOG))
+
+ #define HILDON_IS_LOGIN_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), \
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ HILDON_TYPE_LOGIN_DIALOG))
+
+ typedef struct _HildonLoginDialog HildonLoginDialog;
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-note.h libhildon.new/src/hildon-note.h
+--- libhildon/src/hildon-note.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-note.h 2008-11-26 23:19:43.000000000 +0000
+@@ -34,17 +34,17 @@
+ (hildon_note_get_type())
+
+ #define HILDON_NOTE(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_NOTE, HildonNote))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_NOTE, HildonNote))
+
+ #define HILDON_NOTE_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ HILDON_TYPE_NOTE, HildonNoteClass))
+
+ #define HILDON_IS_NOTE(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_NOTE))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_NOTE))
+
+ #define HILDON_IS_NOTE_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NOTE))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NOTE))
+
+ typedef struct _HildonNote HildonNote;
+
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-number-editor.h libhildon.new/src/hildon-number-editor.h
+--- libhildon/src/hildon-number-editor.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-number-editor.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,17 +33,17 @@
+ (hildon_number_editor_get_type())
+
+ #define HILDON_NUMBER_EDITOR(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor))
+
+ #define HILDON_NUMBER_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, \
+ HildonNumberEditorClass))
+
+ #define HILDON_IS_NUMBER_EDITOR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR))
+
+ #define HILDON_IS_NUMBER_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR))
+
+ #define HILDON_NUMBER_EDITOR_GET_CLASS(obj) \
+ ((HildonNumberEditorClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-range-editor.h libhildon.new/src/hildon-range-editor.h
+--- libhildon/src/hildon-range-editor.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-range-editor.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,17 +33,17 @@
+ (hildon_range_editor_get_type())
+
+ #define HILDON_RANGE_EDITOR(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_RANGE_EDITOR, HildonRangeEditor))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_RANGE_EDITOR, HildonRangeEditor))
+
+ #define HILDON_RANGE_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_RANGE_EDITOR, HildonRangeEditorClass))
+
+ #define HILDON_IS_RANGE_EDITOR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_RANGE_EDITOR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_RANGE_EDITOR))
+
+ #define HILDON_IS_RANGE_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_RANGE_EDITOR))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_RANGE_EDITOR))
+
+ #define HILDON_RANGE_EDITOR_GET_CLASS(obj) \
+ ((HildonRangeEditorClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-seekbar.h libhildon.new/src/hildon-seekbar.h
+--- libhildon/src/hildon-seekbar.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-seekbar.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,18 +33,18 @@
+ (hildon_seekbar_get_type())
+
+ #define HILDON_SEEKBAR(obj) \
+- (GTK_CHECK_CAST (obj,\
++ (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_SEEKBAR, HildonSeekbar))
+
+ #define HILDON_SEEKBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_SEEKBAR, HildonSeekbarClass))
+
+ #define HILDON_IS_SEEKBAR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_SEEKBAR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SEEKBAR))
+
+ #define HILDON_IS_SEEKBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass),\
++ (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+ HILDON_TYPE_SEEKBAR))
+
+ #define HILDON_SEEKBAR_GET_CLASS(obj) \
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-set-password-dialog.h libhildon.new/src/hildon-set-password-dialog.h
+--- libhildon/src/hildon-set-password-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-set-password-dialog.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,18 +33,18 @@
+ (hildon_set_password_dialog_get_type())
+
+ #define HILDON_SET_PASSWORD_DIALOG(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_SET_PASSWORD_DIALOG,\
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_SET_PASSWORD_DIALOG,\
+ HildonSetPasswordDialog))
+
+ #define HILDON_SET_PASSWORD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG, \
+ HildonSetPasswordDialogClass))
+
+ #define HILDON_IS_SET_PASSWORD_DIALOG(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_SET_PASSWORD_DIALOG))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SET_PASSWORD_DIALOG))
+
+ #define HILDON_IS_SET_PASSWORD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SET_PASSWORD_DIALOG))
+
+ typedef struct _HildonSetPasswordDialog HildonSetPasswordDialog;
+
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-sort-dialog.h libhildon.new/src/hildon-sort-dialog.h
+--- libhildon/src/hildon-sort-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-sort-dialog.h 2008-11-26 23:19:43.000000000 +0000
+@@ -38,17 +38,17 @@
+ (hildon_sort_dialog_get_type())
+
+ #define HILDON_SORT_DIALOG(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_SORT_DIALOG, HildonSortDialog))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_SORT_DIALOG, HildonSortDialog))
+
+ #define HILDON_SORT_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SORT_DIALOG, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_SORT_DIALOG, \
+ HildonSortDialogClass))
+
+ #define HILDON_IS_SORT_DIALOG(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_SORT_DIALOG))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_SORT_DIALOG))
+
+ #define HILDON_IS_SORT_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SORT_DIALOG))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_SORT_DIALOG))
+
+ #define HILDON_SORT_DIALOG_GET_CLASS(obj) \
+ ((HildonSortDialogClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-time-editor.h libhildon.new/src/hildon-time-editor.h
+--- libhildon/src/hildon-time-editor.h 2008-11-26 18:18:03.000000000 +0000
++++ libhildon.new/src/hildon-time-editor.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,17 +33,17 @@
+ (hildon_time_editor_get_type())
+
+ #define HILDON_TIME_EDITOR(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_TIME_EDITOR, HildonTimeEditor))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_TIME_EDITOR, HildonTimeEditor))
+
+ #define HILDON_TIME_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_TIME_EDITOR, \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), HILDON_TYPE_TIME_EDITOR, \
+ HildonTimeEditorClass))
+
+ #define HILDON_IS_TIME_EDITOR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_TIME_EDITOR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_TIME_EDITOR))
+
+ #define HILDON_IS_TIME_EDITOR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_TIME_EDITOR))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_TIME_EDITOR))
+
+ typedef enum
+ {
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-time-picker.h libhildon.new/src/hildon-time-picker.h
+--- libhildon/src/hildon-time-picker.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-time-picker.h 2008-11-26 23:19:43.000000000 +0000
+@@ -37,21 +37,21 @@
+ (hildon_time_picker_get_type())
+
+ #define HILDON_TIME_PICKER(obj) \
+- (GTK_CHECK_CAST (obj, \
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, \
+ HILDON_TYPE_TIME_PICKER, \
+ HildonTimePicker))
+
+ #define HILDON_TIME_PICKER_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ HILDON_TYPE_TIME_PICKER,\
+ HildonTimePickerClass))
+
+ #define HILDON_IS_TIME_PICKER(obj) \
+- (GTK_CHECK_TYPE (obj, \
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, \
+ HILDON_TYPE_TIME_PICKER))
+
+ #define HILDON_IS_TIME_PICKER_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass),\
++ (G_TYPE_CHECK_CLASS_TYPE ((klass),\
+ HILDON_TYPE_TIME_PICKER))
+
+ #define HILDON_TIME_PICKER_GET_CLASS(obj) \
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-volumebar-range.h libhildon.new/src/hildon-volumebar-range.h
+--- libhildon/src/hildon-volumebar-range.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-volumebar-range.h 2008-11-26 23:19:43.000000000 +0000
+@@ -38,19 +38,19 @@
+ (hildon_volumebar_range_get_type())
+
+ #define HILDON_VOLUMEBAR_RANGE(obj) \
+- (GTK_CHECK_CAST (obj,\
++ (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_VOLUMEBAR_RANGE, HildonVolumebarRange))
+
+ #define HILDON_VOLUMEBAR_RANGE_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_VOLUMEBAR_RANGE, HildonVolumebarRangeClass))
+
+ #define HILDON_IS_VOLUMEBAR_RANGE(obj) \
+- (GTK_CHECK_TYPE (obj,\
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj,\
+ HILDON_TYPE_VOLUMEBAR_RANGE))
+
+ #define HILDON_IS_VOLUMEBAR_RANGE_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), \
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ HILDON_TYPE_VOLUMEBAR_RANGE))
+
+ typedef struct _HildonVolumebarRange HildonVolumebarRange;
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-volumebar.h libhildon.new/src/hildon-volumebar.h
+--- libhildon/src/hildon-volumebar.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-volumebar.h 2008-11-26 23:19:43.000000000 +0000
+@@ -34,18 +34,18 @@
+ #define HILDON_TYPE_VOLUMEBAR \
+ (hildon_volumebar_get_type())
+
+-#define HILDON_VOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
++#define HILDON_VOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj,\
+ HILDON_TYPE_VOLUMEBAR, HildonVolumebar))
+
+ #define HILDON_VOLUMEBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_VOLUMEBAR, HildonVolumebarClass))
+
+-#define HILDON_IS_VOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\
++#define HILDON_IS_VOLUMEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj,\
+ HILDON_TYPE_VOLUMEBAR))
+
+ #define HILDON_IS_VOLUMEBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VOLUMEBAR))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VOLUMEBAR))
+
+ #define HILDON_VOLUMEBAR_GET_CLASS(obj) \
+ ((HildonVolumebarClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-vvolumebar.h libhildon.new/src/hildon-vvolumebar.h
+--- libhildon/src/hildon-vvolumebar.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-vvolumebar.h 2008-11-26 23:19:43.000000000 +0000
+@@ -33,17 +33,17 @@
+ (hildon_vvolumebar_get_type())
+
+ #define HILDON_VVOLUMEBAR(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar))
+
+ #define HILDON_VVOLUMEBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_VVOLUMEBAR, HildonVVolumebarClass))
+
+ #define HILDON_IS_VVOLUMEBAR(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_VVOLUMEBAR))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_VVOLUMEBAR))
+
+ #define HILDON_IS_VVOLUMEBAR_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR))
+
+ #define HILDON_VVOLUMEBAR_GET_CLASS(obj) \
+ ((HildonVVolumebarClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-weekday-picker.h libhildon.new/src/hildon-weekday-picker.h
+--- libhildon/src/hildon-weekday-picker.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-weekday-picker.h 2008-11-26 23:19:43.000000000 +0000
+@@ -37,18 +37,18 @@
+ (hildon_weekday_picker_get_type())
+
+ #define HILDON_WEEKDAY_PICKER(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_WEEKDAY_PICKER, \
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_WEEKDAY_PICKER, \
+ HildonWeekdayPicker))
+
+ #define HILDON_WEEKDAY_PICKER_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ HILDON_TYPE_WEEKDAY_PICKER, HildonWeekdayPickerClass))
+
+ #define HILDON_IS_WEEKDAY_PICKER(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_WEEKDAY_PICKER))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_WEEKDAY_PICKER))
+
+ #define HILDON_IS_WEEKDAY_PICKER_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WEEKDAY_PICKER))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WEEKDAY_PICKER))
+
+ #define HILDON_WEEKDAY_PICKER_GET_CLASS(obj) \
+ ((HildonWeekdayPickerClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-window.h libhildon.new/src/hildon-window.h
+--- libhildon/src/hildon-window.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-window.h 2008-11-26 23:19:43.000000000 +0000
+@@ -42,17 +42,17 @@
+ (hildon_window_get_type())
+
+ #define HILDON_WINDOW(obj) \
+- (GTK_CHECK_CAST (obj, HILDON_TYPE_WINDOW, HildonWindow))
++ (G_TYPE_CHECK_INSTANCE_CAST (obj, HILDON_TYPE_WINDOW, HildonWindow))
+
+ #define HILDON_WINDOW_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass),\
++ (G_TYPE_CHECK_CLASS_CAST ((klass),\
+ HILDON_TYPE_WINDOW, HildonWindowClass))
+
+ #define HILDON_IS_WINDOW(obj) \
+- (GTK_CHECK_TYPE (obj, HILDON_TYPE_WINDOW))
++ (G_TYPE_CHECK_INSTANCE_TYPE (obj, HILDON_TYPE_WINDOW))
+
+ #define HILDON_IS_WINDOW_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW))
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW))
+
+ #define HILDON_WINDOW_GET_CLASS(obj) \
+ ((HildonWindowClass *) G_OBJECT_GET_CLASS(obj))
+diff -Nur -x '*.orig' -x '*~' libhildon/src/hildon-wizard-dialog.h libhildon.new/src/hildon-wizard-dialog.h
+--- libhildon/src/hildon-wizard-dialog.h 2008-11-26 18:22:33.000000000 +0000
++++ libhildon.new/src/hildon-wizard-dialog.h 2008-11-26 23:19:43.000000000 +0000
+@@ -36,19 +36,19 @@
+ #define HILDON_TYPE_WIZARD_DIALOG \
+ (hildon_wizard_dialog_get_type())
+
+-#define HILDON_WIZARD_DIALOG(obj) (GTK_CHECK_CAST ((obj), \
++#define HILDON_WIZARD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ HILDON_TYPE_WIZARD_DIALOG, HildonWizardDialog))
+
+ #define HILDON_WIZARD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_CAST ((klass), \
++ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ HILDON_TYPE_WIZARD_DIALOG, HildonWizardDialogClass))
+
+ #define HILDON_IS_WIZARD_DIALOG(obj) \
+- (GTK_CHECK_TYPE ((obj), \
++ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ HILDON_TYPE_WIZARD_DIALOG))
+
+ #define HILDON_IS_WIZARD_DIALOG_CLASS(klass) \
+- (GTK_CHECK_CLASS_TYPE ((klass), \
++ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ HILDON_TYPE_WIZARD_DIALOG))
+
+ typedef struct _HildonWizardDialog HildonWizardDialog;
More information about the pkg-maemo-commits
mailing list