summaryrefslogtreecommitdiff
path: root/mate-dictionary
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-14 15:46:56 +0100
committerinfirit <[email protected]>2014-12-15 23:24:56 +0100
commit4fbdbe250e0cee0c76ffb521b658c93f192539f8 (patch)
tree517379015fc9f056d592cfa8c9fbdf177840f7ed /mate-dictionary
parent55f6eca4a8876718f9050191c7f67594928151c1 (diff)
downloadmate-utils-4fbdbe250e0cee0c76ffb521b658c93f192539f8.tar.bz2
mate-utils-4fbdbe250e0cee0c76ffb521b658c93f192539f8.tar.xz
Fix deprecated functions
Remove, now unneeded, gdkkeysyms-compat.h include Always use gtk_combo_box_text_new (since Gtk+ 2.24) Gtk3: do not use gdk_cursor_unref Gtk3: replace gtk_hpaned_new Gtk3: replace gtk_widget_modify_font
Diffstat (limited to 'mate-dictionary')
-rw-r--r--mate-dictionary/libgdict/gdict-database-chooser.c4
-rw-r--r--mate-dictionary/libgdict/gdict-defbox.c8
-rw-r--r--mate-dictionary/libgdict/gdict-source-chooser.c4
-rw-r--r--mate-dictionary/libgdict/gdict-speller.c4
-rw-r--r--mate-dictionary/libgdict/gdict-strategy-chooser.c4
-rw-r--r--mate-dictionary/src/gdict-window.c4
6 files changed, 28 insertions, 0 deletions
diff --git a/mate-dictionary/libgdict/gdict-database-chooser.c b/mate-dictionary/libgdict/gdict-database-chooser.c
index 11cc80ce..abf5f86e 100644
--- a/mate-dictionary/libgdict/gdict-database-chooser.c
+++ b/mate-dictionary/libgdict/gdict-database-chooser.c
@@ -190,7 +190,11 @@ gdict_database_chooser_dispose (GObject *gobject)
if (priv->busy_cursor)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_object_unref (priv->busy_cursor);
+#else
gdk_cursor_unref (priv->busy_cursor);
+#endif
priv->busy_cursor = NULL;
}
diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
index 86d4427f..48bda738 100644
--- a/mate-dictionary/libgdict/gdict-defbox.c
+++ b/mate-dictionary/libgdict/gdict-defbox.c
@@ -52,6 +52,10 @@
#define QUERY_MARGIN 48
#define ERROR_MARGIN 24
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gdk_cursor_unref g_object_unref
+#endif
+
typedef struct
{
GdictDefinition *definition;
@@ -2853,7 +2857,11 @@ gdict_defbox_set_font_name (GdictDefbox *defbox,
else
font_desc = NULL;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_override_font (priv->text_view, font_desc);
+#else
gtk_widget_modify_font (priv->text_view, font_desc);
+#endif
if (font_desc)
pango_font_description_free (font_desc);
diff --git a/mate-dictionary/libgdict/gdict-source-chooser.c b/mate-dictionary/libgdict/gdict-source-chooser.c
index eecdc96c..dada5958 100644
--- a/mate-dictionary/libgdict/gdict-source-chooser.c
+++ b/mate-dictionary/libgdict/gdict-source-chooser.c
@@ -129,7 +129,11 @@ gdict_source_chooser_dispose (GObject *gobject)
if (priv->busy_cursor)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_object_unref (priv->busy_cursor);
+#else
gdk_cursor_unref (priv->busy_cursor);
+#endif
priv->busy_cursor = NULL;
}
diff --git a/mate-dictionary/libgdict/gdict-speller.c b/mate-dictionary/libgdict/gdict-speller.c
index 3c81074e..5f370ba8 100644
--- a/mate-dictionary/libgdict/gdict-speller.c
+++ b/mate-dictionary/libgdict/gdict-speller.c
@@ -173,7 +173,11 @@ gdict_speller_finalize (GObject *gobject)
set_gdict_context (speller, NULL);
if (priv->busy_cursor)
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_object_unref (priv->busy_cursor);
+#else
gdk_cursor_unref (priv->busy_cursor);
+#endif
g_free (priv->strategy);
g_free (priv->database);
diff --git a/mate-dictionary/libgdict/gdict-strategy-chooser.c b/mate-dictionary/libgdict/gdict-strategy-chooser.c
index 9cabc445..375c2aaf 100644
--- a/mate-dictionary/libgdict/gdict-strategy-chooser.c
+++ b/mate-dictionary/libgdict/gdict-strategy-chooser.c
@@ -176,7 +176,11 @@ gdict_strategy_chooser_dispose (GObject *gobject)
if (priv->busy_cursor)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_object_unref (priv->busy_cursor);
+#else
gdk_cursor_unref (priv->busy_cursor);
+#endif
priv->busy_cursor = NULL;
}
diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c
index 6b60dda0..e25ef30c 100644
--- a/mate-dictionary/src/gdict-window.c
+++ b/mate-dictionary/src/gdict-window.c
@@ -1798,7 +1798,11 @@ gdict_window_constructor (GType type,
gtk_box_pack_start (GTK_BOX (hbox), window->entry, TRUE, TRUE, 0);
gtk_widget_show (window->entry);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ handle = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)
+#else
handle = gtk_hpaned_new ();
+#endif
gtk_box_pack_start (GTK_BOX (vbox), handle, TRUE, TRUE, 0);
gtk_widget_show (handle);