qulogic/libgnt

Merge with default.
meson
2016-09-07, Elliott Sales de Andrade
920749e46bc8
Parents dbdd3fe124939064526f0678
Children df44ab5150cc
Merge with default.
9 files changed, 25 insertions(+), 82 deletions(-)
  • +3 -60
    configure.ac
  • +1 -1
    gntbox.h
  • +1 -1
    gntslider.h
  • +2 -2
    gnttree.h
  • +7 -7
    gntwidget.c
  • +7 -7
    gntwidget.h
  • +2 -2
    gntwindow.h
  • +1 -1
    gntwm.h
  • +1 -1
    gntws.h
    • --- a/configure.ac Fri Aug 26 22:49:15 2016 -0400
    +++ b/configure.ac Wed Sep 07 00:36:59 2016 -0400
    @@ -67,74 +67,22 @@
    dnl AC_CYGWIN
    dnl Checks for header files.
    -AC_HEADER_STDC
    AC_HEADER_SYS_WAIT
    -AC_CHECK_HEADERS(fcntl.h unistd.h locale.h signal.h stdint.h)
    +AC_CHECK_HEADERS(unistd.h)
    dnl Checks for typedefs, structures, and compiler characteristics.
    -AC_C_CONST
    -AC_STRUCT_TM
    AC_C_BIGENDIAN
    dnl Checks for library functions.
    -AC_TYPE_SIGNAL
    -AC_FUNC_STRFTIME
    -AC_CHECK_FUNCS(strdup strstr atexit setlocale)
    +AC_CHECK_FUNCS(strdup)
    dnl to prevent the g_stat()/g_unlink() crash,
    dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac
    AC_SYS_LARGEFILE
    -AC_MSG_CHECKING(for the %z format string in strftime())
    -AC_TRY_RUN([
    -#include <time.h>
    -#include <stdio.h>
    -
    -int main()
    -{
    - char buf[6];
    - time_t t = time(NULL);
    -
    - if (strftime(buf, sizeof(buf), "%z", localtime(&t)) != 5)
    - return 1;
    -
    - fprintf(stderr, "strftime(\"%%z\") yields: \"%s\"\n", buf);
    -
    - return !((buf[0] == '-' || buf[0] == '+') &&
    - (buf[1] >= '0' && buf[1] <= '9') &&
    - (buf[2] >= '0' && buf[2] <= '9') &&
    - (buf[3] >= '0' && buf[3] <= '9') &&
    - (buf[4] >= '0' && buf[4] <= '9')
    - );
    -}
    -],
    -[
    - AC_MSG_RESULT(yes)
    - AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
    - [Define to 1 if you have a strftime() that supports the %z format string.])
    -],
    -[
    - AC_MSG_RESULT(no)
    -],
    -[
    - # Fallback for Cross Compiling...
    - # This will enable the compatibility code.
    - AC_MSG_RESULT(no)
    -]
    -)
    -
    -
    -AC_CHECK_HEADER(sys/utsname.h)
    -AC_CHECK_FUNC(uname)
    -
    if test "x$enable_debug" = "xyes" ; then
    AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
    - enable_fatal_asserts="yes"
    -fi
    -
    -if test "x$enable_fatal_asserts" = "xyes" ; then
    - AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).])
    fi
    if test "x$enable_deprecated" = "xno"; then
    @@ -231,12 +179,7 @@
    AC_MSG_CHECKING(for me pot o' gold)
    AC_MSG_RESULT(no)
    -AC_CHECK_FUNCS(gethostid lrand48)
    -AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf)
    -AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h)
    -AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
    -AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
    -AC_CHECK_HEADERS(termios.h)
    +AC_CHECK_HEADERS(sys/wait.h)
    #AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])
    #AC_VAR_TIMEZONE_EXTERNALS
    --- a/gntbox.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntbox.h Wed Sep 07 00:36:59 2016 -0400
    @@ -133,7 +133,7 @@
    *
    * Since: 2.8.0
    */
    -void gnt_box_add_widget_in_front(GntBox *b, GntWidget *widget);
    +void gnt_box_add_widget_in_front(GntBox *box, GntWidget *widget);
    /**
    * gnt_box_set_title:
    --- a/gntslider.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntslider.h Wed Sep 07 00:36:59 2016 -0400
    @@ -66,7 +66,7 @@
    {
    GntWidgetClass parent;
    - void (*changed)(GntSlider *slider, int);
    + void (*changed)(GntSlider *slider, int value);
    /*< private >*/
    void (*gnt_reserved1)(void);
    --- a/gnttree.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gnttree.h Wed Sep 07 00:36:59 2016 -0400
    @@ -44,8 +44,8 @@
    #define GNT_TYPE_TREE_ROW (gnt_tree_row_get_type())
    -typedef guint (*GntTreeHashFunc)(gconstpointer);
    -typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer, gconstpointer);
    +typedef guint (*GntTreeHashFunc)(gconstpointer key);
    +typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer a, gconstpointer b);
    typedef struct _GntTree GntTree;
    typedef struct _GntTreePriv GntTreePriv;
    --- a/gntwidget.c Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntwidget.c Wed Sep 07 00:36:59 2016 -0400
    @@ -302,15 +302,15 @@
    }
    void
    -gnt_widget_destroy(GntWidget *obj)
    +gnt_widget_destroy(GntWidget *widget)
    {
    - g_return_if_fail(GNT_IS_WIDGET(obj));
    + g_return_if_fail(GNT_IS_WIDGET(widget));
    - if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING)) {
    - GNT_WIDGET_SET_FLAGS(obj, GNT_WIDGET_DESTROYING);
    - gnt_widget_hide(obj);
    - delwin(obj->window);
    - g_object_run_dispose(G_OBJECT(obj));
    + if(!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_DESTROYING)) {
    + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DESTROYING);
    + gnt_widget_hide(widget);
    + delwin(widget->window);
    + g_object_run_dispose(G_OBJECT(widget));
    }
    GNTDEBUG;
    }
    --- a/gntwidget.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntwidget.h Wed Sep 07 00:36:59 2016 -0400
    @@ -116,20 +116,20 @@
    {
    GntBindableClass parent;
    - void (*map)(GntWidget *obj);
    - void (*show)(GntWidget *obj); /* This will call draw() and take focus (if it can take focus) */
    - void (*destroy)(GntWidget *obj);
    - void (*draw)(GntWidget *obj); /* This will draw the widget */
    - void (*hide)(GntWidget *obj);
    + void (*map)(GntWidget *widget);
    + void (*show)(GntWidget *widget); /* This will call draw() and take focus (if it can take focus) */
    + void (*destroy)(GntWidget *widget);
    + void (*draw)(GntWidget *widget); /* This will draw the widget */
    + void (*hide)(GntWidget *widget);
    void (*expose)(GntWidget *widget, int x, int y, int width, int height);
    void (*gained_focus)(GntWidget *widget);
    void (*lost_focus)(GntWidget *widget);
    void (*size_request)(GntWidget *widget);
    - gboolean (*confirm_size)(GntWidget *widget, int x, int y);
    + gboolean (*confirm_size)(GntWidget *widget, int width, int height);
    void (*size_changed)(GntWidget *widget, int w, int h);
    void (*set_position)(GntWidget *widget, int x, int y);
    - gboolean (*key_pressed)(GntWidget *widget, const char *key);
    + gboolean (*key_pressed)(GntWidget *widget, const char *keys);
    void (*activate)(GntWidget *widget);
    gboolean (*clicked)(GntWidget *widget, GntMouseEvent event, int x, int y);
    --- a/gntwindow.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntwindow.h Wed Sep 07 00:36:59 2016 -0400
    @@ -151,8 +151,8 @@
    */
    GntWindowFlags gnt_window_get_maximize(GntWindow *window);
    -void gnt_window_workspace_hiding(GntWindow *);
    -void gnt_window_workspace_showing(GntWindow *);
    +void gnt_window_workspace_hiding(GntWindow *window);
    +void gnt_window_workspace_showing(GntWindow *window);
    G_END_DECLS
    --- a/gntwm.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntwm.h Wed Sep 07 00:36:59 2016 -0400
    @@ -141,7 +141,7 @@
    GntBindableClass parent;
    /* This is called when a new window is shown */
    - void (*new_window)(GntWM *wm, GntWidget *win);
    + void (*new_window)(GntWM *wm, GntWidget *widget);
    void (*decorate_window)(GntWM *wm, GntWidget *win);
    /* This is called when a window is being closed */
    --- a/gntws.h Fri Aug 26 22:49:15 2016 -0400
    +++ b/gntws.h Wed Sep 07 00:36:59 2016 -0400
    @@ -61,7 +61,7 @@
    {
    GntBindableClass parent;
    - void (*draw_taskbar)(GntWS *ws, gboolean );
    + void (*draw_taskbar)(GntWS *ws, gboolean reposition);
    void (*res1)(void);
    void (*res2)(void);