casa-mp-base

--- acinclude.m4.old

+++ acinclude.m4

@@ -164,7 +164,7 @@ AC_ARG_ENABLE(gtk,

  USE_GTK=$enableval, USE_GTK=yes)

 if test $USE_GTK = yes ; then

-    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)

+    PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)

     AC_DEFINE(USE_GTK, 1, [Define if GTK+ support enabled])

 fi

--- configure.ac.old

+++ configure.ac

@@ -450,7 +450,7 @@ ENABLE_PLUGIN_WITH_DEP(hotkey,

     auto,

     GENERAL,

     GDKX11,

-    gdk-x11-2.0)

+    gdk-x11-3.0)

 ENABLE_PLUGIN_WITH_DEP(aosd,

     X11 OSD,

--- src/alarm/interface.cc.old

+++ src/alarm/interface.cc

@@ -24,6 +24,10 @@

 #include "callbacks.h"

+#if GTK_CHECK_VERSION (3, 12, 0)

+#define gtk_widget_set_margin_right gtk_widget_set_margin_end

+#endif

+

 static const char help_text[] =

  N_("Time\n"

     "  Alarm at:\n"

@@ -158,62 +162,71 @@ GtkWidget *create_config_notebook ()

     /* Page 1 */

     frame = gtk_frame_new (_("Time"));

-    gtk_container_set_border_width (GTK_CONTAINER (frame), 6);

-    grid = gtk_table_new (0, 0, false);

-    gtk_table_set_col_spacings (GTK_TABLE (grid), 6);

-    gtk_table_set_row_spacings (GTK_TABLE (grid), 6);

-    gtk_container_set_border_width (GTK_CONTAINER (grid), 6);

+    gtk_container_set_border_width (GTK_CONTAINER (frame), 10);

+    grid = gtk_grid_new ();

+    gtk_grid_set_column_spacing (GTK_GRID (grid), 3);

+    gtk_grid_set_row_homogeneous (GTK_GRID (grid), true);

+    gtk_container_set_border_width (GTK_CONTAINER (grid), 5);

     label = gtk_label_new (_("Alarm at (default):"));

-    gtk_table_attach (GTK_TABLE (grid), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);

+    gtk_widget_set_margin_right (label, 10);

+    gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);

-    adjustment = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);

+    adjustment = gtk_adjustment_new (6, 0, 23, 1, 10, 0);

     alarm_h_spin = gtk_spin_button_new (adjustment, 1, 0);

+    gtk_widget_set_valign (alarm_h_spin, GTK_ALIGN_CENTER);

     g_object_set_data (G_OBJECT (notebook), "alarm_h_spin", alarm_h_spin);

     gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_h_spin), GTK_UPDATE_IF_VALID);

     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), true);

     gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), true);