[Xfce4-commits] [panel-plugins/xfce4-weather-plugin] 04/25: Do not include individual headers. Do not use deprecated symbols.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-weather-plugin.

commit 7e650ff61c388893297a44ed987d0bde66b5f81b
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Sep 9 14:08:30 2018 -0400

    Do not include individual headers. Do not use deprecated symbols.
---
 panel-plugin/Makefile.am         | 5 ++++-
 panel-plugin/weather-config.c    | 4 ++--
 panel-plugin/weather-scrollbox.c | 4 ++--
 panel-plugin/weather-summary.c   | 2 +-
 panel-plugin/weather.c           | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 3c35e13..3af5cd1 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -38,7 +38,10 @@ libweather_la_CFLAGS =						\
 	$(GTK_CFLAGS)							\
 	$(SOUP_CFLAGS)							\
 	$(UPOWER_GLIB_CFLAGS)						\
-	$(LIBXML_CFLAGS)
+	$(LIBXML_CFLAGS)	\
+	-DGTK_DISABLE_SINGLE_INCLUDES	\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED
 
 libweather_la_LIBADD =						\
 	$(LIBM)                                 \
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index d9aa2f6..e0b0f51 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -65,7 +65,7 @@
     gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
 
 #define ADD_COMBO_VALUE(combo, text)                        \
-    gtk_combo_box_append_text(GTK_COMBO_BOX(combo), text);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), text);
 
 #define SET_COMBO_VALUE(combo, val)                         \
     gtk_combo_box_set_active(GTK_COMBO_BOX(combo), val);
@@ -1613,7 +1613,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
 
 static void
 notebook_page_switched(GtkNotebook *notebook,
-                       GtkNotebookPage *page,
+                       GtkWidget *page,
                        guint page_num,
                        gpointer user_data)
 {
diff --git a/panel-plugin/weather-scrollbox.c b/panel-plugin/weather-scrollbox.c
index 58bf6fa..9883815 100644
--- a/panel-plugin/weather-scrollbox.c
+++ b/panel-plugin/weather-scrollbox.c
@@ -64,7 +64,7 @@ gtk_scrollbox_class_init(GtkScrollboxClass *klass)
 static void
 gtk_scrollbox_init(GtkScrollbox *self)
 {
-    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
+    gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
 
     self->labels = NULL;
     self->labels_new = NULL;
@@ -215,7 +215,7 @@ gtk_scrollbox_expose_event(GtkWidget *widget,
 
         gtk_paint_layout(widget->style,
                          widget->window,
-                         GTK_WIDGET_STATE(widget), TRUE,
+                         gtk_widget_get_state(widget), TRUE,
                          &event->area, widget,
                          "GtkScrollbox", width, height, layout);
     }
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 5057cbe..14d220c 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -1076,7 +1076,7 @@ summary_dialog_response(const GtkWidget *dlg,
 
 static void
 cb_notebook_page_switched(GtkNotebook *notebook,
-                          GtkNotebookPage *page,
+                          GtkWidget *page,
                           guint page_num,
                           gpointer user_data)
 {
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index baced65..338020b 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -311,7 +311,7 @@ scrollbox_set_visible(plugin_data *data)
     if (data->show_scrollbox && data->labels->len > 0)
         gtk_widget_show_all(GTK_WIDGET(data->vbox_center_scrollbox));
     else
-        gtk_widget_hide_all(GTK_WIDGET(data->vbox_center_scrollbox));
+        gtk_widget_hide(GTK_WIDGET(data->vbox_center_scrollbox));
     gtk_scrollbox_set_visible(GTK_SCROLLBOX(data->scrollbox),
                               data->show_scrollbox);
 }
@@ -1645,9 +1645,9 @@ xfceweather_create_options(XfcePanelPlugin *plugin,
     if (gtk_builder_add_from_string (builder, weather_config_ui,
                                      weather_config_ui_length, &error) != 0)
     {
-        dlg = gtk_builder_get_object (builder, "dialog");
+        dlg = GTK_WIDGET (gtk_builder_get_object (builder, "dialog"));
         gtk_window_set_transient_for (GTK_WINDOW (dlg), 
-                                      (gtk_widget_get_toplevel
+                                      GTK_WINDOW (gtk_widget_get_toplevel
                                        (GTK_WIDGET(plugin))));
 
         dialog = create_config_dialog(data, builder);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.