Changeset db4f7c3

Timestamp:

Jun 11, 2011, 6:31:32 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

6dc3757

Parents:

431fcd8

git-author:

David Benjamin <davidben@mit.edu> (06/11/11 16:16:55)

git-committer:

David Benjamin <davidben@mit.edu> (06/11/11 18:31:32)

Message:

Bump required glib version to 2.16

Debian Lenny's version is 2.16.6-3 and Ubuntu Hardy's is
2.16.6-0ubuntu1.2. Also remove the version check in main; it never did
anything useful as GLIB_CHECK_VERSION is evaluated at compile-time.

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• glib_compat.c (deleted)
• owl.c (modified) (1 diff)

Makefile.am

@@ -45 +45 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     glib_compat.c mainpanel.c msgwin.c sepbar.c editcontext.c signal.c
+     mainpanel.c msgwin.c sepbar.c editcontext.c signal.c
 
 NORMAL_SRCS = filterproc.c window.c windowcb.c

configure.ac

@@ -115 +115 @@
 
 dnl Add CFLAGS and LIBS for glib-2.0
-PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.12 gobject-2.0 gthread-2.0])
+PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.16 gobject-2.0 gthread-2.0])
 
 AC_MSG_NOTICE([Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}])

owl.c

@@ -486 +486 @@
   GSource *source;
 
-  if (!GLIB_CHECK_VERSION (2, 12, 0))
-    g_error ("GLib version 2.12.0 or above is needed.");
-
   argc_copy = argc;
   argv_copy = g_strdupv(argv);