diff -u libhildon-2.1.34.debian.1/debian/changelog libhildon-2.1.34.debian.1/debian/changelog --- libhildon-2.1.34.debian.1/debian/changelog +++ libhildon-2.1.34.debian.1/debian/changelog @@ -1,3 +1,24 @@ +libhildon (2.1.34.debian.1-5ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #427542): + - And fix debian/rules to not run the package managler during build. + - Added patch 04_hildon-1.hildon-banner-center.patch from Bob Spencer + to center hildon banner on screen to avoid flicker. + - 06-gtk-deprecated.patch: Update header files to avoid using deprecated + GTK macros, which caused libhildonhelp to fail to build. + - Change PACKAGE in po/Makefile.am so the .mo files are installed as + hildon-libs. + - Set hildon banner line wrap mode to support both word and character + boundary. + - Trucate strings longer than 78 characters, appending "...". + * Drop debian/patches/01-hildon-1.hildon-banner-wrap.patch: + applied upstream + * Drop 03_hildon-1.hildon-window-title.patch and + 0104-enable-password-po.patch: code changed to much doesn't look relevant. + * Rename remaning patch to avoid name conflics with debian patch + + -- Laurent Bigonville Thu, 10 Sep 2009 22:39:21 +0200 + libhildon (2.1.34.debian.1-5) unstable; urgency=low * debian/libhildon-1-dev.install: Only install gtk-doc files in the -doc @@ -64,6 +85,82 @@ -- Riku Voipio Sun, 01 Mar 2009 22:44:50 +0200 +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 Wed, 26 Nov 2008 23:31:55 +0000 + +libhildon (2.0.1-1ubuntu6) hardy; urgency=low + + * Fix the mess I made. + * Added patch 04_hildon-1.hildon-banner-center.patch from Bob Spencer + to center hildon banner on screen to avoid flicker. + + -- Steve Kowalik Thu, 17 Apr 2008 02:27:30 +1000 + +libhildon (2.0.1-1ubuntu5) hardy; urgency=low + + * And fix debian/rules to not run the package managler during build. + + -- Steve Kowalik Mon, 31 Mar 2008 17:34:55 +1100 + +libhildon (2.0.1-1ubuntu4) hardy; urgency=low + + * Add patches for the following: + - Change PACKAGE in po/Makefile.am so the .mo files are installed as + hildon-libs. + - Enable the translations for the password dialogs. + + -- Steve Kowalik Fri, 28 Mar 2008 15:39:55 +1100 + +libhildon (2.0.1-1ubuntu3) hardy; urgency=low + + * Ship usr/share/locale in libhildon-1-0 for now; this will require + Replaces if it ever changes SONAME, but it's too little to create a + libhildon-common, or -data; should fix display of + "ecdg_ti_caption_separator" etc. in Modest, VNC viewer and friends; see + Maemo #2823. + + -- Loic Minier Tue, 25 Mar 2008 15:36:41 +0100 + +libhildon (2.0.1-1ubuntu2) hardy; urgency=low + + * Fix libhildon1 reference in debian/rules (LP: #189041) + + -- Steve Magoun Mon, 04 Feb 2008 15:21:14 -0500 + +libhildon (2.0.1-1ubuntu1) hardy; urgency=low + + [ Steve Kowalik ] + * New upstream version. + * Add simple-patchsys from CDBS, Build-Depend on CDBS. + * Fidget the Maintainer to fit the "standard" of Ubuntu Mobile Devlopers. + + [ Bob Spencer ] + * Added 3 patches: + - Set hildon banner line wrap mode to support both word and character + boundary. + - Trucate strings longer than 78 characters, appending "...". + - Remove application name from window titlebar, displaying window title + only. + + -- Steve Kowalik Thu, 31 Jan 2008 09:26:01 +1100 + +libhildon (2.0.1-1) unstable; urgency=low + + * Do not use PACKAGE_VERSION_MAJOR for the API revision. + + -- Xan Lopez Thu, 10 Jan 2008 16:31:15 +0200 + +libhildon (2.0.0-1) unstable; urgency=low + + * Fixes: NB#78616: breadcrumb trail node removal logic fix. + * Fixes: NB#75310: add missing outer-border style property to HildonColorChooser. + + -- Xan Lopez Wed, 09 Jan 2008 14:27:08 +0200 + libhildon (1.99.1.debian.1-1) unstable; urgency=low [ Loic Minier ] diff -u libhildon-2.1.34.debian.1/debian/control libhildon-2.1.34.debian.1/debian/control --- libhildon-2.1.34.debian.1/debian/control +++ libhildon-2.1.34.debian.1/debian/control @@ -1,7 +1,7 @@ Source: libhildon Section: x11 Priority: optional -Maintainer: Debian Maemo Maintainers +Maintainer: Ubuntu Mobile Developers XSBC-Original-Maintainer: Michael Dominic Kostrzewa Uploaders: Loic Minier , Jonny Lamb , Riku Voipio Build-Depends: debhelper (>= 5.0.0), @@ -20,6 +20,7 @@ Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/pkg-maemo/libhildon.git Vcs-Browser: http://git.debian.org/?p=pkg-maemo/libhildon.git;a=summary +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-mobile/hildon-1/ubuntu Package: libhildon-1-dev Section: libdevel diff -u libhildon-2.1.34.debian.1/debian/rules libhildon-2.1.34.debian.1/debian/rules --- libhildon-2.1.34.debian.1/debian/rules +++ libhildon-2.1.34.debian.1/debian/rules @@ -10,6 +10,9 @@ SOURCE_DIR := $(CURDIR) +# We want to ship .mo files and the like +export NO_PKG_MANGLE=1 + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -33,6 +36,9 @@ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +endif +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 else CFLAGS += -O2 endif @@ -121,7 +127,7 @@ dh_strip --dbg-package="libhildon-1-0-dbg" dh_compress dh_fixperms - dh_makeshlibs -V "libhildon-1-0 (>= 1.99)" + dh_makeshlibs -V "libhildon-1-0 (>= 2.0.1)" dh_installdeb dh_shlibdeps dh_gencontrol diff -u libhildon-2.1.34.debian.1/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch libhildon-2.1.34.debian.1/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch --- libhildon-2.1.34.debian.1/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch +++ libhildon-2.1.34.debian.1/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch @@ -11,8 +11,6 @@ src/hildon-gtk.h | 16 ++++++++++++++ 3 files changed, 80 insertions(+), 0 deletions(-) -diff --git a/src/hildon-dialog.c b/src/hildon-dialog.c -index 4d0e68c..d4ade35 100644 --- a/src/hildon-dialog.c +++ b/src/hildon-dialog.c @@ -65,6 +65,9 @@ @@ -25,7 +23,7 @@ static void hildon_dialog_class_init (HildonDialogClass *dialog_class) { -@@ -180,7 +183,11 @@ hildon_dialog_add_button (HildonDialog *dialog, +@@ -180,7 +183,11 @@ { GtkWidget *button; button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_text, response_id); @@ -37,8 +35,6 @@ } /** -diff --git a/src/hildon-gtk.c b/src/hildon-gtk.c -index e64bf0f..e25b721 100644 --- a/src/hildon-gtk.c +++ b/src/hildon-gtk.c @@ -29,6 +29,63 @@ @@ -105,8 +101,6 @@ static void image_visible_changed_cb (GtkWidget *image, GParamSpec *arg1, -diff --git a/src/hildon-gtk.h b/src/hildon-gtk.h -index 15dd935..fc36d0e 100644 --- a/src/hildon-gtk.h +++ b/src/hildon-gtk.h @@ -21,6 +21,22 @@ diff -u libhildon-2.1.34.debian.1/debian/patches/series libhildon-2.1.34.debian.1/debian/patches/series --- libhildon-2.1.34.debian.1/debian/patches/series +++ libhildon-2.1.34.debian.1/debian/patches/series @@ -1,0 +2,4 @@ +0102_hildon-1.hildon-banner-trim80.patch +0104_hildon-1.hildon-banner-center.patch +0105-change-package-po-name.patch +0106-gtk-deprecated.patch only in patch2: unchanged: --- libhildon-2.1.34.debian.1.orig/debian/patches/0102_hildon-1.hildon-banner-trim80.patch +++ libhildon-2.1.34.debian.1/debian/patches/0102_hildon-1.hildon-banner-trim80.patch @@ -0,0 +1,17 @@ +--- a/src/hildon-banner.c ++++ b/src/hildon-banner.c +@@ -1143,8 +1143,13 @@ + if (existing_text != NULL && + text != NULL && + strcmp (existing_text, text) != 0) { ++ if (strlen (text) > 80) { ++ gchar *dest_text = g_strndup (text, 80); ++ gtk_label_set_text (label, g_strconcat (dest_text, "...", NULL)); ++ } else { + gtk_label_set_text (label, text); +- hildon_banner_reset_wrap_state (self); ++ } ++ hildon_banner_reset_wrap_state (self); + } + + hildon_banner_check_position (GTK_WIDGET (self)); only in patch2: unchanged: --- libhildon-2.1.34.debian.1.orig/debian/patches/0105-change-package-po-name.patch +++ libhildon-2.1.34.debian.1/debian/patches/0105-change-package-po-name.patch @@ -0,0 +1,10 @@ +--- a/po/Makefile.am ++++ b/po/Makefile.am +@@ -4,6 +4,7 @@ + EXTRA_DIST = $(foreach po,$(languages),$(po).po) POTFILES.in README + + MAINTAINERCLEANFILES = Makefile.in POTFILES ++PACKAGE := hildon-libs + + MO_FILE = $(PACKAGE)-libs + only in patch2: unchanged: --- libhildon-2.1.34.debian.1.orig/debian/patches/0104_hildon-1.hildon-banner-center.patch +++ libhildon-2.1.34.debian.1/debian/patches/0104_hildon-1.hildon-banner-center.patch @@ -0,0 +1,10 @@ +--- a/src/hildon-banner.c ++++ b/src/hildon-banner.c +@@ -1067,6 +1067,7 @@ + hildon_banner_bind_label_style (banner, NULL); + + /* And show it */ ++ gtk_window_set_position(GTK_WINDOW (banner), GTK_WIN_POS_CENTER_ALWAYS); + gtk_widget_show_all (GTK_WIDGET (banner)); + + return (GtkWidget *) banner; only in patch2: unchanged: --- libhildon-2.1.34.debian.1.orig/debian/patches/0106-gtk-deprecated.patch +++ libhildon-2.1.34.debian.1/debian/patches/0106-gtk-deprecated.patch @@ -0,0 +1,545 @@ +--- a/src/hildon-calendar-popup.h ++++ b/src/hildon-calendar-popup.h +@@ -38,17 +38,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)) +--- a/src/hildon-caption.h ++++ b/src/hildon-caption.h +@@ -38,17 +38,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: +--- a/src/hildon-code-dialog.h ++++ b/src/hildon-code-dialog.h +@@ -35,17 +35,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)) +--- a/src/hildon-controlbar.h ++++ b/src/hildon-controlbar.h +@@ -34,18 +34,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) \ +--- a/src/hildon-date-editor.h ++++ b/src/hildon-date-editor.h +@@ -37,19 +37,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; +--- a/src/hildon-get-password-dialog.h ++++ b/src/hildon-get-password-dialog.h +@@ -35,18 +35,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; + +--- a/src/hildon-hvolumebar.h ++++ b/src/hildon-hvolumebar.h +@@ -33,17 +33,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) \ +--- a/src/hildon-login-dialog.h ++++ b/src/hildon-login-dialog.h +@@ -35,18 +35,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; +--- a/src/hildon-note.h ++++ b/src/hildon-note.h +@@ -33,17 +33,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; + +--- a/src/hildon-number-editor.h ++++ b/src/hildon-number-editor.h +@@ -35,17 +35,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)) +--- a/src/hildon-range-editor.h ++++ b/src/hildon-range-editor.h +@@ -35,17 +35,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)) +--- a/src/hildon-seekbar.h ++++ b/src/hildon-seekbar.h +@@ -35,18 +35,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) \ +--- a/src/hildon-set-password-dialog.h ++++ b/src/hildon-set-password-dialog.h +@@ -35,18 +35,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; + +--- a/src/hildon-sort-dialog.h ++++ b/src/hildon-sort-dialog.h +@@ -40,17 +40,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)) +--- a/src/hildon-time-editor.h ++++ b/src/hildon-time-editor.h +@@ -35,17 +35,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 + { +--- a/src/hildon-time-picker.h ++++ b/src/hildon-time-picker.h +@@ -39,21 +39,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) \ +--- a/src/hildon-volumebar-range.h ++++ b/src/hildon-volumebar-range.h +@@ -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; +--- a/src/hildon-volumebar.h ++++ b/src/hildon-volumebar.h +@@ -36,18 +36,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)) +--- a/src/hildon-vvolumebar.h ++++ b/src/hildon-vvolumebar.h +@@ -35,17 +35,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)) +--- a/src/hildon-weekday-picker.h ++++ b/src/hildon-weekday-picker.h +@@ -39,18 +39,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)) +--- a/src/hildon-window.h ++++ b/src/hildon-window.h +@@ -35,17 +35,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)) +--- a/src/hildon-wizard-dialog.h ++++ b/src/hildon-wizard-dialog.h +@@ -33,19 +33,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;