[Xfce4-commits] [panel-plugins/xfce4-datetime-plugin] 02/02: Fix build warnings

[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-datetime-plugin.

commit 12158782c49277306a6a436a252b67c57ff03831
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Apr 22 06:36:50 2019 -0400

    Fix build warnings
---
 panel-plugin/datetime-dialog.c | 13 ++++++++-----
 panel-plugin/datetime.c        | 12 +++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c
index 5b82017..22552a1 100644
--- a/panel-plugin/datetime-dialog.c
+++ b/panel-plugin/datetime-dialog.c
@@ -360,8 +360,8 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
   gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
   gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
 
-  gtk_container_set_border_width(gtk_dialog_get_content_area(GTK_DIALOG(dlg)), 12);
-  gtk_box_set_spacing(gtk_dialog_get_content_area(GTK_DIALOG(dlg)), 18);
+  gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), 12);
+  gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), 18);
 
   /* size group */
   sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -370,7 +370,8 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
    * layout frame
    */
   frame = xfce_gtk_frame_box_new(_("Layout"), &bin);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (bin), 6, 0, 12, 0);
+  gtk_widget_set_margin_top(GTK_WIDGET (bin), 6);
+  gtk_widget_set_margin_start(GTK_WIDGET (bin), 12);
   gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), frame,
       FALSE, FALSE, 0);
 
@@ -404,7 +405,8 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
    * Date frame
    */
   datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (bin), 6, 0, 12, 0);
+  gtk_widget_set_margin_top(GTK_WIDGET (bin), 6);
+  gtk_widget_set_margin_start(GTK_WIDGET (bin), 12);
   gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), datetime->date_frame,
       FALSE, FALSE, 0);
 
@@ -502,7 +504,8 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
    * time frame
    */
   datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (bin), 6, 0, 12, 0);
+  gtk_widget_set_margin_top(GTK_WIDGET (bin), 6);
+  gtk_widget_set_margin_start(GTK_WIDGET (bin), 12);
   gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), datetime->time_frame,
       FALSE, FALSE, 0);
 
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 1722dd1..eae98fd 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -264,13 +264,12 @@ static gboolean close_calendar_window(t_datetime *datetime)
  */
 static GtkWidget * pop_calendar_window(t_datetime *datetime, int orientation)
 {
-  GtkWidget *window;
-  GtkWidget *frame;
-  GtkWidget *cal;
-  GtkWidget *parent = datetime->button;
-  GdkScreen *screen;
+  GtkWidget  *window;
+  GtkWidget  *frame;
+  GtkWidget  *cal;
+  GtkWidget  *parent = datetime->button;
+  GdkScreen  *screen;
   GtkCalendarDisplayOptions display_options;
-  int num;
 
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
@@ -281,7 +280,6 @@ static GtkWidget * pop_calendar_window(t_datetime *datetime, int orientation)
 
   /* set screen number */
   screen = gtk_widget_get_screen(parent);
-  num = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(parent));
   gtk_window_set_screen(GTK_WINDOW(window), screen);
 
   frame = gtk_frame_new(NULL);

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