[galeon] Remove deprecated symbols.
- From: Fabio Bonelli <fabiob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [galeon] Remove deprecated symbols.
- Date: Wed, 12 May 2010 16:47:23 +0000 (UTC)
commit ad89d8181799f4439b600adae5769f1c0b57e417
Author: Fabio Bonelli <fabiob src gnome org>
Date: Tue May 4 18:16:48 2010 +0200
Remove deprecated symbols.
bookmarks/bookmarks-add-dialog.h | 8 ++--
bookmarks/bookmarks-tree-model.c | 2 +-
bookmarks/bookmarks-tree-model.h | 2 +-
embed/downloader-view.h | 8 ++--
embed/galeon-embed-dialog.h | 8 ++--
embed/galeon-embed-event.h | 8 ++--
embed/galeon-embed-helper-list.h | 8 ++--
embed/galeon-embed-persist.h | 8 ++--
embed/galeon-embed-popup-control.h | 8 ++--
embed/galeon-embed-popup.h | 8 ++--
embed/galeon-embed-shell.h | 8 ++--
embed/js-console.c | 2 +-
embed/print-dialog.h | 8 ++--
gtkhtml/gtkhtml-embed-persist.h | 8 ++--
gtkhtml/gtkhtml-embed-shell.h | 8 ++--
gtkhtml/gtkhtml-embed.h | 8 ++--
libegg/dock/egg-dock-box.h | 10 +++---
libegg/dock/egg-dock-item-grip.c | 6 ++--
libegg/dock/egg-dock-item-grip.h | 10 +++---
libegg/dock/egg-dock-item.c | 36 ++++++++++++------------
libegg/dock/egg-dock-item.h | 10 +++---
libegg/dock/egg-dock-layout.c | 12 ++++----
libegg/dock/egg-dock-layout.h | 10 +++---
libegg/dock/egg-dock-master.h | 10 +++---
libegg/dock/egg-dock-notebook.h | 10 +++---
libegg/dock/egg-dock-object.h | 10 +++---
libegg/dock/egg-dock-paned.h | 10 +++---
libegg/dock/egg-dock-placeholder.h | 10 +++---
libegg/dock/egg-dock-tablabel.c | 6 ++--
libegg/dock/egg-dock-tablabel.h | 10 +++---
libegg/dock/egg-dock.c | 30 ++++++++++----------
libegg/dock/egg-dock.h | 10 +++---
mozilla/GtkNSSKeyPairDialogs.cpp | 3 +-
mozilla/mozilla-embed-persist.h | 8 ++--
mozilla/mozilla-embed-shell.cpp | 2 +-
mozilla/mozilla-embed-shell.h | 8 ++--
mozilla/mozilla-embed.h | 8 ++--
src/galeon-find-toolbar.c | 8 ++--
src/galeon-nautilus-view.c | 2 +-
src/galeon-nautilus-view.h | 8 ++--
src/galeon-popup.h | 8 ++--
src/galeon-prefs-dialog.c | 3 +-
src/galeon-shell.h | 8 ++--
src/galeon-spinner.h | 8 ++--
src/galeon-tab.h | 8 ++--
src/galeon-window.h | 8 ++--
src/history-dialog.h | 8 ++--
src/page-info-dialog.h | 8 ++--
src/pdm-dialog.h | 8 ++--
src/ppview-toolbar.h | 8 ++--
src/session.h | 8 ++--
src/statusbar.c | 27 ++++-------------
src/statusbar.h | 8 ++--
utils/galeon-dialog.h | 8 ++--
utils/galeon-sidebar.h | 8 ++--
utils/gul-download.c | 2 +-
utils/gul-ellipsizing-label.h | 10 +++---
utils/gul-gui.c | 2 +-
utils/gul-notebook.c | 2 +-
utils/gul-notebook.h | 8 ++--
utils/gul-toolbutton.c | 55 +++++++++++++++++------------------
utils/location-entry.c | 10 +++---
62 files changed, 284 insertions(+), 296 deletions(-)
---
diff --git a/bookmarks/bookmarks-add-dialog.h b/bookmarks/bookmarks-add-dialog.h
index 6100fe5..9199f41 100644
--- a/bookmarks/bookmarks-add-dialog.h
+++ b/bookmarks/bookmarks-add-dialog.h
@@ -30,10 +30,10 @@ typedef struct _GbAddDialog GbAddDialog;
typedef struct _GbAddDialogClass GbAddDialogClass;
#define GB_TYPE_ADD_DIALOG (gb_add_dialog_get_type ())
-#define GB_ADD_DIALOG(obj) (GTK_CHECK_CAST ((obj), GB_TYPE_ADD_DIALOG, GbAddDialog))
-#define GB_ADD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GB_ADD_DIALOG, GbAddDialogClass))
-#define GB_IS_ADD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GB_TYPE_ADD_DIALOG))
-#define GB_IS_ADD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GB_ADD_DIALOG))
+#define GB_ADD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GB_TYPE_ADD_DIALOG, GbAddDialog))
+#define GB_ADD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GB_ADD_DIALOG, GbAddDialogClass))
+#define GB_IS_ADD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GB_TYPE_ADD_DIALOG))
+#define GB_IS_ADD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GB_ADD_DIALOG))
typedef struct _GbAddDialogPrivate GbAddDialogPrivate;
diff --git a/bookmarks/bookmarks-tree-model.c b/bookmarks/bookmarks-tree-model.c
index e61f3a2..83de945 100644
--- a/bookmarks/bookmarks-tree-model.c
+++ b/bookmarks/bookmarks-tree-model.c
@@ -110,7 +110,7 @@ static void gb_tree_model_descendant_removed_cb (GbFolder *f, GbFolder *p, GbB
static GObjectClass *parent_class = NULL;
-GtkType
+GType
gb_tree_model_get_type (void)
{
static GType btree_model_type = 0;
diff --git a/bookmarks/bookmarks-tree-model.h b/bookmarks/bookmarks-tree-model.h
index 84f1ecc..5916b48 100644
--- a/bookmarks/bookmarks-tree-model.h
+++ b/bookmarks/bookmarks-tree-model.h
@@ -72,7 +72,7 @@ struct _GbTreeModelClass
};
-GtkType gb_tree_model_get_type (void);
+GType gb_tree_model_get_type (void);
GbTreeModel * gb_tree_model_new (GSList *roots);
GbTreeModel * gb_tree_model_new_for_set (GbBookmarkSet *set);
void gb_tree_model_set_only_folders (GbTreeModel *tm, gboolean val);
diff --git a/embed/downloader-view.h b/embed/downloader-view.h
index 468d738..682a654 100644
--- a/embed/downloader-view.h
+++ b/embed/downloader-view.h
@@ -30,10 +30,10 @@ typedef struct DownloaderView DownloaderView;
typedef struct DownloaderViewClass DownloaderViewClass;
#define TYPE_DOWNLOADER_VIEW (downloader_view_get_type ())
-#define DOWNLOADER_VIEW(obj) (GTK_CHECK_CAST ((obj), TYPE_DOWNLOADER_VIEW, DownloaderView))
-#define DOWNLOADER_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), DOWNLOADER_VIEW, DownloaderViewClass))
-#define IS_DOWNLOADER_VIEW(obj) (GTK_CHECK_TYPE ((obj), TYPE_DOWNLOADER_VIEW))
-#define IS_DOWNLOADER_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), DOWNLOADER_VIEW))
+#define DOWNLOADER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DOWNLOADER_VIEW, DownloaderView))
+#define DOWNLOADER_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DOWNLOADER_VIEW, DownloaderViewClass))
+#define IS_DOWNLOADER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DOWNLOADER_VIEW))
+#define IS_DOWNLOADER_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DOWNLOADER_VIEW))
typedef struct DownloaderViewPrivate DownloaderViewPrivate;
diff --git a/embed/galeon-embed-dialog.h b/embed/galeon-embed-dialog.h
index 792579e..2d4b664 100644
--- a/embed/galeon-embed-dialog.h
+++ b/embed/galeon-embed-dialog.h
@@ -31,10 +31,10 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedDialogClass GaleonEmbedDialogClass;
#define GALEON_TYPE_EMBED_DIALOG (galeon_embed_dialog_get_type ())
-#define GALEON_EMBED_DIALOG(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_DIALOG, GaleonEmbedDialog))
-#define GALEON_EMBED_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_DIALOG, GaleonEmbedDialogClass))
-#define GALEON_IS_EMBED_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_DIALOG))
-#define GALEON_IS_EMBED_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_DIALOG))
+#define GALEON_EMBED_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_DIALOG, GaleonEmbedDialog))
+#define GALEON_EMBED_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_DIALOG, GaleonEmbedDialogClass))
+#define GALEON_IS_EMBED_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_DIALOG))
+#define GALEON_IS_EMBED_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_DIALOG))
#define GALEON_EMBED_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_DIALOG, GaleonEmbedDialogClass))
typedef struct GaleonEmbedDialog GaleonEmbedDialog;
diff --git a/embed/galeon-embed-event.h b/embed/galeon-embed-event.h
index 33a7dee..ebf14bb 100644
--- a/embed/galeon-embed-event.h
+++ b/embed/galeon-embed-event.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedEventClass GaleonEmbedEventClass;
#define GALEON_TYPE_EMBED_EVENT (galeon_embed_event_get_type ())
-#define GALEON_EMBED_EVENT(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_EVENT, GaleonEmbedEvent))
-#define GALEON_EMBED_EVENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_PERSIST_SHELL, GaleonEmbedEventClass))
-#define GALEON_IS_EMBED_EVENT(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_EVENT))
-#define GALEON_IS_EMBED_EVENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_EVENT))
+#define GALEON_EMBED_EVENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_EVENT, GaleonEmbedEvent))
+#define GALEON_EMBED_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_PERSIST_SHELL, GaleonEmbedEventClass))
+#define GALEON_IS_EMBED_EVENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_EVENT))
+#define GALEON_IS_EMBED_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_EVENT))
#define GALEON_EMBED_EVENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_SHELL, GaleonEmbedEventClass))
typedef struct GaleonEmbedEvent GaleonEmbedEvent;
diff --git a/embed/galeon-embed-helper-list.h b/embed/galeon-embed-helper-list.h
index 5ba3768..ba6dbba 100644
--- a/embed/galeon-embed-helper-list.h
+++ b/embed/galeon-embed-helper-list.h
@@ -33,10 +33,10 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedHelperListClass GaleonEmbedHelperListClass;
#define GALEON_TYPE_EMBED_HELPER_LIST (galeon_embed_helper_list_get_type ())
-#define GALEON_EMBED_HELPER_LIST(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_HELPER_LIST, GaleonEmbedHelperList))
-#define GALEON_EMBED_HELPER_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_HELPER_LIST, GaleonEmbedHelperListClass))
-#define GALEON_IS_EMBED_HELPER_LIST(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_HELPER_LIST))
-#define GALEON_IS_EMBED_HELPER_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_HELPER_LIST))
+#define GALEON_EMBED_HELPER_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_HELPER_LIST, GaleonEmbedHelperList))
+#define GALEON_EMBED_HELPER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_HELPER_LIST, GaleonEmbedHelperListClass))
+#define GALEON_IS_EMBED_HELPER_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_HELPER_LIST))
+#define GALEON_IS_EMBED_HELPER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_HELPER_LIST))
#define GALEON_EMBED_HELPER_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_HELPER_LIST, GaleonEmbedHelperListClass))
typedef struct GaleonEmbedHelperList GaleonEmbedHelperList;
diff --git a/embed/galeon-embed-persist.h b/embed/galeon-embed-persist.h
index a78b0c5..6470669 100644
--- a/embed/galeon-embed-persist.h
+++ b/embed/galeon-embed-persist.h
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
#define GALEON_TYPE_EMBED_PERSIST (galeon_embed_persist_get_type ())
-#define GALEON_EMBED_PERSIST(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_PERSIST, GaleonEmbedPersist))
-#define GALEON_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_PERSIST, GaleonEmbedPersistClass))
-#define GALEON_IS_EMBED_PERSIST(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_PERSIST))
-#define GALEON_IS_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_PERSIST))
+#define GALEON_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_PERSIST, GaleonEmbedPersist))
+#define GALEON_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_PERSIST, GaleonEmbedPersistClass))
+#define GALEON_IS_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_PERSIST))
+#define GALEON_IS_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_PERSIST))
#define GALEON_EMBED_PERSIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_PERSIST, GaleonEmbedPersistClass))
typedef struct GaleonEmbedPersist GaleonEmbedPersist;
diff --git a/embed/galeon-embed-popup-control.h b/embed/galeon-embed-popup-control.h
index 5790df4..6185a7b 100644
--- a/embed/galeon-embed-popup-control.h
+++ b/embed/galeon-embed-popup-control.h
@@ -27,13 +27,13 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedPopupControlClass GaleonEmbedPopupControlClass;
#define GALEON_TYPE_EMBED_POPUP_CONTROL (galeon_embed_popup_control_get_type ())
-#define GALEON_EMBED_POPUP_CONTROL(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_POPUP_CONTROL, \
+#define GALEON_EMBED_POPUP_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_POPUP_CONTROL, \
GaleonEmbedPopupControl))
-#define GALEON_EMBED_POPUP_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
+#define GALEON_EMBED_POPUP_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
GALEON_TYPE_EMBED_POPUP_CONTROL,\
GaleonEmbedPopupControlClass))
-#define GALEON_IS_EMBED_POPUP_CONTROL(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_POPUP_CONTROL))
-#define GALEON_IS_EMBED_POPUP_CONTROL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
+#define GALEON_IS_EMBED_POPUP_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_POPUP_CONTROL))
+#define GALEON_IS_EMBED_POPUP_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
GALEON_EMBED_POPUP_CONTROL))
#define GALEON_EMBED_POPUP_CONTROL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
GALEON_TYPE_EMBED_POPUP_CONTROL, \
diff --git a/embed/galeon-embed-popup.h b/embed/galeon-embed-popup.h
index 89421a9..092501f 100644
--- a/embed/galeon-embed-popup.h
+++ b/embed/galeon-embed-popup.h
@@ -28,10 +28,10 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedPopupClass GaleonEmbedPopupClass;
#define GALEON_TYPE_EMBED_POPUP (galeon_embed_popup_get_type ())
-#define GALEON_EMBED_POPUP(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_POPUP, GaleonEmbedPopup))
-#define GALEON_EMBED_POPUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_POPUP, GaleonEmbedPopupClass))
-#define GALEON_IS_EMBED_POPUP(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_POPUP))
-#define GALEON_IS_EMBED_POPUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_POPUP))
+#define GALEON_EMBED_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_POPUP, GaleonEmbedPopup))
+#define GALEON_EMBED_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_POPUP, GaleonEmbedPopupClass))
+#define GALEON_IS_EMBED_POPUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_POPUP))
+#define GALEON_IS_EMBED_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_POPUP))
#define GALEON_EMBED_POPUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_POPUP, GaleonEmbedPopupClass))
typedef struct GaleonEmbedPopup GaleonEmbedPopup;
diff --git a/embed/galeon-embed-shell.h b/embed/galeon-embed-shell.h
index fdb3ea5..64813ac 100644
--- a/embed/galeon-embed-shell.h
+++ b/embed/galeon-embed-shell.h
@@ -34,10 +34,10 @@ G_BEGIN_DECLS
typedef struct GaleonEmbedShellClass GaleonEmbedShellClass;
#define GALEON_TYPE_EMBED_SHELL (galeon_embed_shell_get_type ())
-#define GALEON_EMBED_SHELL(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_EMBED_SHELL, GaleonEmbedShell))
-#define GALEON_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_SHELL, GaleonEmbedShellClass))
-#define GALEON_IS_EMBED_SHELL(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_EMBED_SHELL))
-#define GALEON_IS_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_SHELL))
+#define GALEON_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_EMBED_SHELL, GaleonEmbedShell))
+#define GALEON_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_EMBED_SHELL, GaleonEmbedShellClass))
+#define GALEON_IS_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_EMBED_SHELL))
+#define GALEON_IS_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_EMBED_SHELL))
#define GALEON_EMBED_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_SHELL, GaleonEmbedShellClass))
typedef struct GaleonEmbedShell GaleonEmbedShell;
diff --git a/embed/js-console.c b/embed/js-console.c
index d3b3e95..25a31f7 100755
--- a/embed/js-console.c
+++ b/embed/js-console.c
@@ -118,7 +118,7 @@ galeon_js_console_append (GaleonJSConsole *self,
-1);
/* scroll only if the user isn't doing anything at the moment */
- if (!GTK_WIDGET_HAS_FOCUS(priv->view))
+ if (!gtk_widget_has_focus (priv->view))
{
GtkTreePath *path;
diff --git a/embed/print-dialog.h b/embed/print-dialog.h
index 7e77800..6a26fed 100644
--- a/embed/print-dialog.h
+++ b/embed/print-dialog.h
@@ -31,10 +31,10 @@ typedef struct PrintDialog PrintDialog;
typedef struct PrintDialogClass PrintDialogClass;
#define TYPE_PRINT_DIALOG (print_dialog_get_type ())
-#define PRINT_DIALOG(obj) (GTK_CHECK_CAST ((obj), TYPE_PRINT_DIALOG, PrintDialog))
-#define PRINT_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PRINT_DIALOG, PrintDialogClass))
-#define IS_PRINT_DIALOG(obj) (GTK_CHECK_TYPE ((obj), TYPE_PRINT_DIALOG))
-#define IS_PRINT_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PRINT_DIALOG))
+#define PRINT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PRINT_DIALOG, PrintDialog))
+#define PRINT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PRINT_DIALOG, PrintDialogClass))
+#define IS_PRINT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PRINT_DIALOG))
+#define IS_PRINT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PRINT_DIALOG))
typedef struct PrintDialogPrivate PrintDialogPrivate;
diff --git a/gtkhtml/gtkhtml-embed-persist.h b/gtkhtml/gtkhtml-embed-persist.h
index bc921ac..ed8506e 100644
--- a/gtkhtml/gtkhtml-embed-persist.h
+++ b/gtkhtml/gtkhtml-embed-persist.h
@@ -31,10 +31,10 @@ extern "C" {
typedef struct GtkhtmlEmbedPersistClass GtkhtmlEmbedPersistClass;
#define GTKHTML_TYPE_EMBED_PERSIST (gtkhtml_embed_persist_get_type ())
-#define GTKHTML_EMBED_PERSIST(obj) (GTK_CHECK_CAST ((obj), GTKHTML_TYPE_EMBED_PERSIST, GtkhtmlEmbedPersist))
-#define GTKHTML_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTKHTML_PERSIST_SHELL, GtkhtmlEmbedPersistClass))
-#define GTKHTML_IS_EMBED_PERSIST(obj) (GTK_CHECK_TYPE ((obj), GTKHTML_TYPE_EMBED_PERSIST))
-#define GTKHTML_IS_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED_PERSIST))
+#define GTKHTML_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTKHTML_TYPE_EMBED_PERSIST, GtkhtmlEmbedPersist))
+#define GTKHTML_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTKHTML_PERSIST_SHELL, GtkhtmlEmbedPersistClass))
+#define GTKHTML_IS_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTKHTML_TYPE_EMBED_PERSIST))
+#define GTKHTML_IS_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED_PERSIST))
#define GTKHTML_EMBED_PERSIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKHTML_TYPE_EMBED_SHELL, GtkhtmlEmbedPersistClass))
typedef struct GtkhtmlEmbedPersist GtkhtmlEmbedPersist;
diff --git a/gtkhtml/gtkhtml-embed-shell.h b/gtkhtml/gtkhtml-embed-shell.h
index 0946c16..8fd25d1 100644
--- a/gtkhtml/gtkhtml-embed-shell.h
+++ b/gtkhtml/gtkhtml-embed-shell.h
@@ -31,10 +31,10 @@ extern "C" {
typedef struct GtkhtmlEmbedShellClass GtkhtmlEmbedShellClass;
#define GTKHTML_TYPE_EMBED_SHELL (gtkhtml_embed_shell_get_type ())
-#define GTKHTML_EMBED_SHELL(obj) (GTK_CHECK_CAST ((obj), GTKHTML_TYPE_EMBED_SHELL, GtkhtmlEmbedShell))
-#define GTKHTML_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTKHTML_EMBED_SHELL, GtkhtmlEmbedShellClass))
-#define GTKHTML_IS_EMBED_SHELL(obj) (GTK_CHECK_TYPE ((obj), GTKHTML_TYPE_EMBED_SHELL))
-#define GTKHTML_IS_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED_SHELL))
+#define GTKHTML_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTKHTML_TYPE_EMBED_SHELL, GtkhtmlEmbedShell))
+#define GTKHTML_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTKHTML_EMBED_SHELL, GtkhtmlEmbedShellClass))
+#define GTKHTML_IS_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTKHTML_TYPE_EMBED_SHELL))
+#define GTKHTML_IS_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED_SHELL))
#define GTKHTML_EMBED_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKHTML_TYPE_EMBED_SHELL, GtkhtmlEmbedShellClass))
typedef struct GtkhtmlEmbedShell GtkhtmlEmbedShell;
diff --git a/gtkhtml/gtkhtml-embed.h b/gtkhtml/gtkhtml-embed.h
index e07d76d..68c5a06 100644
--- a/gtkhtml/gtkhtml-embed.h
+++ b/gtkhtml/gtkhtml-embed.h
@@ -31,10 +31,10 @@ extern "C" {
typedef struct GtkhtmlEmbedClass GtkhtmlEmbedClass;
#define GTKHTML_TYPE_EMBED (gtkhtml_embed_get_type ())
-#define GTKHTML_EMBED(obj) (GTK_CHECK_CAST ((obj), GTKHTML_TYPE_EMBED, GtkhtmlEmbed))
-#define GTKHTML_EMBED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTKHTML_EMBED, GtkhtmlEmbedClass))
-#define GTKHTML_IS_EMBED(obj) (GTK_CHECK_TYPE ((obj), GTKHTML_TYPE_EMBED))
-#define GTKHTML_IS_EMBED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED))
+#define GTKHTML_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTKHTML_TYPE_EMBED, GtkhtmlEmbed))
+#define GTKHTML_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTKHTML_EMBED, GtkhtmlEmbedClass))
+#define GTKHTML_IS_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTKHTML_TYPE_EMBED))
+#define GTKHTML_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTKHTML_EMBED))
#define GTKHTML_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKHTML_TYPE_EMBED, GtkhtmlEmbedClass))
typedef struct GtkhtmlEmbed GtkhtmlEmbed;
diff --git a/libegg/dock/egg-dock-box.h b/libegg/dock/egg-dock-box.h
index 78474da..a6b7e9b 100644
--- a/libegg/dock/egg-dock-box.h
+++ b/libegg/dock/egg-dock-box.h
@@ -30,11 +30,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_BOX (egg_dock_box_get_type ())
-#define EGG_DOCK_BOX(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_BOX, EggDockBox))
-#define EGG_DOCK_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_BOX, EggDockBoxClass))
-#define EGG_IS_DOCK_BOX(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_BOX))
-#define EGG_IS_DOCK_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_BOX))
-#define EGG_DOCK_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYE_DOCK_BOX, EggDockBoxClass))
+#define EGG_DOCK_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_BOX, EggDockBox))
+#define EGG_DOCK_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_BOX, EggDockBoxClass))
+#define EGG_IS_DOCK_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_BOX))
+#define EGG_IS_DOCK_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_BOX))
+#define EGG_DOCK_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYE_DOCK_BOX, EggDockBoxClass))
/* data types & structures */
typedef struct _EggDockBox EggDockBox;
diff --git a/libegg/dock/egg-dock-item-grip.c b/libegg/dock/egg-dock-item-grip.c
index 8c3d621..0876192 100644
--- a/libegg/dock/egg-dock-item-grip.c
+++ b/libegg/dock/egg-dock-item-grip.c
@@ -52,13 +52,13 @@ egg_dock_item_grip_expose (GtkWidget *widget,
gtk_paint_handle (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
shadow,
clip, widget, "dockitem",
rect->x, rect->y, rect->width, rect->height,
grip->item->orientation);
- if (GTK_WIDGET_HAS_FOCUS (widget)) {
+ if (gtk_widget_has_focus (widget)) {
gint focus_width;
gint focus_pad;
GdkRectangle focus;
@@ -75,7 +75,7 @@ egg_dock_item_grip_expose (GtkWidget *widget,
focus.height -= 2 * (widget->style->xthickness + focus_pad);
gtk_paint_focus (widget->style, widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
clip, widget, "dockitem",
focus.x, focus.y,
focus.width, focus.height);
diff --git a/libegg/dock/egg-dock-item-grip.h b/libegg/dock/egg-dock-item-grip.h
index 1b800dd..822a03f 100644
--- a/libegg/dock/egg-dock-item-grip.h
+++ b/libegg/dock/egg-dock-item-grip.h
@@ -21,15 +21,15 @@ G_BEGIN_DECLS
#define EGG_TYPE_DOCK_ITEM_GRIP (egg_dock_item_grip_get_type())
#define EGG_DOCK_ITEM_GRIP(obj) \
- (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGrip))
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGrip))
#define EGG_DOCK_ITEM_GRIP_CLASS(klass) \
- (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
+ (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
#define EGG_IS_DOCK_ITEM_GRIP(obj) \
- (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_ITEM_GRIP))
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_ITEM_GRIP))
#define EGG_IS_DOCK_ITEM_GRIP_CLASS(klass) \
- (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM_GRIP))
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM_GRIP))
#define EGG_DOCK_ITEM_GRIP_GET_CLASS(obj) \
- (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
typedef struct _EggDockItemGripPrivate EggDockItemGripPrivate;
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 56355e3..2ac2d99 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -79,7 +79,7 @@ static void egg_dock_item_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static GtkType egg_dock_item_child_type (GtkContainer *container);
+static GType egg_dock_item_child_type (GtkContainer *container);
static void egg_dock_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
@@ -578,7 +578,7 @@ egg_dock_item_remove (GtkContainer *container,
item = EGG_DOCK_ITEM (container);
if (item->_priv && widget == item->_priv->grip) {
- gboolean grip_was_visible = GTK_WIDGET_VISIBLE (widget);
+ gboolean grip_was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
item->_priv->grip = NULL;
if (grip_was_visible)
@@ -592,7 +592,7 @@ egg_dock_item_remove (GtkContainer *container,
g_return_if_fail (item->child == widget);
- was_visible = GTK_WIDGET_VISIBLE (widget);
+ was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
item->child = NULL;
@@ -618,7 +618,7 @@ egg_dock_item_forall (GtkContainer *container,
(* callback) (item->child, callback_data);
}
-static GtkType
+static GType
egg_dock_item_child_type (GtkContainer *container)
{
g_return_val_if_fail (EGG_IS_DOCK_ITEM (container), G_TYPE_NONE);
@@ -687,14 +687,14 @@ egg_dock_item_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
gdk_window_move_resize (widget->window,
widget->allocation.x,
widget->allocation.y,
widget->allocation.width,
widget->allocation.height);
- if (item->child && GTK_WIDGET_VISIBLE (item->child)) {
+ if (item->child && gtk_widget_get_visible (item->child)) {
GtkAllocation child_allocation;
int border_width;
@@ -744,13 +744,13 @@ egg_dock_item_map (GtkWidget *widget)
gdk_window_show (widget->window);
if (item->child
- && GTK_WIDGET_VISIBLE (item->child)
- && !GTK_WIDGET_MAPPED (item->child))
+ && gtk_widget_get_visible (item->child)
+ && !gtk_widget_get_mapped (item->child))
gtk_widget_map (item->child);
if (item->_priv->grip
- && GTK_WIDGET_VISIBLE (item->_priv->grip)
- && !GTK_WIDGET_MAPPED (item->_priv->grip))
+ && gtk_widget_get_visible (item->_priv->grip)
+ && !gtk_widget_get_mapped (item->_priv->grip))
gtk_widget_map (item->_priv->grip);
}
@@ -807,7 +807,7 @@ egg_dock_item_realize (GtkWidget *widget)
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window,
- GTK_WIDGET_STATE (item));
+ gtk_widget_get_state (GTK_WIDGET (item)));
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
if (item->child)
@@ -825,10 +825,10 @@ egg_dock_item_style_set (GtkWidget *widget,
g_return_if_fail (EGG_IS_DOCK_ITEM (widget));
/* FIXME: maybe remove this method altogether and use the default implementation */
- if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_NO_WINDOW (widget)) {
+ if (gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget)) {
gtk_style_set_background (widget->style, widget->window,
widget->state);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (gtk_widget_is_drawable (widget))
gdk_window_clear (widget->window);
}
}
@@ -843,7 +843,7 @@ egg_dock_item_paint (GtkWidget *widget,
gtk_paint_box (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
GTK_SHADOW_NONE,
&event->area, widget,
"dockitem",
@@ -858,7 +858,7 @@ egg_dock_item_expose (GtkWidget *widget,
g_return_val_if_fail (EGG_IS_DOCK_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
- if (GTK_WIDGET_DRAWABLE (widget) && event->window == widget->window) {
+ if (gtk_widget_is_drawable (widget) && event->window == widget->window) {
egg_dock_item_paint (widget, event);
EGG_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
}
@@ -1193,7 +1193,7 @@ egg_dock_item_dock (EggDockObject *object,
gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (new_parent));
/* show automatic object */
- if (GTK_WIDGET_VISIBLE (object))
+ if (gtk_widget_get_visible (GTK_WIDGET (object)))
gtk_widget_show (GTK_WIDGET (new_parent));
/* use extra docking parameter */
@@ -1266,7 +1266,7 @@ egg_dock_item_drag_start (EggDockItem *item)
{
GdkCursor *fleur;
- if (!GTK_WIDGET_REALIZED (item))
+ if (!gtk_widget_get_realized (GTK_WIDGET (item)))
gtk_widget_realize (GTK_WIDGET (item));
EGG_DOCK_ITEM_SET_FLAGS (item, EGG_DOCK_IN_DRAG);
@@ -1376,7 +1376,7 @@ egg_dock_item_real_set_orientation (EggDockItem *item,
{
item->orientation = orientation;
- if (GTK_WIDGET_DRAWABLE (item))
+ if (gtk_widget_is_drawable (GTK_WIDGET (item)))
gtk_widget_queue_draw (GTK_WIDGET (item));
gtk_widget_queue_resize (GTK_WIDGET (item));
}
diff --git a/libegg/dock/egg-dock-item.h b/libegg/dock/egg-dock-item.h
index a95d37e..3185ce6 100644
--- a/libegg/dock/egg-dock-item.h
+++ b/libegg/dock/egg-dock-item.h
@@ -37,11 +37,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_ITEM (egg_dock_item_get_type ())
-#define EGG_DOCK_ITEM(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_ITEM, EggDockItem))
-#define EGG_DOCK_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM, EggDockItemClass))
-#define EGG_IS_DOCK_ITEM(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_ITEM))
-#define EGG_IS_DOCK_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM))
-#define EGG_DOCK_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_ITEM, EggDockItemClass))
+#define EGG_DOCK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_ITEM, EggDockItem))
+#define EGG_DOCK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM, EggDockItemClass))
+#define EGG_IS_DOCK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_ITEM))
+#define EGG_IS_DOCK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM))
+#define EGG_DOCK_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_ITEM, EggDockItemClass))
/* data types & structures */
typedef enum {
diff --git a/libegg/dock/egg-dock-layout.c b/libegg/dock/egg-dock-layout.c
index 725cef3..f1d5e08 100644
--- a/libegg/dock/egg-dock-layout.c
+++ b/libegg/dock/egg-dock-layout.c
@@ -746,13 +746,13 @@ egg_dock_layout_construct_layouts_ui (EggDockLayout *layout)
G_CALLBACK (selection_changed_cb), ui_data);
glade_xml_signal_connect_data (gui, "on_newlayout_entry_activate",
- GTK_SIGNAL_FUNC (save_layout_cb), ui_data);
+ G_CALLBACK (save_layout_cb), ui_data);
glade_xml_signal_connect_data (gui, "on_save_button_clicked",
- GTK_SIGNAL_FUNC (save_layout_cb), ui_data);
+ G_CALLBACK (save_layout_cb), ui_data);
glade_xml_signal_connect_data (gui, "on_load_button_clicked",
- GTK_SIGNAL_FUNC (load_layout_cb), ui_data);
+ G_CALLBACK (load_layout_cb), ui_data);
glade_xml_signal_connect_data (gui, "on_delete_button_clicked",
- GTK_SIGNAL_FUNC (delete_layout_cb), ui_data);
+ G_CALLBACK (delete_layout_cb), ui_data);
g_signal_connect (container, "destroy", (GCallback) layout_ui_destroyed, NULL);
@@ -953,13 +953,13 @@ egg_dock_layout_recursive_build (EggDockMaster *master,
parent);
else if (egg_dock_object_is_compound (parent)) {
gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (object));
- if (GTK_WIDGET_VISIBLE (parent))
+ if (gtk_widget_get_visible (GTK_WIDGET (parent)))
gtk_widget_show (GTK_WIDGET (object));
}
}
else {
EggDockObject *controller = egg_dock_master_get_controller (master);
- if (controller != object && GTK_WIDGET_VISIBLE (controller))
+ if (controller != object && gtk_widget_get_visible (GTK_WIDGET (controller)))
gtk_widget_show (GTK_WIDGET (object));
}
diff --git a/libegg/dock/egg-dock-layout.h b/libegg/dock/egg-dock-layout.h
index 92757a1..e101ee8 100644
--- a/libegg/dock/egg-dock-layout.h
+++ b/libegg/dock/egg-dock-layout.h
@@ -30,11 +30,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_LAYOUT (egg_dock_layout_get_type ())
-#define EGG_DOCK_LAYOUT(object) (GTK_CHECK_CAST ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayout))
-#define EGG_DOCK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
-#define EGG_IS_DOCK_LAYOUT(object) (GTK_CHECK_TYPE ((object), EGG_TYPE_DOCK_LAYOUT))
-#define EGG_IS_DOCK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_LAYOUT))
-#define EGG_DOCK_LAYOUT_GET_CLASS(object) (GTK_CHECK_GET_CLASS ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
+#define EGG_DOCK_LAYOUT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayout))
+#define EGG_DOCK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
+#define EGG_IS_DOCK_LAYOUT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), EGG_TYPE_DOCK_LAYOUT))
+#define EGG_IS_DOCK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_LAYOUT))
+#define EGG_DOCK_LAYOUT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
/* data types & structures */
typedef struct _EggDockLayout EggDockLayout;
diff --git a/libegg/dock/egg-dock-master.h b/libegg/dock/egg-dock-master.h
index 1005cb8..12288ec 100644
--- a/libegg/dock/egg-dock-master.h
+++ b/libegg/dock/egg-dock-master.h
@@ -32,11 +32,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_MASTER (egg_dock_master_get_type ())
-#define EGG_DOCK_MASTER(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_MASTER, EggDockMaster))
-#define EGG_DOCK_MASTER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_MASTER, EggDockMasterClass))
-#define EGG_IS_DOCK_MASTER(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_MASTER))
-#define EGG_IS_DOCK_MASTER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_MASTER))
-#define EGG_DOCK_MASTER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_MASTER, EggDockMasterClass))
+#define EGG_DOCK_MASTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_MASTER, EggDockMaster))
+#define EGG_DOCK_MASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_MASTER, EggDockMasterClass))
+#define EGG_IS_DOCK_MASTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_MASTER))
+#define EGG_IS_DOCK_MASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_MASTER))
+#define EGG_DOCK_MASTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_MASTER, EggDockMasterClass))
/* data types & structures */
typedef struct _EggDockMaster EggDockMaster;
diff --git a/libegg/dock/egg-dock-notebook.h b/libegg/dock/egg-dock-notebook.h
index 50f7530..66ee97b 100644
--- a/libegg/dock/egg-dock-notebook.h
+++ b/libegg/dock/egg-dock-notebook.h
@@ -28,11 +28,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_NOTEBOOK (egg_dock_notebook_get_type ())
-#define EGG_DOCK_NOTEBOOK(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebook))
-#define EGG_DOCK_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
-#define EGG_IS_DOCK_NOTEBOOK(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_NOTEBOOK))
-#define EGG_IS_DOCK_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_NOTEBOOK))
-#define EGG_DOCK_NOTEBOOK_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
+#define EGG_DOCK_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebook))
+#define EGG_DOCK_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
+#define EGG_IS_DOCK_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_NOTEBOOK))
+#define EGG_IS_DOCK_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_NOTEBOOK))
+#define EGG_DOCK_NOTEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
/* data types & structures */
typedef struct _EggDockNotebook EggDockNotebook;
diff --git a/libegg/dock/egg-dock-object.h b/libegg/dock/egg-dock-object.h
index 76364fb..8522b34 100644
--- a/libegg/dock/egg-dock-object.h
+++ b/libegg/dock/egg-dock-object.h
@@ -29,11 +29,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_OBJECT (egg_dock_object_get_type ())
-#define EGG_DOCK_OBJECT(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_OBJECT, EggDockObject))
-#define EGG_DOCK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_OBJECT, EggDockObjectClass))
-#define EGG_IS_DOCK_OBJECT(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_OBJECT))
-#define EGG_IS_DOCK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_OBJECT))
-#define EGG_DOCK_OBJECT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_OBJECT, EggDockObjectClass))
+#define EGG_DOCK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_OBJECT, EggDockObject))
+#define EGG_DOCK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_OBJECT, EggDockObjectClass))
+#define EGG_IS_DOCK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_OBJECT))
+#define EGG_IS_DOCK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_OBJECT))
+#define EGG_DOCK_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_OBJECT, EggDockObjectClass))
/* data types & structures */
typedef enum {
diff --git a/libegg/dock/egg-dock-paned.h b/libegg/dock/egg-dock-paned.h
index bfec24a..4c14016 100644
--- a/libegg/dock/egg-dock-paned.h
+++ b/libegg/dock/egg-dock-paned.h
@@ -29,11 +29,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_PANED (egg_dock_paned_get_type ())
-#define EGG_DOCK_PANED(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_PANED, EggDockPaned))
-#define EGG_DOCK_PANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PANED, EggDockPanedClass))
-#define EGG_IS_DOCK_PANED(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_PANED))
-#define EGG_IS_DOCK_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PANED))
-#define EGG_DOCK_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYE_DOCK_PANED, EggDockPanedClass))
+#define EGG_DOCK_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_PANED, EggDockPaned))
+#define EGG_DOCK_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PANED, EggDockPanedClass))
+#define EGG_IS_DOCK_PANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_PANED))
+#define EGG_IS_DOCK_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PANED))
+#define EGG_DOCK_PANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYE_DOCK_PANED, EggDockPanedClass))
/* data types & structures */
typedef struct _EggDockPaned EggDockPaned;
diff --git a/libegg/dock/egg-dock-placeholder.h b/libegg/dock/egg-dock-placeholder.h
index bb27d37..a18f44a 100644
--- a/libegg/dock/egg-dock-placeholder.h
+++ b/libegg/dock/egg-dock-placeholder.h
@@ -29,11 +29,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_PLACEHOLDER (egg_dock_placeholder_get_type ())
-#define EGG_DOCK_PLACEHOLDER(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholder))
-#define EGG_DOCK_PLACEHOLDER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
-#define EGG_IS_DOCK_PLACEHOLDER(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_PLACEHOLDER))
-#define EGG_IS_DOCK_PLACEHOLDER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PLACEHOLDER))
-#define EGG_DOCK_PLACEHOLDER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
+#define EGG_DOCK_PLACEHOLDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholder))
+#define EGG_DOCK_PLACEHOLDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
+#define EGG_IS_DOCK_PLACEHOLDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_PLACEHOLDER))
+#define EGG_IS_DOCK_PLACEHOLDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PLACEHOLDER))
+#define EGG_DOCK_PLACEHOLDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
/* data types & structures */
typedef struct _EggDockPlaceholder EggDockPlaceholder;
diff --git a/libegg/dock/egg-dock-tablabel.c b/libegg/dock/egg-dock-tablabel.c
index f4a3008..b5cad08 100644
--- a/libegg/dock/egg-dock-tablabel.c
+++ b/libegg/dock/egg-dock-tablabel.c
@@ -327,14 +327,14 @@ egg_dock_tablabel_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
gdk_window_move_resize (tablabel->event_window,
allocation->x,
allocation->y,
allocation->width,
allocation->height);
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) {
+ if (bin->child && gtk_widget_get_visible (bin->child)) {
GtkAllocation child_allocation;
child_allocation.x = widget->allocation.x + border_width;
@@ -390,7 +390,7 @@ egg_dock_tablabel_expose (GtkWidget *widget,
g_return_val_if_fail (EGG_IS_DOCK_TABLABEL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) {
+ if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget)) {
EGG_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
egg_dock_tablabel_paint (widget, event);
};
diff --git a/libegg/dock/egg-dock-tablabel.h b/libegg/dock/egg-dock-tablabel.h
index f62b282..2f52e9a 100644
--- a/libegg/dock/egg-dock-tablabel.h
+++ b/libegg/dock/egg-dock-tablabel.h
@@ -31,11 +31,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK_TABLABEL (egg_dock_tablabel_get_type ())
-#define EGG_DOCK_TABLABEL(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_TABLABEL, EggDockTablabel))
-#define EGG_DOCK_TABLABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
-#define EGG_IS_DOCK_TABLABEL(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_TABLABEL))
-#define EGG_IS_DOCK_TABLABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_TABLABEL))
-#define EGG_DOCK_TABLABEL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
+#define EGG_DOCK_TABLABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_TABLABEL, EggDockTablabel))
+#define EGG_DOCK_TABLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
+#define EGG_IS_DOCK_TABLABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_TABLABEL))
+#define EGG_IS_DOCK_TABLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_TABLABEL))
+#define EGG_DOCK_TABLABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
/* data types & structures */
typedef struct _EggDockTablabel EggDockTablabel;
diff --git a/libegg/dock/egg-dock.c b/libegg/dock/egg-dock.c
index 2e32685..91e768a 100644
--- a/libegg/dock/egg-dock.c
+++ b/libegg/dock/egg-dock.c
@@ -78,7 +78,7 @@ static void egg_dock_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static GtkType egg_dock_child_type (GtkContainer *container);
+static GType egg_dock_child_type (GtkContainer *container);
static void egg_dock_detach (EggDockObject *object,
gboolean recursive);
@@ -553,7 +553,7 @@ egg_dock_size_request (GtkWidget *widget,
border_width = container->border_width;
/* make request to root */
- if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
+ if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
gtk_widget_size_request (GTK_WIDGET (dock->root), requisition);
else {
requisition->width = 0;
@@ -589,7 +589,7 @@ egg_dock_size_allocate (GtkWidget *widget,
allocation->width = MAX (1, allocation->width - 2 * border_width);
allocation->height = MAX (1, allocation->height - 2 * border_width);
- if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
+ if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
gtk_widget_size_allocate (GTK_WIDGET (dock->root), allocation);
}
@@ -608,7 +608,7 @@ egg_dock_map (GtkWidget *widget)
if (dock->root) {
child = GTK_WIDGET (dock->root);
- if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
+ if (gtk_widget_get_visible (child) && !gtk_widget_get_mapped (child))
gtk_widget_map (child);
}
}
@@ -628,7 +628,7 @@ egg_dock_unmap (GtkWidget *widget)
if (dock->root) {
child = GTK_WIDGET (dock->root);
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_MAPPED (child))
+ if (gtk_widget_get_visible (child) && gtk_widget_get_mapped (child))
gtk_widget_unmap (child);
}
@@ -712,14 +712,14 @@ egg_dock_remove (GtkContainer *container,
g_return_if_fail (widget != NULL);
dock = EGG_DOCK (container);
- was_visible = GTK_WIDGET_VISIBLE (widget);
+ was_visible = gtk_widget_get_visible (widget);
if (GTK_WIDGET (dock->root) == widget) {
dock->root = NULL;
EGG_DOCK_OBJECT_UNSET_FLAGS (widget, EGG_DOCK_ATTACHED);
gtk_widget_unparent (widget);
- if (was_visible && GTK_WIDGET_VISIBLE (GTK_WIDGET (container)))
+ if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
gtk_widget_queue_resize (GTK_WIDGET (dock));
}
}
@@ -742,7 +742,7 @@ egg_dock_forall (GtkContainer *container,
(*callback) (GTK_WIDGET (dock->root), callback_data);
}
-static GtkType
+static GType
egg_dock_child_type (GtkContainer *container)
{
return EGG_TYPE_DOCK_ITEM;
@@ -919,15 +919,15 @@ egg_dock_dock (EggDockObject *object,
/* Realize the item (create its corresponding GdkWindow) when
EggDock has been realized. */
- if (GTK_WIDGET_REALIZED (dock))
+ if (gtk_widget_get_realized (GTK_WIDGET (dock)))
gtk_widget_realize (widget);
/* Map the widget if it's visible and the parent is visible and has
been mapped. This is done to make sure that the GdkWindow is
visible. */
- if (GTK_WIDGET_VISIBLE (dock) &&
- GTK_WIDGET_VISIBLE (widget)) {
- if (GTK_WIDGET_MAPPED (dock))
+ if (gtk_widget_get_visible (GTK_WIDGET (dock)) &&
+ gtk_widget_get_visible (widget)) {
+ if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
gtk_widget_map (widget);
/* Make the widget resize. */
@@ -1092,9 +1092,9 @@ egg_dock_add_floating_item (EggDock *dock,
"floaty", y,
NULL));
- if (GTK_WIDGET_VISIBLE (dock)) {
+ if (gtk_widget_get_visible (GTK_WIDGET (dock))) {
gtk_widget_show (GTK_WIDGET (new_dock));
- if (GTK_WIDGET_MAPPED (dock))
+ if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
gtk_widget_map (GTK_WIDGET (new_dock));
/* Make the widget resize. */
@@ -1169,7 +1169,7 @@ egg_dock_xor_rect (EggDock *dock,
widget = GTK_WIDGET (dock);
if (!dock->_priv->xor_gc) {
- if (GTK_WIDGET_REALIZED (widget)) {
+ if (gtk_widget_get_realized (widget)) {
GdkGCValues values;
values.function = GDK_INVERT;
diff --git a/libegg/dock/egg-dock.h b/libegg/dock/egg-dock.h
index 3b8aacb..3f05e0b 100644
--- a/libegg/dock/egg-dock.h
+++ b/libegg/dock/egg-dock.h
@@ -30,11 +30,11 @@ G_BEGIN_DECLS
/* standard macros */
#define EGG_TYPE_DOCK (egg_dock_get_type ())
-#define EGG_DOCK(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK, EggDock))
-#define EGG_DOCK_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK, EggDockClass))
-#define EGG_IS_DOCK(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK))
-#define EGG_IS_DOCK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK))
-#define EGG_DOCK_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK, EggDockClass))
+#define EGG_DOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK, EggDock))
+#define EGG_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK, EggDockClass))
+#define EGG_IS_DOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK))
+#define EGG_IS_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK))
+#define EGG_DOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK, EggDockClass))
/* data types & structures */
typedef struct _EggDock EggDock;
diff --git a/mozilla/GtkNSSKeyPairDialogs.cpp b/mozilla/GtkNSSKeyPairDialogs.cpp
index 3b6aee5..e9ee33a 100644
--- a/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -105,7 +105,8 @@ begin_busy (GtkWidget *widget)
if (cursor == NULL) cursor = gdk_cursor_new (GDK_WATCH);
- if (!GTK_WIDGET_REALIZED (widget)) gtk_widget_realize (GTK_WIDGET(widget));
+ if (!gtk_widget_get_realized (widget))
+ gtk_widget_realize (GTK_WIDGET (widget));
gdk_window_set_cursor (GTK_WIDGET (widget)->window, cursor);
while (gtk_events_pending ()) gtk_main_iteration ();
diff --git a/mozilla/mozilla-embed-persist.h b/mozilla/mozilla-embed-persist.h
index 65dccd3..1632f61 100644
--- a/mozilla/mozilla-embed-persist.h
+++ b/mozilla/mozilla-embed-persist.h
@@ -27,10 +27,10 @@
G_BEGIN_DECLS
#define MOZILLA_TYPE_EMBED_PERSIST (mozilla_embed_persist_get_type ())
-#define MOZILLA_EMBED_PERSIST(obj) (GTK_CHECK_CAST ((obj), MOZILLA_TYPE_EMBED_PERSIST, MozillaEmbedPersist))
-#define MOZILLA_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED_PERSIST, MozillaEmbedPersistClass))
-#define MOZILLA_IS_EMBED_PERSIST(obj) (GTK_CHECK_TYPE ((obj), MOZILLA_TYPE_EMBED_PERSIST))
-#define MOZILLA_IS_EMBED_PERSIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_PERSIST))
+#define MOZILLA_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOZILLA_TYPE_EMBED_PERSIST, MozillaEmbedPersist))
+#define MOZILLA_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED_PERSIST, MozillaEmbedPersistClass))
+#define MOZILLA_IS_EMBED_PERSIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOZILLA_TYPE_EMBED_PERSIST))
+#define MOZILLA_IS_EMBED_PERSIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_PERSIST))
#define MOZILLA_EMBED_PERSIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_TYPE_EMBED_PERSIST, MozillaEmbedPersistClass))
typedef struct MozillaEmbedPersist MozillaEmbedPersist;
diff --git a/mozilla/mozilla-embed-shell.cpp b/mozilla/mozilla-embed-shell.cpp
index 61fbc07..9baeb70 100644
--- a/mozilla/mozilla-embed-shell.cpp
+++ b/mozilla/mozilla-embed-shell.cpp
@@ -193,7 +193,7 @@ mozilla_init_single (MozillaEmbedShell *mes)
/* allow creation of orphan windows */
g_signal_connect (G_OBJECT (single), "new_window_orphan",
- GTK_SIGNAL_FUNC (mozilla_embed_shell_new_window_orphan_cb),
+ G_CALLBACK (mozilla_embed_shell_new_window_orphan_cb),
mes);
}
diff --git a/mozilla/mozilla-embed-shell.h b/mozilla/mozilla-embed-shell.h
index f4e1930..694e5fe 100644
--- a/mozilla/mozilla-embed-shell.h
+++ b/mozilla/mozilla-embed-shell.h
@@ -26,10 +26,10 @@
G_BEGIN_DECLS
#define MOZILLA_TYPE_EMBED_SHELL (mozilla_embed_shell_get_type ())
-#define MOZILLA_EMBED_SHELL(obj) (GTK_CHECK_CAST ((obj), MOZILLA_TYPE_EMBED_SHELL, MozillaEmbedShell))
-#define MOZILLA_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED_SHELL, MozillaEmbedShellClass))
-#define MOZILLA_IS_EMBED_SHELL(obj) (GTK_CHECK_TYPE ((obj), MOZILLA_TYPE_EMBED_SHELL))
-#define MOZILLA_IS_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_SHELL))
+#define MOZILLA_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOZILLA_TYPE_EMBED_SHELL, MozillaEmbedShell))
+#define MOZILLA_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED_SHELL, MozillaEmbedShellClass))
+#define MOZILLA_IS_EMBED_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOZILLA_TYPE_EMBED_SHELL))
+#define MOZILLA_IS_EMBED_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_SHELL))
#define MOZILLA_EMBED_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_TYPE_EMBED_SHELL, MozillaEmbedShellClass))
typedef struct MozillaEmbedShell MozillaEmbedShell;
diff --git a/mozilla/mozilla-embed.h b/mozilla/mozilla-embed.h
index c9d06d9..4ccfc6e 100644
--- a/mozilla/mozilla-embed.h
+++ b/mozilla/mozilla-embed.h
@@ -34,10 +34,10 @@ G_BEGIN_DECLS
typedef struct MozillaEmbedClass MozillaEmbedClass;
#define MOZILLA_TYPE_EMBED (mozilla_embed_get_type ())
-#define MOZILLA_EMBED(obj) (GTK_CHECK_CAST ((obj), MOZILLA_TYPE_EMBED, MozillaEmbed))
-#define MOZILLA_EMBED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED, MozillaEmbedClass))
-#define MOZILLA_IS_EMBED(obj) (GTK_CHECK_TYPE ((obj), MOZILLA_TYPE_EMBED))
-#define MOZILLA_IS_EMBED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED))
+#define MOZILLA_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOZILLA_TYPE_EMBED, MozillaEmbed))
+#define MOZILLA_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_EMBED, MozillaEmbedClass))
+#define MOZILLA_IS_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOZILLA_TYPE_EMBED))
+#define MOZILLA_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED))
#define MOZILLA_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_TYPE_EMBED, MozillaEmbedClass))
typedef struct MozillaEmbed MozillaEmbed;
diff --git a/src/galeon-find-toolbar.c b/src/galeon-find-toolbar.c
index 5a2c987..cf48e11 100644
--- a/src/galeon-find-toolbar.c
+++ b/src/galeon-find-toolbar.c
@@ -91,7 +91,7 @@ get_find (GaleonFindToolbar *toolbar)
priv->find = galeon_embed_find_new ();
- g_return_val_if_fail (priv->embed == NULL || GTK_WIDGET_REALIZED (GTK_WIDGET (priv->embed)), priv->find);
+ g_return_val_if_fail (priv->embed == NULL || gtk_widget_get_realized (GTK_WIDGET (priv->embed)), priv->find);
galeon_embed_find_set_embed (priv->find, priv->embed);
}
@@ -176,7 +176,7 @@ tab_search_key_press_cb (GaleonEmbed *embed,
}
/* check for / and ' which open the find toolbar in text resp. link mode */
- if (GTK_WIDGET_VISIBLE (widget) == FALSE)
+ if (gtk_widget_get_visible (widget) == FALSE)
{
gboolean autostart, linksonly;
galeon_embed_find_get_prefs (get_find (toolbar),
@@ -630,7 +630,7 @@ galeon_find_toolbar_set_embed (GaleonFindToolbar *toolbar,
if (priv->find != NULL)
{
- g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (priv->embed)));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (priv->embed)));
galeon_embed_find_set_embed (priv->find, embed);
}
@@ -707,7 +707,7 @@ galeon_find_toolbar_close (GaleonFindToolbar *toolbar)
void
galeon_find_toolbar_request_close (GaleonFindToolbar *toolbar)
{
- if (GTK_WIDGET_VISIBLE (GTK_WIDGET (toolbar)))
+ if (gtk_widget_get_visible (GTK_WIDGET (toolbar)))
{
g_signal_emit (toolbar, signals[CLOSE], 0);
}
diff --git a/src/galeon-nautilus-view.c b/src/galeon-nautilus-view.c
index 2bf183d..616d56d 100644
--- a/src/galeon-nautilus-view.c
+++ b/src/galeon-nautilus-view.c
@@ -905,7 +905,7 @@ navigate_mozilla_to_nautilus_uri (GaleonNautilusView *view,
cancel_pending_vfs_operation (view);
- if (!GTK_WIDGET_REALIZED (view->priv->embed->mozembed)) {
+ if (!gtk_widget_get_realized (view->priv->embed->mozembed)) {
/* Doing certain things to gtkmozembed before
* the widget has realized (specifically, opening
diff --git a/src/galeon-nautilus-view.h b/src/galeon-nautilus-view.h
index ced42ed..2914efd 100644
--- a/src/galeon-nautilus-view.h
+++ b/src/galeon-nautilus-view.h
@@ -24,12 +24,12 @@
#include "galeon-shell.h"
#define GALEON_TYPE_NAUTILUS_VIEW (galeon_nautilus_view_get_type ())
-#define GALEON_NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_NAUTILUS_VIEW, \
+#define GALEON_NAUTILUS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_NAUTILUS_VIEW, \
GaleonNautilusView))
-#define GALEON_NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_NAUTILUS_VIEW, \
+#define GALEON_NAUTILUS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_NAUTILUS_VIEW, \
GaleonNautilusViewClass))
-#define GALEON_IS_NAUTILUS_VIEW(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_NAUTILUS_VIEW))
-#define GALEON_IS_NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_IS_NAUTILUS_VIEW_CLASS))
+#define GALEON_IS_NAUTILUS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_NAUTILUS_VIEW))
+#define GALEON_IS_NAUTILUS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_IS_NAUTILUS_VIEW_CLASS))
typedef struct GaleonNautilusView GaleonNautilusView;
typedef struct GaleonNautilusViewClass GaleonNautilusViewClass;
diff --git a/src/galeon-popup.h b/src/galeon-popup.h
index ddc0cfe..a4aaf7f 100644
--- a/src/galeon-popup.h
+++ b/src/galeon-popup.h
@@ -32,10 +32,10 @@ G_BEGIN_DECLS
typedef struct GaleonPopupClass GaleonPopupClass;
#define GALEON_TYPE_POPUP (galeon_popup_get_type ())
-#define GALEON_POPUP(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_POPUP, GaleonPopup))
-#define GALEON_POPUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_POPUP, GaleonPopupClass))
-#define GALEON_IS_POPUP(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_POPUP))
-#define GALEON_IS_POPUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_POPUP))
+#define GALEON_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_POPUP, GaleonPopup))
+#define GALEON_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_POPUP, GaleonPopupClass))
+#define GALEON_IS_POPUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_POPUP))
+#define GALEON_IS_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_POPUP))
#define GALEON_POPUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_EMBED_POPUP, GaleonPopupClass))
struct GaleonPopup
diff --git a/src/galeon-prefs-dialog.c b/src/galeon-prefs-dialog.c
index d7e269a..d56aa07 100644
--- a/src/galeon-prefs-dialog.c
+++ b/src/galeon-prefs-dialog.c
@@ -122,7 +122,8 @@ begin_busy (GaleonPrefsDialog *self)
if (cursor == NULL) cursor = gdk_cursor_new (GDK_WATCH);
- if (!GTK_WIDGET_REALIZED(self)) gtk_widget_realize(GTK_WIDGET(self));
+ if (!gtk_widget_get_realized (GTK_WIDGET (self)))
+ gtk_widget_realize (GTK_WIDGET (self));
gdk_window_set_cursor (GTK_WIDGET(self)->window, cursor);
while (gtk_events_pending ()) gtk_main_iteration ();
diff --git a/src/galeon-shell.h b/src/galeon-shell.h
index 7b83bd7..750b88d 100644
--- a/src/galeon-shell.h
+++ b/src/galeon-shell.h
@@ -44,10 +44,10 @@ typedef struct GaleonShell GaleonShell;
typedef struct GaleonShellClass GaleonShellClass;
#define GALEON_TYPE_SHELL (galeon_shell_get_type ())
-#define GALEON_SHELL(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_SHELL, GaleonShell))
-#define GALEON_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_SHELL, GaleonShellClass))
-#define GALEON_IS_SHELL(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_SHELL))
-#define GALEON_IS_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_SHELL))
+#define GALEON_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_SHELL, GaleonShell))
+#define GALEON_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_SHELL, GaleonShellClass))
+#define GALEON_IS_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_SHELL))
+#define GALEON_IS_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_SHELL))
typedef struct GaleonShellPrivate GaleonShellPrivate;
diff --git a/src/galeon-spinner.h b/src/galeon-spinner.h
index 5f8527c..8b0813b 100644
--- a/src/galeon-spinner.h
+++ b/src/galeon-spinner.h
@@ -34,10 +34,10 @@
G_BEGIN_DECLS
#define GALEON_TYPE_SPINNER (galeon_spinner_get_type ())
-#define GALEON_SPINNER(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_SPINNER, GaleonSpinner))
-#define GALEON_SPINNER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_SPINNER, GaleonSpinnerClass))
-#define GALEON_IS_SPINNER(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_SPINNER))
-#define GALEON_IS_SPINNER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_TYPE_SPINNER))
+#define GALEON_SPINNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_SPINNER, GaleonSpinner))
+#define GALEON_SPINNER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_SPINNER, GaleonSpinnerClass))
+#define GALEON_IS_SPINNER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_SPINNER))
+#define GALEON_IS_SPINNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_TYPE_SPINNER))
typedef struct GaleonSpinner GaleonSpinner;
typedef struct GaleonSpinnerClass GaleonSpinnerClass;
diff --git a/src/galeon-tab.h b/src/galeon-tab.h
index ebcb8d0..b17e3f9 100644
--- a/src/galeon-tab.h
+++ b/src/galeon-tab.h
@@ -27,10 +27,10 @@ G_BEGIN_DECLS
typedef struct GaleonTabClass GaleonTabClass;
#define GALEON_TYPE_TAB (galeon_tab_get_type ())
-#define GALEON_TAB(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_TAB, GaleonTab))
-#define GALEON_TAB_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TAB, GaleonTabClass))
-#define GALEON_IS_TAB(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_TAB))
-#define GALEON_IS_TAB_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_TAB))
+#define GALEON_TAB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_TAB, GaleonTab))
+#define GALEON_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TAB, GaleonTabClass))
+#define GALEON_IS_TAB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_TAB))
+#define GALEON_IS_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_TAB))
typedef struct GaleonTab GaleonTab;
typedef struct GaleonTabPrivate GaleonTabPrivate;
diff --git a/src/galeon-window.h b/src/galeon-window.h
index f6cdd70..b363a19 100644
--- a/src/galeon-window.h
+++ b/src/galeon-window.h
@@ -41,10 +41,10 @@ typedef struct GaleonWindowPrivate GaleonWindowPrivate;
#include "galeon-popup.h"
#define GALEON_TYPE_WINDOW (galeon_window_get_type ())
-#define GALEON_WINDOW(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_WINDOW, GaleonWindow))
-#define GALEON_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_WINDOW, GaleonWindowClass))
-#define GALEON_IS_WINDOW(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_WINDOW))
-#define GALEON_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_WINDOW))
+#define GALEON_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_WINDOW, GaleonWindow))
+#define GALEON_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_WINDOW, GaleonWindowClass))
+#define GALEON_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_WINDOW))
+#define GALEON_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_WINDOW))
struct GaleonWindow
{
diff --git a/src/history-dialog.h b/src/history-dialog.h
index fd01da2..1c8d3df 100644
--- a/src/history-dialog.h
+++ b/src/history-dialog.h
@@ -30,10 +30,10 @@ typedef struct HistoryDialog HistoryDialog;
typedef struct HistoryDialogClass HistoryDialogClass;
#define TYPE_HISTORY_DIALOG (history_dialog_get_type ())
-#define HISTORY_DIALOG(obj) (GTK_CHECK_CAST ((obj), TYPE_HISTORY_DIALOG, HistoryDialog))
-#define HISTORY_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), HISTORY_DIALOG, HistoryDialogClass))
-#define IS_HISTORY_DIALOG(obj) (GTK_CHECK_TYPE ((obj), TYPE_HISTORY_DIALOG))
-#define IS_HISTORY_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), HISTORY_DIALOG))
+#define HISTORY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HISTORY_DIALOG, HistoryDialog))
+#define HISTORY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HISTORY_DIALOG, HistoryDialogClass))
+#define IS_HISTORY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HISTORY_DIALOG))
+#define IS_HISTORY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HISTORY_DIALOG))
typedef struct HistoryDialogPrivate HistoryDialogPrivate;
diff --git a/src/page-info-dialog.h b/src/page-info-dialog.h
index 2b2b36b..fd203ed 100644
--- a/src/page-info-dialog.h
+++ b/src/page-info-dialog.h
@@ -31,10 +31,10 @@ typedef struct PageInfoDialog PageInfoDialog;
typedef struct PageInfoDialogClass PageInfoDialogClass;
#define TYPE_PAGE_INFO_DIALOG (page_info_dialog_get_type ())
-#define PAGE_INFO_DIALOG(obj) (GTK_CHECK_CAST ((obj), TYPE_PAGE_INFO_DIALOG, PageInfoDialog))
-#define PAGE_INFO_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PAGE_INFO_DIALOG, PageInfoDialogClass))
-#define IS_PAGE_INFO_DIALOG(obj) (GTK_CHECK_TYPE ((obj), TYPE_PAGE_INFO_DIALOG))
-#define IS_PAGE_INFO_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PAGE_INFO_DIALOG))
+#define PAGE_INFO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_INFO_DIALOG, PageInfoDialog))
+#define PAGE_INFO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PAGE_INFO_DIALOG, PageInfoDialogClass))
+#define IS_PAGE_INFO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_INFO_DIALOG))
+#define IS_PAGE_INFO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PAGE_INFO_DIALOG))
typedef struct PageInfoDialogPrivate PageInfoDialogPrivate;
diff --git a/src/pdm-dialog.h b/src/pdm-dialog.h
index 2e14f9a..e8a7f81 100644
--- a/src/pdm-dialog.h
+++ b/src/pdm-dialog.h
@@ -28,10 +28,10 @@ typedef struct PdmDialog PdmDialog;
typedef struct PdmDialogClass PdmDialogClass;
#define TYPE_PDM_DIALOG (pdm_dialog_get_type ())
-#define PDM_DIALOG(obj) (GTK_CHECK_CAST ((obj), TYPE_PDM_DIALOG, PdmDialog))
-#define PDM_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PDM_DIALOG, PdmDialogClass))
-#define IS_PDM_DIALOG(obj) (GTK_CHECK_TYPE ((obj), TYPE_PDM_DIALOG))
-#define IS_PDM_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PDM_DIALOG))
+#define PDM_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PDM_DIALOG, PdmDialog))
+#define PDM_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PDM_DIALOG, PdmDialogClass))
+#define IS_PDM_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PDM_DIALOG))
+#define IS_PDM_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PDM_DIALOG))
typedef struct PdmDialogPrivate PdmDialogPrivate;
diff --git a/src/ppview-toolbar.h b/src/ppview-toolbar.h
index 2747560..f0bfd3f 100644
--- a/src/ppview-toolbar.h
+++ b/src/ppview-toolbar.h
@@ -31,10 +31,10 @@ typedef struct PPViewToolbar PPViewToolbar;
typedef struct PPViewToolbarClass PPViewToolbarClass;
#define TYPE_PPVIEW_TOOLBAR (ppview_toolbar_get_type ())
-#define PPVIEW_TOOLBAR(obj) (GTK_CHECK_CAST ((obj), TYPE_PPVIEW_TOOLBAR, PPViewToolbar))
-#define PPVIEW_TOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PPVIEW_TOOLBAR, PPViewToolbarClass))
-#define IS_PPVIEW_TOOLBAR(obj) (GTK_CHECK_TYPE ((obj), TYPE_PPVIEW_TOOLBAR))
-#define IS_PPVIEW_TOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PPVIEW_TOOLBAR))
+#define PPVIEW_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PPVIEW_TOOLBAR, PPViewToolbar))
+#define PPVIEW_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PPVIEW_TOOLBAR, PPViewToolbarClass))
+#define IS_PPVIEW_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PPVIEW_TOOLBAR))
+#define IS_PPVIEW_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PPVIEW_TOOLBAR))
typedef struct PPViewToolbarPrivate PPViewToolbarPrivate;
diff --git a/src/session.h b/src/session.h
index 77460c8..aa69cee 100644
--- a/src/session.h
+++ b/src/session.h
@@ -34,10 +34,10 @@ typedef struct Session Session;
typedef struct SessionClass SessionClass;
#define TYPE_SESSION (session_get_type ())
-#define SESSION(obj) (GTK_CHECK_CAST ((obj), TYPE_SESSION, Session))
-#define SESSION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), SESSION, SessionClass))
-#define IS_SESSION(obj) (GTK_CHECK_TYPE ((obj), TYPE_SESSION))
-#define IS_SESSION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SESSION))
+#define SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SESSION, Session))
+#define SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SESSION, SessionClass))
+#define IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SESSION))
+#define IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SESSION))
typedef struct SessionPrivate SessionPrivate;
diff --git a/src/statusbar.c b/src/statusbar.c
index 8983e62..8b9f24d 100755
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -47,7 +47,6 @@ static void
security_icon_clicked_cb (GtkWidget *widget, Statusbar *s);
static GObjectClass *parent_class = NULL;
-static GtkTooltips *_statusbar_tooltips = NULL;
#define STATUSBAR_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
TYPE_STATUSBAR, StatusbarPrivate))
@@ -147,7 +146,7 @@ create_compact_image_button (const char *stock_id)
rcstyle = gtk_rc_style_new ();
rcstyle->xthickness = rcstyle->ythickness = 0;
gtk_widget_modify_style (button, rcstyle);
- gtk_rc_style_unref (rcstyle);
+ g_object_unref (rcstyle);
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
gtk_widget_size_request (image, &size);
@@ -172,8 +171,8 @@ update_offline_icon (Statusbar *t)
offline ? STOCK_DISCONNECT
: STOCK_CONNECT,
GTK_ICON_SIZE_MENU);
- gtk_tooltips_set_tip (_statusbar_tooltips, t->priv->offline_button,
- _(tooltips[!!offline]), NULL);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (t->priv->offline_button),
+ _(tooltips[!!offline]));
}
static void
@@ -260,16 +259,6 @@ create_statusbar_popupblock_icon(Statusbar *s)
static void
statusbar_init (Statusbar *t)
{
- if (!_statusbar_tooltips)
- {
- _statusbar_tooltips = gtk_tooltips_new ();
- g_object_add_weak_pointer (G_OBJECT (_statusbar_tooltips),
- (gpointer)&_statusbar_tooltips);
- }
-
- g_object_ref (_statusbar_tooltips);
- gtk_object_sink (GTK_OBJECT (_statusbar_tooltips));
-
t->priv = STATUSBAR_GET_PRIVATE (t);
t->priv->visibility = TRUE;
}
@@ -290,8 +279,6 @@ statusbar_finalize (GObject *object)
g_free (s->priv->popup_uri);
- g_object_unref (_statusbar_tooltips);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -336,8 +323,8 @@ statusbar_set_security_state (Statusbar *t,
gtk_image_set_from_stock (GTK_IMAGE (t->priv->security_icon),
stock_icon, GTK_ICON_SIZE_MENU);
- gtk_tooltips_set_tip (_statusbar_tooltips, t->priv->security_button,
- tooltip, NULL);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (t->priv->security_button),
+ tooltip);
}
void
@@ -401,8 +388,8 @@ statusbar_set_popup_block(Statusbar *s,
"Click to allow popups from this site."),
s->priv->popup_uri);
- gtk_tooltips_set_tip(_statusbar_tooltips, s->priv->popupblock_button,
- tooltip, NULL);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (s->priv->popupblock_button),
+ tooltip);
g_free(tooltip);
}
diff --git a/src/statusbar.h b/src/statusbar.h
index dda48b3..e93e069 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -29,10 +29,10 @@ typedef struct Statusbar Statusbar;
typedef struct StatusbarClass StatusbarClass;
#define TYPE_STATUSBAR (statusbar_get_type ())
-#define STATUSBAR(obj) (GTK_CHECK_CAST ((obj), TYPE_STATUSBAR, Statusbar))
-#define STATUSBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), STATUSBAR, StatusbarClass))
-#define IS_STATUSBAR(obj) (GTK_CHECK_TYPE ((obj), TYPE_STATUSBAR))
-#define IS_STATUSBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), STATUSBAR))
+#define STATUSBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STATUSBAR, Statusbar))
+#define STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), STATUSBAR, StatusbarClass))
+#define IS_STATUSBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_STATUSBAR))
+#define IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), STATUSBAR))
typedef struct StatusbarPrivate StatusbarPrivate;
diff --git a/utils/galeon-dialog.h b/utils/galeon-dialog.h
index dba0566..23ed343 100644
--- a/utils/galeon-dialog.h
+++ b/utils/galeon-dialog.h
@@ -28,10 +28,10 @@ G_BEGIN_DECLS
typedef struct GaleonDialogClass GaleonDialogClass;
#define GALEON_TYPE_DIALOG (galeon_dialog_get_type ())
-#define GALEON_DIALOG(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_DIALOG, GaleonDialog))
-#define GALEON_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_DIALOG, GaleonDialogClass))
-#define GALEON_IS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_DIALOG))
-#define GALEON_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_DIALOG))
+#define GALEON_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_DIALOG, GaleonDialog))
+#define GALEON_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_DIALOG, GaleonDialogClass))
+#define GALEON_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_DIALOG))
+#define GALEON_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_DIALOG))
#define GALEON_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_DIALOG, GaleonDialogClass))
typedef struct GaleonDialog GaleonDialog;
diff --git a/utils/galeon-sidebar.h b/utils/galeon-sidebar.h
index 2bb2e03..eadbc75 100644
--- a/utils/galeon-sidebar.h
+++ b/utils/galeon-sidebar.h
@@ -29,10 +29,10 @@ G_BEGIN_DECLS
typedef struct GaleonSidebarClass GaleonSidebarClass;
#define GALEON_TYPE_SIDEBAR (galeon_sidebar_get_type ())
-#define GALEON_SIDEBAR(obj) (GTK_CHECK_CAST ((obj), GALEON_TYPE_SIDEBAR, GaleonSidebar))
-#define GALEON_SIDEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GALEON_TYPE_SIDEBAR, GaleonSidebarClass))
-#define GALEON_IS_SIDEBAR(obj) (GTK_CHECK_TYPE ((obj), GALEON_TYPE_SIDEBAR))
-#define GALEON_IS_SIDEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GALEON_SIDEBAR))
+#define GALEON_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GALEON_TYPE_SIDEBAR, GaleonSidebar))
+#define GALEON_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GALEON_TYPE_SIDEBAR, GaleonSidebarClass))
+#define GALEON_IS_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GALEON_TYPE_SIDEBAR))
+#define GALEON_IS_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GALEON_SIDEBAR))
#define GALEON_SIDEBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GALEON_TYPE_SIDEBAR, GaleonSidebarClass))
typedef struct GaleonSidebar GaleonSidebar;
diff --git a/utils/gul-download.c b/utils/gul-download.c
index cb58393..3b01e40 100644
--- a/utils/gul-download.c
+++ b/utils/gul-download.c
@@ -34,7 +34,7 @@
#include <libgnome/gnome-exec.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <bonobo-activation/bonobo-activation-activate.h>
-#include <gtk/gtkfilesel.h>
+#include <gtk/gtk.h>
static gboolean gul_download_gtm_add_url (const gchar *url, gchar *dir,
gboolean disable_proxy,
diff --git a/utils/gul-ellipsizing-label.h b/utils/gul-ellipsizing-label.h
index c4a6f1c..23cdbb7 100644
--- a/utils/gul-ellipsizing-label.h
+++ b/utils/gul-ellipsizing-label.h
@@ -28,10 +28,10 @@
#include <gtk/gtklabel.h>
#define GUL_TYPE_ELLIPSIZING_LABEL (gul_ellipsizing_label_get_type ())
-#define GUL_ELLIPSIZING_LABEL(obj) (GTK_CHECK_CAST ((obj), GUL_TYPE_ELLIPSIZING_LABEL, GulEllipsizingLabel))
-#define GUL_ELLIPSIZING_LABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GUL_TYPE_ELLIPSIZING_LABEL, GulEllipsizingLabelClass))
-#define GUL_IS_ELLIPSIZING_LABEL(obj) (GTK_CHECK_TYPE ((obj), GUL_TYPE_ELLIPSIZING_LABEL))
-#define GUL_IS_ELLIPSIZING_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GUL_TYPE_ELLIPSIZING_LABEL))
+#define GUL_ELLIPSIZING_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GUL_TYPE_ELLIPSIZING_LABEL, GulEllipsizingLabel))
+#define GUL_ELLIPSIZING_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GUL_TYPE_ELLIPSIZING_LABEL, GulEllipsizingLabelClass))
+#define GUL_IS_ELLIPSIZING_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GUL_TYPE_ELLIPSIZING_LABEL))
+#define GUL_IS_ELLIPSIZING_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GUL_TYPE_ELLIPSIZING_LABEL))
typedef struct GulEllipsizingLabel GulEllipsizingLabel;
typedef struct GulEllipsizingLabelClass GulEllipsizingLabelClass;
@@ -46,7 +46,7 @@ struct GulEllipsizingLabelClass {
GtkLabelClass parent_class;
};
-GtkType gul_ellipsizing_label_get_type (void);
+GType gul_ellipsizing_label_get_type (void);
GtkWidget *gul_ellipsizing_label_new (const char *string);
void gul_ellipsizing_label_set_text (GulEllipsizingLabel *label,
const char *string);
diff --git a/utils/gul-gui.c b/utils/gul-gui.c
index c036ae3..1384210 100644
--- a/utils/gul-gui.c
+++ b/utils/gul-gui.c
@@ -513,7 +513,7 @@ gul_gui_window_present (GtkWindow *window, guint32 user_time)
widget = GTK_WIDGET (window);
- if (GTK_WIDGET_VISIBLE (window))
+ if (gtk_widget_get_visual (widget))
{
g_assert (widget->window != NULL);
diff --git a/utils/gul-notebook.c b/utils/gul-notebook.c
index 76b1ead..2fa173a 100644
--- a/utils/gul-notebook.c
+++ b/utils/gul-notebook.c
@@ -273,7 +273,7 @@ find_tab_num_at_pos (GulNotebook *notebook, gint abs_x, gint abs_y)
tab = gtk_notebook_get_tab_label (nb, page);
g_return_val_if_fail (tab != NULL, -1);
- if (!GTK_WIDGET_MAPPED (GTK_WIDGET (tab)))
+ if (!gtk_widget_get_mapped (GTK_WIDGET (tab)))
{
page_num++;
continue;
diff --git a/utils/gul-notebook.h b/utils/gul-notebook.h
index 480d310..14df479 100644
--- a/utils/gul-notebook.h
+++ b/utils/gul-notebook.h
@@ -27,10 +27,10 @@ G_BEGIN_DECLS
typedef struct GulNotebookClass GulNotebookClass;
#define GUL_TYPE_NOTEBOOK (gul_notebook_get_type ())
-#define GUL_NOTEBOOK(obj) (GTK_CHECK_CAST ((obj), GUL_TYPE_NOTEBOOK, GulNotebook))
-#define GUL_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GUL_TYPE_NOTEBOOK, GulNotebookClass))
-#define GUL_IS_NOTEBOOK(obj) (GTK_CHECK_TYPE ((obj), GUL_TYPE_NOTEBOOK))
-#define GUL_IS_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GUL_NOTEBOOK))
+#define GUL_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GUL_TYPE_NOTEBOOK, GulNotebook))
+#define GUL_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GUL_TYPE_NOTEBOOK, GulNotebookClass))
+#define GUL_IS_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GUL_TYPE_NOTEBOOK))
+#define GUL_IS_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GUL_NOTEBOOK))
typedef struct GulNotebook GulNotebook;
typedef struct GulNotebookPrivate GulNotebookPrivate;
diff --git a/utils/gul-toolbutton.c b/utils/gul-toolbutton.c
index 55db16f..104246f 100644
--- a/utils/gul-toolbutton.c
+++ b/utils/gul-toolbutton.c
@@ -25,11 +25,9 @@
#include "galeon-marshal.h"
#include "galeon-debug.h"
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
#include <glib/gi18n.h>
/**
@@ -50,6 +48,7 @@ struct _GulToolbuttonPrivate
enum {
PROP_0,
PROP_SHOW_ARROW,
+ PROP_TOOLTIP,
};
@@ -116,7 +115,7 @@ state_changed_cb (GtkWidget *widget, GtkStateType previous_state,
{
GulToolbuttonPrivate *p = b->priv;
GtkWidget *button;
- GtkStateType state = GTK_WIDGET_STATE (widget);
+ GtkStateType state = gtk_widget_get_state (widget);
if (!p->arrow_widget) return;
@@ -147,7 +146,7 @@ state_changed_cb (GtkWidget *widget, GtkStateType previous_state,
}
else if (state == GTK_STATE_INSENSITIVE &&
previous_state != GTK_STATE_NORMAL &&
- GTK_WIDGET_STATE (button) != GTK_STATE_INSENSITIVE)
+ gtk_widget_get_state (button) != GTK_STATE_INSENSITIVE)
{
/* This case ensures that when transfering from prelight
* to insensitive, the state (of the arrow, which is set
@@ -197,24 +196,6 @@ button_button_popup_menu_cb (GtkWidget *w, GulToolbutton *b)
}
}
-static gboolean
-gul_toolbutton_set_tooltip (GtkToolItem *tool_item,
- GtkTooltips *tooltips,
- const gchar *tip_text,
- const gchar *tip_private)
-{
- GulToolbuttonPrivate *p = GUL_TOOLBUTTON (tool_item)->priv;
- GtkWidget *button = gul_toolbutton_get_button (GUL_TOOLBUTTON (tool_item));
-
- gtk_tooltips_set_tip (tooltips, button, tip_text, tip_private);
- if (p->arrow_widget)
- {
- gtk_tooltips_set_tip (tooltips, p->arrow_widget, tip_text, tip_private);
- }
-
- return TRUE;
-}
-
static void
gul_toolbutton_build (GulToolbutton *button)
{
@@ -321,6 +302,20 @@ gul_toolbutton_set_property (GObject *object,
gul_toolbutton_set_show_arrow (button, v);
}
break;
+ case PROP_TOOLTIP:
+ {
+ GulToolbuttonPrivate *p = GUL_TOOLBUTTON (object)->priv;
+ GtkWidget *button = gul_toolbutton_get_button (GUL_TOOLBUTTON (object));
+ const char *text = g_value_get_string (value);
+
+ gtk_widget_set_tooltip_text (button, text);
+ if (p->arrow_widget)
+ {
+ gtk_widget_set_tooltip_text (p->arrow_widget, text);
+ }
+ }
+ break;
+
default:
break;
}
@@ -349,19 +344,15 @@ static void
gul_toolbutton_class_init (GulToolbuttonClass *klass)
{
GObjectClass *object_class;
- GtkToolItemClass *toolitem_class;
parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass *) klass;
- toolitem_class = (GtkToolItemClass *) klass;
object_class->finalize = gul_toolbutton_finalize_impl;
object_class->set_property = gul_toolbutton_set_property;
object_class->get_property = gul_toolbutton_get_property;
- toolitem_class->set_tooltip = gul_toolbutton_set_tooltip;
-
g_object_class_install_property (object_class,
PROP_SHOW_ARROW,
g_param_spec_boolean ("show_arrow",
@@ -370,6 +361,14 @@ gul_toolbutton_class_init (GulToolbuttonClass *klass)
FALSE,
G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_TOOLTIP,
+ g_param_spec_object ("tooltip",
+ _("Set Tooltip"),
+ _("Set the tooltip."),
+ GTK_TYPE_TOOLTIP,
+ G_PARAM_READWRITE));
+
GulToolbuttonSignals[GUL_TOOLBUTTON_MENU_ACTIVATED] = g_signal_new (
"menu-activated", G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST | G_SIGNAL_RUN_CLEANUP,
diff --git a/utils/location-entry.c b/utils/location-entry.c
index b69fc9f..f8fda73 100644
--- a/utils/location-entry.c
+++ b/utils/location-entry.c
@@ -442,13 +442,13 @@ galeon_location_entry_key_press_event_cb (GtkWidget *entry, GdkEventKey *event,
if (p->autocompletion_timeout != 0)
{
- gtk_timeout_remove (p->autocompletion_timeout);
+ g_source_remove (p->autocompletion_timeout);
p->autocompletion_timeout = 0;
}
if (p->show_alternatives_timeout != 0)
{
- gtk_timeout_remove (p->show_alternatives_timeout);
+ g_source_remove (p->show_alternatives_timeout);
p->show_alternatives_timeout = 0;
}
@@ -610,7 +610,7 @@ galeon_location_entry_key_press_event_cb (GtkWidget *entry, GdkEventKey *event,
&& eel_gconf_get_boolean (CONF_HISTORY_AUTOCOMP_ENABLE)
&& p->autocompletion)
{
- p->autocompletion_timeout = gtk_timeout_add
+ p->autocompletion_timeout = g_timeout_add
(AUTOCOMPLETION_DELAY,
(GSourceFunc) galeon_location_entry_autocompletion_to, w);
}
@@ -648,7 +648,7 @@ galeon_location_entry_autocompletion_sources_changed_cb (GaleonAutocompletion *a
&& p->last_completion
&& !strcmp (p->last_completion, gtk_entry_get_text (GTK_ENTRY (p->entry))))
{
- p->autocompletion_timeout = gtk_timeout_add
+ p->autocompletion_timeout = g_timeout_add
(AUTOCOMPLETION_DELAY,
(GSourceFunc) galeon_location_entry_autocompletion_to, w);
}
@@ -656,7 +656,7 @@ galeon_location_entry_autocompletion_sources_changed_cb (GaleonAutocompletion *a
if (p->show_alternatives_timeout == 0
&& p->autocompletion_window_visible)
{
- p->show_alternatives_timeout = gtk_timeout_add
+ p->show_alternatives_timeout = g_timeout_add
(SHOW_ALTERNATIVES_DELAY,
(GSourceFunc) galeon_location_entry_autocompletion_show_alternatives_to, w);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
