Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: 94
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 719 lines (+426/-26)
13 files modified
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+11/-0)
debian/control (+4/-1)
debian/rules (+1/-0)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-glib/client.c (+8/-3)
libdbusmenu-gtk/client.c (+7/-0)
tests/Makefile.am (+34/-0)
tests/Makefile.in (+103/-6)
tests/test-glib-events-client.c (+140/-0)
tests/test-glib-events-server.c (+102/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+34992@code.launchpad.net

Description of the change

0.3.13

To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
94. By Ken VanDine

* New upstream release.
  * Handling window grabs on activated signals (LP: #633275)
  * Fixing the passing of the value to the results signal
  * Adding a test for checking event results signal
  * Changing the timeouts on event calls for better detection
    of failing applications

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure'
--- configure 2010-08-26 20:27:56 +0000
+++ configure 2010-09-09 15:08:40 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.12.3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.13.
4#4#
5# Report bugs to <ted@canonical.com>.5# Report bugs to <ted@canonical.com>.
6#6#
@@ -703,8 +703,8 @@
703# Identity of this package.703# Identity of this package.
704PACKAGE_NAME='libdbusmenu'704PACKAGE_NAME='libdbusmenu'
705PACKAGE_TARNAME='libdbusmenu'705PACKAGE_TARNAME='libdbusmenu'
706PACKAGE_VERSION='0.3.12'706PACKAGE_VERSION='0.3.13'
707PACKAGE_STRING='libdbusmenu 0.3.12'707PACKAGE_STRING='libdbusmenu 0.3.13'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1533,7 +1533,7 @@
1533 # Omit some internal or obsolete options to make the list less imposing.1533 # Omit some internal or obsolete options to make the list less imposing.
1534 # This message is too long to be a string in the A/UX 3.1 sh.1534 # This message is too long to be a string in the A/UX 3.1 sh.
1535 cat <<_ACEOF1535 cat <<_ACEOF
1536\`configure' configures libdbusmenu 0.3.12 to adapt to many kinds of systems.1536\`configure' configures libdbusmenu 0.3.13 to adapt to many kinds of systems.
15371537
1538Usage: $0 [OPTION]... [VAR=VALUE]...1538Usage: $0 [OPTION]... [VAR=VALUE]...
15391539
@@ -1603,7 +1603,7 @@
16031603
1604if test -n "$ac_init_help"; then1604if test -n "$ac_init_help"; then
1605 case $ac_init_help in1605 case $ac_init_help in
1606 short | recursive ) echo "Configuration of libdbusmenu 0.3.12:";;1606 short | recursive ) echo "Configuration of libdbusmenu 0.3.13:";;
1607 esac1607 esac
1608 cat <<\_ACEOF1608 cat <<\_ACEOF
16091609
@@ -1741,7 +1741,7 @@
1741test -n "$ac_init_help" && exit $ac_status1741test -n "$ac_init_help" && exit $ac_status
1742if $ac_init_version; then1742if $ac_init_version; then
1743 cat <<\_ACEOF1743 cat <<\_ACEOF
1744libdbusmenu configure 0.3.121744libdbusmenu configure 0.3.13
1745generated by GNU Autoconf 2.671745generated by GNU Autoconf 2.67
17461746
1747Copyright (C) 2010 Free Software Foundation, Inc.1747Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2112,7 +2112,7 @@
2112This file contains any messages produced by compilers while2112This file contains any messages produced by compilers while
2113running configure, to aid debugging if configure makes a mistake.2113running configure, to aid debugging if configure makes a mistake.
21142114
2115It was created by libdbusmenu $as_me 0.3.12, which was2115It was created by libdbusmenu $as_me 0.3.13, which was
2116generated by GNU Autoconf 2.67. Invocation command line was2116generated by GNU Autoconf 2.67. Invocation command line was
21172117
2118 $ $0 $@2118 $ $0 $@
@@ -2933,7 +2933,7 @@
29332933
2934# Define the identity of the package.2934# Define the identity of the package.
2935 PACKAGE=libdbusmenu2935 PACKAGE=libdbusmenu
2936 VERSION=0.3.122936 VERSION=0.3.13
29372937
29382938
2939# Some tools Automake needs.2939# Some tools Automake needs.
@@ -13065,7 +13065,7 @@
13065###########################13065###########################
1306613066
13067LIBDBUSMENU_CURRENT=113067LIBDBUSMENU_CURRENT=1
13068LIBDBUSMENU_REVISION=1413068LIBDBUSMENU_REVISION=15
13069LIBDBUSMENU_AGE=013069LIBDBUSMENU_AGE=0
1307013070
1307113071
@@ -14379,7 +14379,7 @@
14379# report actual input values of CONFIG_FILES etc. instead of their14379# report actual input values of CONFIG_FILES etc. instead of their
14380# values after options handling.14380# values after options handling.
14381ac_log="14381ac_log="
14382This file was extended by libdbusmenu $as_me 0.3.12, which was14382This file was extended by libdbusmenu $as_me 0.3.13, which was
14383generated by GNU Autoconf 2.67. Invocation command line was14383generated by GNU Autoconf 2.67. Invocation command line was
1438414384
14385 CONFIG_FILES = $CONFIG_FILES14385 CONFIG_FILES = $CONFIG_FILES
@@ -14445,7 +14445,7 @@
14445cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114445cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14446ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14446ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14447ac_cs_version="\\14447ac_cs_version="\\
14448libdbusmenu config.status 0.3.1214448libdbusmenu config.status 0.3.13
14449configured by $0, generated by GNU Autoconf 2.67,14449configured by $0, generated by GNU Autoconf 2.67,
14450 with options \\"\$ac_cs_config\\"14450 with options \\"\$ac_cs_config\\"
1445114451
1445214452
=== modified file 'configure.ac'
--- configure.ac 2010-08-26 20:27:56 +0000
+++ configure.ac 2010-09-09 15:08:40 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.12, ted@canonical.com)2AC_INIT(libdbusmenu, 0.3.13, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009,2010 Canonical])3AC_COPYRIGHT([Copyright 2009,2010 Canonical])
44
5AC_PREREQ(2.62)5AC_PREREQ(2.62)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.12, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.13, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -99,7 +99,7 @@
99###########################99###########################
100100
101LIBDBUSMENU_CURRENT=1101LIBDBUSMENU_CURRENT=1
102LIBDBUSMENU_REVISION=14102LIBDBUSMENU_REVISION=15
103LIBDBUSMENU_AGE=0103LIBDBUSMENU_AGE=0
104104
105AC_SUBST(LIBDBUSMENU_CURRENT)105AC_SUBST(LIBDBUSMENU_CURRENT)
106106
=== modified file 'debian/changelog'
--- debian/changelog 2010-08-26 21:35:01 +0000
+++ debian/changelog 2010-09-09 15:08:40 +0000
@@ -1,3 +1,14 @@
1libdbusmenu (0.3.13-0ubuntu1~ppa1) maverick; urgency=low
2
3 * New upstream release.
4 * Handling window grabs on activated signals (LP: #633275)
5 * Fixing the passing of the value to the results signal
6 * Adding a test for checking event results signal
7 * Changing the timeouts on event calls for better detection
8 of failing applications
9
10 -- Ted Gould <ted@ubuntu.com> Thu, 09 Sep 2010 09:50:15 -0500
11
1libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low12libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low
213
3 * debian/rules: update the shlibs14 * debian/rules: update the shlibs
415
=== modified file 'debian/control'
--- debian/control 2010-08-26 21:35:01 +0000
+++ debian/control 2010-09-09 15:08:40 +0000
@@ -20,7 +20,10 @@
20 gir1.0-glib-2.0,20 gir1.0-glib-2.0,
21 gir1.0-gtk-2.0,21 gir1.0-gtk-2.0,
22 libx11-dev (>= 1.3), 22 libx11-dev (>= 1.3),
23 valac23 valac,
24# Check dependencies
25 xvfb,
26 dbus-test-runner
24Standards-Version: 3.9.127Standards-Version: 3.9.1
25Homepage: https://launchpad.net/dbusmenu28Homepage: https://launchpad.net/dbusmenu
26Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu29Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
2730
=== modified file 'debian/rules'
--- debian/rules 2010-08-26 21:35:01 +0000
+++ debian/rules 2010-09-09 15:08:40 +0000
@@ -3,6 +3,7 @@
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/class/gnome.mk4include /usr/share/cdbs/1/class/gnome.mk
55
6DEB_MAKE_CHECK_TARGET := check
6DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc7DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
7LDFLAGS += -Wl,-z,defs -Wl,--as-needed8LDFLAGS += -Wl,-z,defs -Wl,--as-needed
89
910
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2010-08-26 20:27:56 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2010-09-09 15:08:40 +0000
@@ -1,1 +1,1 @@
10.3.1210.3.13
22
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2010-08-26 20:27:56 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2010-09-09 15:08:40 +0000
@@ -1,1 +1,1 @@
10.3.1210.3.13
22
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2010-08-26 20:27:56 +0000
+++ libdbusmenu-glib/client.c 2010-09-09 15:08:40 +0000
@@ -1058,10 +1058,10 @@
1058 event_data_t * edata = (event_data_t *)userdata;1058 event_data_t * edata = (event_data_t *)userdata;
10591059
1060 if (error != NULL) {1060 if (error != NULL) {
1061 g_warning("Unable to call menu item %d: %s", GPOINTER_TO_INT(userdata), error->message);1061 g_warning("Unable to call event '%s' on menu item %d: %s", edata->event, dbusmenu_menuitem_get_id(edata->menuitem), error->message);
1062 }1062 }
10631063
1064 g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, edata->data, edata->timestamp, error, TRUE);1064 g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, &edata->data, edata->timestamp, error, TRUE);
10651065
1066 g_value_unset(&edata->data);1066 g_value_unset(&edata->data);
1067 g_free(edata->event);1067 g_free(edata->event);
@@ -1103,7 +1103,12 @@
1103 g_value_copy(value, &edata->data);1103 g_value_copy(value, &edata->data);
1104 edata->timestamp = timestamp;1104 edata->timestamp = timestamp;
11051105
1106 org_ayatana_dbusmenu_event_async (priv->menuproxy, id, name, value, timestamp, menuitem_call_cb, edata);1106 DBusGAsyncData *stuff;
1107 stuff = g_slice_new (DBusGAsyncData);
1108 stuff->cb = G_CALLBACK (menuitem_call_cb);
1109 stuff->userdata = edata;
1110 dbus_g_proxy_begin_call_with_timeout (priv->menuproxy, "Event", org_ayatana_dbusmenu_event_async_callback, stuff, _dbus_glib_async_data_free, 1000, G_TYPE_INT, id, G_TYPE_STRING, name, G_TYPE_VALUE, value, G_TYPE_UINT, timestamp, G_TYPE_INVALID);
1111
1107 return;1112 return;
1108}1113}
11091114
11101115
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c 2010-08-20 21:47:06 +0000
+++ libdbusmenu-gtk/client.c 2010-09-09 15:08:40 +0000
@@ -453,6 +453,13 @@
453 if (GTK_IS_MENU(parent)) {453 if (GTK_IS_MENU(parent)) {
454 activate_helper(GTK_MENU_SHELL(parent));454 activate_helper(GTK_MENU_SHELL(parent));
455 }455 }
456
457 if (!GTK_MENU_SHELL (parent)->active) {
458 gtk_grab_add (parent);
459 GTK_MENU_SHELL (parent)->have_grab = TRUE;
460 GTK_MENU_SHELL (parent)->active = TRUE;
461 }
462
456 gtk_menu_shell_select_item(GTK_MENU_SHELL(parent), attach);463 gtk_menu_shell_select_item(GTK_MENU_SHELL(parent), attach);
457 }464 }
458 }465 }
459466
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2010-08-05 17:34:18 +0000
+++ tests/Makefile.am 2010-09-09 15:08:40 +0000
@@ -5,6 +5,7 @@
55
6TESTS = \6TESTS = \
7 test-glib-objects-test \7 test-glib-objects-test \
8 test-glib-events \
8 test-glib-layout \9 test-glib-layout \
9 test-glib-properties \10 test-glib-properties \
10 test-glib-proxy \11 test-glib-proxy \
@@ -20,6 +21,8 @@
20check_PROGRAMS = \21check_PROGRAMS = \
21 glib-server-nomenu \22 glib-server-nomenu \
22 test-glib-objects \23 test-glib-objects \
24 test-glib-events-client \
25 test-glib-events-server \
23 test-glib-layout-client \26 test-glib-layout-client \
24 test-glib-layout-server \27 test-glib-layout-server \
25 test-glib-properties-client \28 test-glib-properties-client \
@@ -129,6 +132,37 @@
129 $(DBUSMENUGLIB_LIBS)132 $(DBUSMENUGLIB_LIBS)
130133
131######################134######################
135# Test Glib Events
136######################
137
138test-glib-events: test-glib-events-client test-glib-events-server Makefile.am
139 @echo "#!/bin/bash" > $@
140 @echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
141 @chmod +x $@
142
143test_glib_events_server_SOURCES = \
144 test-glib-events-server.c
145
146test_glib_events_server_CFLAGS = \
147 -I $(srcdir)/.. \
148 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
149
150test_glib_events_server_LDADD = \
151 ../libdbusmenu-glib/libdbusmenu-glib.la \
152 $(DBUSMENUGLIB_LIBS)
153
154test_glib_events_client_SOURCES = \
155 test-glib-events-client.c
156
157test_glib_events_client_CFLAGS = \
158 -I $(srcdir)/.. \
159 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
160
161test_glib_events_client_LDADD = \
162 ../libdbusmenu-glib/libdbusmenu-glib.la \
163 $(DBUSMENUGLIB_LIBS)
164
165######################
132# Test JSON166# Test JSON
133######################167######################
134168
135169
=== modified file 'tests/Makefile.in'
--- tests/Makefile.in 2010-08-12 16:22:27 +0000
+++ tests/Makefile.in 2010-09-09 15:08:40 +0000
@@ -36,13 +36,15 @@
36POST_UNINSTALL = :36POST_UNINSTALL = :
37build_triplet = @build@37build_triplet = @build@
38host_triplet = @host@38host_triplet = @host@
39TESTS = test-glib-objects-test test-glib-layout test-glib-properties \39TESTS = test-glib-objects-test test-glib-events test-glib-layout \
40 test-glib-proxy test-glib-simple-items$(EXEEXT) \40 test-glib-properties test-glib-proxy \
41 test-glib-submenu test-json test-gtk-objects-test \41 test-glib-simple-items$(EXEEXT) test-glib-submenu test-json \
42 test-gtk-label test-gtk-shortcut test-gtk-reorder \42 test-gtk-objects-test test-gtk-label test-gtk-shortcut \
43 test-gtk-submenu43 test-gtk-reorder test-gtk-submenu
44check_PROGRAMS = glib-server-nomenu$(EXEEXT) \44check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
45 test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \45 test-glib-objects$(EXEEXT) test-glib-events-client$(EXEEXT) \
46 test-glib-events-server$(EXEEXT) \
47 test-glib-layout-client$(EXEEXT) \
46 test-glib-layout-server$(EXEEXT) \48 test-glib-layout-server$(EXEEXT) \
47 test-glib-properties-client$(EXEEXT) \49 test-glib-properties-client$(EXEEXT) \
48 test-glib-properties-server$(EXEEXT) \50 test-glib-properties-server$(EXEEXT) \
@@ -118,6 +120,26 @@
118 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \120 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
119 $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \121 $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
120 $(LDFLAGS) -o $@122 $(LDFLAGS) -o $@
123am_test_glib_events_client_OBJECTS = \
124 test_glib_events_client-test-glib-events-client.$(OBJEXT)
125test_glib_events_client_OBJECTS = \
126 $(am_test_glib_events_client_OBJECTS)
127test_glib_events_client_DEPENDENCIES = \
128 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
129test_glib_events_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
130 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
131 $(test_glib_events_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
132 $(LDFLAGS) -o $@
133am_test_glib_events_server_OBJECTS = \
134 test_glib_events_server-test-glib-events-server.$(OBJEXT)
135test_glib_events_server_OBJECTS = \
136 $(am_test_glib_events_server_OBJECTS)
137test_glib_events_server_DEPENDENCIES = \
138 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
139test_glib_events_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
140 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
141 $(test_glib_events_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
142 $(LDFLAGS) -o $@
121am_test_glib_layout_client_OBJECTS = \143am_test_glib_layout_client_OBJECTS = \
122 test_glib_layout_client-test-glib-layout-client.$(OBJEXT)144 test_glib_layout_client-test-glib-layout-client.$(OBJEXT)
123test_glib_layout_client_OBJECTS = \145test_glib_layout_client_OBJECTS = \
@@ -364,6 +386,8 @@
364am__v_GEN_0 = @echo " GEN " $@;386am__v_GEN_0 = @echo " GEN " $@;
365SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \387SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
366 $(glib_server_nomenu_SOURCES) \388 $(glib_server_nomenu_SOURCES) \
389 $(test_glib_events_client_SOURCES) \
390 $(test_glib_events_server_SOURCES) \
367 $(test_glib_layout_client_SOURCES) \391 $(test_glib_layout_client_SOURCES) \
368 $(test_glib_layout_server_SOURCES) \392 $(test_glib_layout_server_SOURCES) \
369 $(test_glib_objects_SOURCES) \393 $(test_glib_objects_SOURCES) \
@@ -385,6 +409,8 @@
385 $(test_json_server_SOURCES)409 $(test_json_server_SOURCES)
386DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \410DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
387 $(glib_server_nomenu_SOURCES) \411 $(glib_server_nomenu_SOURCES) \
412 $(test_glib_events_client_SOURCES) \
413 $(test_glib_events_server_SOURCES) \
388 $(test_glib_layout_client_SOURCES) \414 $(test_glib_layout_client_SOURCES) \
389 $(test_glib_layout_server_SOURCES) \415 $(test_glib_layout_server_SOURCES) \
390 $(test_glib_objects_SOURCES) \416 $(test_glib_objects_SOURCES) \
@@ -655,6 +681,28 @@
655 ../libdbusmenu-glib/libdbusmenu-glib.la \681 ../libdbusmenu-glib/libdbusmenu-glib.la \
656 $(DBUSMENUGLIB_LIBS)682 $(DBUSMENUGLIB_LIBS)
657683
684test_glib_events_server_SOURCES = \
685 test-glib-events-server.c
686
687test_glib_events_server_CFLAGS = \
688 -I $(srcdir)/.. \
689 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
690
691test_glib_events_server_LDADD = \
692 ../libdbusmenu-glib/libdbusmenu-glib.la \
693 $(DBUSMENUGLIB_LIBS)
694
695test_glib_events_client_SOURCES = \
696 test-glib-events-client.c
697
698test_glib_events_client_CFLAGS = \
699 -I $(srcdir)/.. \
700 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
701
702test_glib_events_client_LDADD = \
703 ../libdbusmenu-glib/libdbusmenu-glib.la \
704 $(DBUSMENUGLIB_LIBS)
705
658test_json_server_SOURCES = \706test_json_server_SOURCES = \
659 test-json-server.c707 test-json-server.c
660708
@@ -1049,6 +1097,12 @@
1049glib-server-nomenu$(EXEEXT): $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_DEPENDENCIES) 1097glib-server-nomenu$(EXEEXT): $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_DEPENDENCIES)
1050 @rm -f glib-server-nomenu$(EXEEXT)1098 @rm -f glib-server-nomenu$(EXEEXT)
1051 $(AM_V_CCLD)$(glib_server_nomenu_LINK) $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_LDADD) $(LIBS)1099 $(AM_V_CCLD)$(glib_server_nomenu_LINK) $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_LDADD) $(LIBS)
1100test-glib-events-client$(EXEEXT): $(test_glib_events_client_OBJECTS) $(test_glib_events_client_DEPENDENCIES)
1101 @rm -f test-glib-events-client$(EXEEXT)
1102 $(AM_V_CCLD)$(test_glib_events_client_LINK) $(test_glib_events_client_OBJECTS) $(test_glib_events_client_LDADD) $(LIBS)
1103test-glib-events-server$(EXEEXT): $(test_glib_events_server_OBJECTS) $(test_glib_events_server_DEPENDENCIES)
1104 @rm -f test-glib-events-server$(EXEEXT)
1105 $(AM_V_CCLD)$(test_glib_events_server_LINK) $(test_glib_events_server_OBJECTS) $(test_glib_events_server_LDADD) $(LIBS)
1052test-glib-layout-client$(EXEEXT): $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_DEPENDENCIES) 1106test-glib-layout-client$(EXEEXT): $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_DEPENDENCIES)
1053 @rm -f test-glib-layout-client$(EXEEXT)1107 @rm -f test-glib-layout-client$(EXEEXT)
1054 $(AM_V_CCLD)$(test_glib_layout_client_LINK) $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_LDADD) $(LIBS)1108 $(AM_V_CCLD)$(test_glib_layout_client_LINK) $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_LDADD) $(LIBS)
@@ -1121,6 +1175,8 @@
11211175
1122@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@1176@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@
1123@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@1177@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@
1178@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_events_client-test-glib-events-client.Po@am__quote@
1179@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_events_server-test-glib-events-server.Po@am__quote@
1124@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@1180@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@
1125@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@1181@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@
1126@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@1182@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@
@@ -1191,6 +1247,38 @@
1191@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1247@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1192@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -c -o glib_server_nomenu-glib-server-nomenu.obj `if test -f 'glib-server-nomenu.c'; then $(CYGPATH_W) 'glib-server-nomenu.c'; else $(CYGPATH_W) '$(srcdir)/glib-server-nomenu.c'; fi`1248@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -c -o glib_server_nomenu-glib-server-nomenu.obj `if test -f 'glib-server-nomenu.c'; then $(CYGPATH_W) 'glib-server-nomenu.c'; else $(CYGPATH_W) '$(srcdir)/glib-server-nomenu.c'; fi`
11931249
1250test_glib_events_client-test-glib-events-client.o: test-glib-events-client.c
1251@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -MT test_glib_events_client-test-glib-events-client.o -MD -MP -MF $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo -c -o test_glib_events_client-test-glib-events-client.o `test -f 'test-glib-events-client.c' || echo '$(srcdir)/'`test-glib-events-client.c
1252@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo $(DEPDIR)/test_glib_events_client-test-glib-events-client.Po
1253@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1254@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-glib-events-client.c' object='test_glib_events_client-test-glib-events-client.o' libtool=no @AMDEPBACKSLASH@
1255@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1256@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -c -o test_glib_events_client-test-glib-events-client.o `test -f 'test-glib-events-client.c' || echo '$(srcdir)/'`test-glib-events-client.c
1257
1258test_glib_events_client-test-glib-events-client.obj: test-glib-events-client.c
1259@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -MT test_glib_events_client-test-glib-events-client.obj -MD -MP -MF $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo -c -o test_glib_events_client-test-glib-events-client.obj `if test -f 'test-glib-events-client.c'; then $(CYGPATH_W) 'test-glib-events-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-client.c'; fi`
1260@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo $(DEPDIR)/test_glib_events_client-test-glib-events-client.Po
1261@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1262@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-glib-events-client.c' object='test_glib_events_client-test-glib-events-client.obj' libtool=no @AMDEPBACKSLASH@
1263@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1264@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -c -o test_glib_events_client-test-glib-events-client.obj `if test -f 'test-glib-events-client.c'; then $(CYGPATH_W) 'test-glib-events-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-client.c'; fi`
1265
1266test_glib_events_server-test-glib-events-server.o: test-glib-events-server.c
1267@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -MT test_glib_events_server-test-glib-events-server.o -MD -MP -MF $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo -c -o test_glib_events_server-test-glib-events-server.o `test -f 'test-glib-events-server.c' || echo '$(srcdir)/'`test-glib-events-server.c
1268@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo $(DEPDIR)/test_glib_events_server-test-glib-events-server.Po
1269@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1270@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-glib-events-server.c' object='test_glib_events_server-test-glib-events-server.o' libtool=no @AMDEPBACKSLASH@
1271@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1272@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -c -o test_glib_events_server-test-glib-events-server.o `test -f 'test-glib-events-server.c' || echo '$(srcdir)/'`test-glib-events-server.c
1273
1274test_glib_events_server-test-glib-events-server.obj: test-glib-events-server.c
1275@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -MT test_glib_events_server-test-glib-events-server.obj -MD -MP -MF $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo -c -o test_glib_events_server-test-glib-events-server.obj `if test -f 'test-glib-events-server.c'; then $(CYGPATH_W) 'test-glib-events-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-server.c'; fi`
1276@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo $(DEPDIR)/test_glib_events_server-test-glib-events-server.Po
1277@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1278@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-glib-events-server.c' object='test_glib_events_server-test-glib-events-server.obj' libtool=no @AMDEPBACKSLASH@
1279@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1280@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -c -o test_glib_events_server-test-glib-events-server.obj `if test -f 'test-glib-events-server.c'; then $(CYGPATH_W) 'test-glib-events-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-server.c'; fi`
1281
1194test_glib_layout_client-test-glib-layout-client.o: test-glib-layout-client.c1282test_glib_layout_client-test-glib-layout-client.o: test-glib-layout-client.c
1195@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_layout_client_CFLAGS) $(CFLAGS) -MT test_glib_layout_client-test-glib-layout-client.o -MD -MP -MF $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo -c -o test_glib_layout_client-test-glib-layout-client.o `test -f 'test-glib-layout-client.c' || echo '$(srcdir)/'`test-glib-layout-client.c1283@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_layout_client_CFLAGS) $(CFLAGS) -MT test_glib_layout_client-test-glib-layout-client.o -MD -MP -MF $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo -c -o test_glib_layout_client-test-glib-layout-client.o `test -f 'test-glib-layout-client.c' || echo '$(srcdir)/'`test-glib-layout-client.c
1196@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po1284@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po
@@ -1932,6 +2020,15 @@
1932 @chmod +x $@2020 @chmod +x $@
19332021
1934######################2022######################
2023# Test Glib Events
2024######################
2025
2026test-glib-events: test-glib-events-client test-glib-events-server Makefile.am
2027 @echo "#!/bin/bash" > $@
2028 @echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
2029 @chmod +x $@
2030
2031######################
1935# Test JSON2032# Test JSON
1936######################2033######################
19372034
19382035
=== added file 'tests/test-glib-events-client.c'
--- tests/test-glib-events-client.c 1970-01-01 00:00:00 +0000
+++ tests/test-glib-events-client.c 2010-09-09 15:08:40 +0000
@@ -0,0 +1,140 @@
1/*
2A test for libdbusmenu to ensure its quality.
3
4Copyright 2009 Canonical Ltd.
5
6Authors:
7 Ted Gould <ted@canonical.com>
8
9This program is free software: you can redistribute it and/or modify it
10under the terms of the GNU General Public License version 3, as published
11by the Free Software Foundation.
12
13This program is distributed in the hope that it will be useful, but
14WITHOUT ANY WARRANTY; without even the implied warranties of
15MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16PURPOSE. See the GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License along
19with this program. If not, see <http://www.gnu.org/licenses/>.
20*/
21
22#include <glib.h>
23
24#include <libdbusmenu-glib/client.h>
25#include <libdbusmenu-glib/menuitem.h>
26
27#include "test-glib-submenu.h"
28
29#define TIMESTAMP_VALUE 54
30#define DATA_VALUE 32
31#define USER_VALUE 76
32
33static GMainLoop * mainloop = NULL;
34static gboolean passed = TRUE;
35static gboolean first = TRUE;
36
37static void
38event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GValue * data, guint timestamp, GError * error, gpointer user_data)
39{
40 g_debug("Event status: %s", error == NULL ? "Sent" : "Error");
41
42 if (timestamp != TIMESTAMP_VALUE) {
43 g_debug("Timestamp value pass fail got: %d", timestamp);
44 passed = FALSE;
45 g_main_loop_quit(mainloop);
46 return;
47 }
48
49 if (g_value_get_int(data) != DATA_VALUE) {
50 g_debug("Data value pass fail got: %d", g_value_get_int(data));
51 passed = FALSE;
52 g_main_loop_quit(mainloop);
53 return;
54 }
55
56 if (GPOINTER_TO_INT(user_data) != USER_VALUE) {
57 g_debug("User value pass fail got: %d", GPOINTER_TO_INT(user_data));
58 passed = FALSE;
59 g_main_loop_quit(mainloop);
60 return;
61 }
62
63 if (first && error != NULL) {
64 passed = FALSE;
65 g_debug("First signal back failed.");
66 g_main_loop_quit(mainloop);
67 return;
68 }
69
70 if (!first && error == NULL) {
71 passed = FALSE;
72 g_debug("Second signal didn't fail.");
73 g_main_loop_quit(mainloop);
74 return;
75 }
76
77 if (!first && error != NULL) {
78 g_debug("Second signal failed: pass.");
79 g_main_loop_quit(mainloop);
80 return;
81 }
82
83 first = FALSE;
84 dbusmenu_menuitem_handle_event(item, "clicked", data, timestamp);
85 return;
86}
87
88static void
89layout_updated (DbusmenuClient * client, gpointer user_data)
90{
91 g_debug("Layout Updated");
92
93 DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client);
94 if (menuroot == NULL) {
95 g_debug("Root is NULL?");
96 return;
97 }
98
99 GValue data = {0};
100 g_value_init(&data, G_TYPE_INT);
101 g_value_set_int(&data, DATA_VALUE);
102
103 dbusmenu_menuitem_handle_event(menuroot, "clicked", &data, TIMESTAMP_VALUE);
104
105 return;
106}
107
108static gboolean
109timer_func (gpointer data)
110{
111 g_debug("Death timer. Oops.");
112 passed = FALSE;
113 g_main_loop_quit(mainloop);
114 return FALSE;
115}
116
117int
118main (int argc, char ** argv)
119{
120 g_type_init();
121
122 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
123 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
124 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
125
126 g_timeout_add_seconds(5, timer_func, client);
127
128 mainloop = g_main_loop_new(NULL, FALSE);
129 g_main_loop_run(mainloop);
130
131 g_object_unref(G_OBJECT(client));
132
133 if (passed) {
134 g_debug("Quiting");
135 return 0;
136 } else {
137 g_debug("Quiting as we're a failure");
138 return 1;
139 }
140}
0141
=== added file 'tests/test-glib-events-server.c'
--- tests/test-glib-events-server.c 1970-01-01 00:00:00 +0000
+++ tests/test-glib-events-server.c 2010-09-09 15:08:40 +0000
@@ -0,0 +1,102 @@
1/*
2A test for libdbusmenu to ensure its quality.
3
4Copyright 2009 Canonical Ltd.
5
6Authors:
7 Ted Gould <ted@canonical.com>
8
9This program is free software: you can redistribute it and/or modify it
10under the terms of the GNU General Public License version 3, as published
11by the Free Software Foundation.
12
13This program is distributed in the hope that it will be useful, but
14WITHOUT ANY WARRANTY; without even the implied warranties of
15MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16PURPOSE. See the GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License along
19with this program. If not, see <http://www.gnu.org/licenses/>.
20*/
21
22#include <glib.h>
23
24#include <dbus/dbus.h>
25#include <dbus/dbus-glib.h>
26#include <dbus/dbus-glib-lowlevel.h>
27#include <dbus/dbus-glib-bindings.h>
28
29#include <libdbusmenu-glib/server.h>
30#include <libdbusmenu-glib/menuitem.h>
31
32static DbusmenuServer * server = NULL;
33static GMainLoop * mainloop = NULL;
34static gboolean passed = TRUE;
35
36static void
37handle_event (void) {
38 g_debug("Handle event");
39 g_main_loop_quit(mainloop);
40 return;
41}
42
43static gboolean
44timer_func (gpointer data)
45{
46 passed = FALSE;
47 g_debug("Never got a signal");
48 g_main_loop_quit(mainloop);
49 return FALSE;
50}
51
52int
53main (int argc, char ** argv)
54{
55 GError * error = NULL;
56
57 g_type_init();
58
59 DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
60 g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
61
62 DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
63 guint nameret = 0;
64
65 if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) {
66 g_error("Unable to call to request name");
67 return 1;
68 }
69
70 if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
71 g_error("Unable to get name");
72 return 1;
73 }
74
75 server = dbusmenu_server_new("/org/test");
76 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
77 dbusmenu_server_set_root(server, menuitem);
78
79 g_signal_connect(G_OBJECT(menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(handle_event), NULL);
80
81 g_timeout_add_seconds(3, timer_func, NULL);
82
83 mainloop = g_main_loop_new(NULL, FALSE);
84 g_main_loop_run(mainloop);
85
86 if (passed) {
87 int i;
88
89 for (i = 0; i < 5; i++) {
90 g_debug("Ignoring signals: %d", i);
91 g_usleep(1000 * 1000);
92 }
93 }
94
95 if (passed) {
96 g_debug("Test Passed");
97 return 0;
98 } else {
99 g_debug("Test Failed");
100 return 1;
101 }
102}

Subscribers

People subscribed via source and target branches

to all changes: