diff options
| author | Thomas Hindoe Paaboel Andersen <thomashpa@src.gnome.org> | 2009-02-25 23:04:00 +0000 |
|---|---|---|
| committer | Thomas Hindoe Paaboel Andersen <thomashpa@src.gnome.org> | 2009-02-25 23:04:00 +0000 |
| commit | ce1e6294e73cfd66c781e72deb45b52c45889fdd (patch) | |
| tree | 3e8fe163c26d56a61af37c4772aa16ddde4ca435 | |
| parent | d3262503964fc12fae2175dee0a69c28f920006f (diff) | |
| download | yelp-ce1e6294e73cfd66c781e72deb45b52c45889fdd.tar.gz | |
Replace deprecated gtk symbols. Bug #571868
svn path=/trunk/; revision=3221
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/yelp-base.c | 2 | ||||
| -rw-r--r-- | src/yelp-html.h | 8 | ||||
| -rw-r--r-- | src/yelp-settings.c | 3 | ||||
| -rw-r--r-- | src/yelp-window.h | 8 |
5 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2009-02-25 Thomas H.P. Andersen <phomes@gmail.com> + + * src/yelp-base.c (yelp_base_init): + * src/yelp-settings.c (settings_update): + * src/yelp-window.h: + * src/yelp-html.h: + Replace deprecated gtk symbols. Bug #571868 + 2009-02-25 Andre Klapper <a9016009@gmx.de> * src/yelp-search-parser.c (search_clean_snippet): diff --git a/src/yelp-base.c b/src/yelp-base.c index 066568bd..c702a996 100644 --- a/src/yelp-base.c +++ b/src/yelp-base.c @@ -107,7 +107,7 @@ yelp_base_init (YelpBase *base) static void yelp_base_class_init (YelpBaseClass *klass) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_peek (PARENT_TYPE); main_running = TRUE; diff --git a/src/yelp-html.h b/src/yelp-html.h index 23d90711..5994eb79 100644 --- a/src/yelp-html.h +++ b/src/yelp-html.h @@ -30,10 +30,10 @@ G_BEGIN_DECLS #define YELP_TYPE_HTML (yelp_html_get_type ()) -#define YELP_HTML(o) (GTK_CHECK_CAST ((o), YELP_TYPE_HTML, YelpHtml)) -#define YELP_HTML_CLASS(k) (GTK_CHECK_FOR_CAST((k), YELP_TYPE_HTML, YelpHtmlClass)) -#define YELP_IS_HTML(o) (GTK_CHECK_TYPE ((o), YELP_TYPE_HTML)) -#define YELP_IS_HTML_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), YELP_TYPE_HTML)) +#define YELP_HTML(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), YELP_TYPE_HTML, YelpHtml)) +#define YELP_HTML_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), YELP_TYPE_HTML, YelpHtmlClass)) +#define YELP_IS_HTML(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), YELP_TYPE_HTML)) +#define YELP_IS_HTML_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), YELP_TYPE_HTML)) #define YELP_HTML_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), YELP_TYPE_HTML, YelpHtmlClass)) typedef struct _YelpHtml YelpHtml; diff --git a/src/yelp-settings.c b/src/yelp-settings.c index 017082fc..04f0ce46 100644 --- a/src/yelp-settings.c +++ b/src/yelp-settings.c @@ -776,7 +776,8 @@ settings_update (YelpSettingsType type) gdk_color_free (color); } - gtk_object_sink (GTK_OBJECT (widget)); + g_object_ref_sink (widget); + g_object_unref (widget); hls_to_hex (text_h, text_l - ((text_l - base_l) * 0.4), diff --git a/src/yelp-window.h b/src/yelp-window.h index 89364a68..5725d482 100644 --- a/src/yelp-window.h +++ b/src/yelp-window.h @@ -31,10 +31,10 @@ #include "yelp-utils.h" #define YELP_TYPE_WINDOW (yelp_window_get_type ()) -#define YELP_WINDOW(obj) (GTK_CHECK_CAST ((obj), YELP_TYPE_WINDOW, YelpWindow)) -#define YELP_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), YELP_TYPE_WINDOW, YelpWindowClass)) -#define YELP_IS_WINDOW(obj) (GTK_CHECK_TYPE ((obj), YELP_TYPE_WINDOW)) -#define YELP_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), YELP_TYPE_WINDOW)) +#define YELP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), YELP_TYPE_WINDOW, YelpWindow)) +#define YELP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), YELP_TYPE_WINDOW, YelpWindowClass)) +#define YELP_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), YELP_TYPE_WINDOW)) +#define YELP_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), YELP_TYPE_WINDOW)) typedef struct _YelpWindow YelpWindow; typedef struct _YelpWindowClass YelpWindowClass; |