all: Bump glib to 2.68

Include config.h everywhere, add min/max check

6 files changed, 14 insertions, 26 deletions

diff --git a/src/universal-cp/action-dialog.c b/src/universal-cp/action-dialog.c
index dd5b271..c882b8a 100644
--- a/src/universal-cp/action-dialog.c
+++ b/src/universal-cp/action-dialog.c
@@ -20,13 +20,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gmodule.h>
 #include <glib/gi18n.h>
 
diff --git a/src/universal-cp/details-treeview.c b/src/universal-cp/details-treeview.c
index d1e3716..ead4583 100644
--- a/src/universal-cp/details-treeview.c
+++ b/src/universal-cp/details-treeview.c
@@ -18,11 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <gmodule.h>
 #include <glib/gi18n.h>
diff --git a/src/universal-cp/device-treeview.c b/src/universal-cp/device-treeview.c
index 3d31b9f..79a9e43 100644
--- a/src/universal-cp/device-treeview.c
+++ b/src/universal-cp/device-treeview.c
@@ -18,11 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <gmodule.h>
 #include <glib/gi18n.h>
diff --git a/src/universal-cp/event-treeview.c b/src/universal-cp/event-treeview.c
index 4d8f2a2..facec79 100644
--- a/src/universal-cp/event-treeview.c
+++ b/src/universal-cp/event-treeview.c
@@ -18,11 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <gmodule.h>
 #include <glib/gi18n.h>
@@ -309,11 +308,7 @@ get_display_value (const char *value)
         if (size > MAX_VALUE_SIZE)
                 size = MAX_VALUE_SIZE;
 
-#if GLIB_CHECK_VERSION(2,68,0)
         display_value = g_memdup2 (value, size + 1);
-#else
-        display_value = g_memdup (value, size + 1);
-#endif
         display_value[size] = '\0';
 
         return display_value;
diff --git a/src/universal-cp/gui.c b/src/universal-cp/gui.c
index 5dcea4b..7a57723 100644
--- a/src/universal-cp/gui.c
+++ b/src/universal-cp/gui.c
@@ -18,11 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <gmodule.h>
 
diff --git a/src/universal-cp/main.c b/src/universal-cp/main.c
index 05e0704..d1bbe7b 100644
--- a/src/universal-cp/main.c
+++ b/src/universal-cp/main.c
@@ -20,9 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <libgupnp/gupnp.h>
 #include "gui.h"