diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-05 22:59:01 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-12-17 22:58:28 +0100 |
| commit | 8aaf030b5a40af8520cef1d11097948c563cef11 (patch) | |
| tree | 5131d4e4a946970cd1cd0f2adb97565a8d86f5cb | |
| parent | 68e0d55c0712c06849248e43467d52aea93e7ea4 (diff) | |
| download | mate-control-center-8aaf030b5a40af8520cef1d11097948c563cef11.tar.bz2 mate-control-center-8aaf030b5a40af8520cef1d11097948c563cef11.tar.xz | |
Fix some deprecations and remove some unused vars
| -rw-r--r-- | capplets/accessibility/at-properties/main.c | 1 | ||||
| -rw-r--r-- | capplets/appearance/appearance-main.c | 2 | ||||
| -rw-r--r-- | capplets/display/xrandr-capplet.c | 6 | ||||
| -rw-r--r-- | capplets/keybindings/mate-keybinding-properties.c | 2 | ||||
| -rw-r--r-- | capplets/network/mate-network-properties.c | 1 | ||||
| -rw-r--r-- | font-viewer/font-thumbnailer.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 59160cda..8c62cc1f 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -211,7 +211,6 @@ setup_dialog (GtkBuilder *builder, GSettings *settings) { GtkWidget *widget; GObject *object; - GObject *peditor; object = gtk_builder_get_object (builder, "at_enable_toggle"); g_signal_connect (object, "toggled", diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 65e703ad..b16b76fe 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -38,7 +38,9 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context) GtkBuilder *ui; GError *err = NULL; +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif gdk_threads_init (); gdk_threads_enter (); theme_thumbnail_factory_init (*argc, *argv); diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c index 433b25db..7b3d2057 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -229,7 +229,6 @@ add_key (GtkWidget *widget, GtkComboBox *box = GTK_COMBO_BOX (widget); GtkTreeModel *model = gtk_combo_box_get_model (box); GtkListStore *store = GTK_LIST_STORE (model); - gboolean retval; info.text = text; info.found = FALSE; @@ -248,11 +247,6 @@ add_key (GtkWidget *widget, 5, rotation, -1); - retval = TRUE; - } - else - { - retval = FALSE; } } diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index ab3eaa6e..da017f17 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -1935,7 +1935,9 @@ main (int argc, char *argv[]) GtkBuilder *builder; GSettings *marco_settings; +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif gtk_init (&argc, &argv); bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c index bb611336..d1eaa515 100644 --- a/capplets/network/mate-network-properties.c +++ b/capplets/network/mate-network-properties.c @@ -380,7 +380,6 @@ cb_ignore_hosts_gsettings_changed (GSettings *settings, gchar *key, gpointer use static void setup_dialog (GtkBuilder *builder) { - gint mode; GSList *mode_group; GtkListStore *store; diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index 45928e63..24525f64 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -256,8 +256,12 @@ main(int argc, char **argv) setlocale (LC_ALL, ""); +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); |