DBus Menu

Merge lp:~ted/libdbusmenu/single-includes into lp:libdbusmenu/0.5

  1. single-includes
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 191
Proposed branch: lp:~ted/libdbusmenu/single-includes
Merge into: lp:libdbusmenu/0.5
Diff against target: 119 lines (+80/-1)
4 files modified
libdbusmenu-glib/Makefile.am (+2/-1)
libdbusmenu-glib/dbusmenu-glib.h (+37/-0)
libdbusmenu-gtk/Makefile.am (+1/-0)
libdbusmenu-gtk/dbusmenu-gtk.h (+40/-0)
To merge this branch: bzr merge lp:~ted/libdbusmenu/single-includes
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Cody Russell (community) Approve
Review via email: mp+47057@code.launchpad.net

Description of the change

Adding a single header to include because people have asked for it. And well, I'm nothing if not a pleaser of the people. Not requiring it yet, but I guess we should eventually.

To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) :
review: Approve
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

 review approve

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2011-01-20 03:50:25 +0000
+++ libdbusmenu-glib/Makefile.am 2011-01-21 16:44:53 +0000
@@ -15,6 +15,7 @@
15libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/15libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
1616
17libdbusmenu_glibinclude_HEADERS = \17libdbusmenu_glibinclude_HEADERS = \
18 dbusmenu-glib.h \
18 menuitem.h \19 menuitem.h \
19 menuitem-proxy.h \20 menuitem-proxy.h \
20 server.h \21 server.h \
@@ -140,7 +141,7 @@
140Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la141Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
141Dbusmenu_Glib_0_4_gir_INCLUDES = \142Dbusmenu_Glib_0_4_gir_INCLUDES = \
142 GObject-2.0143 GObject-2.0
143Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)144Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
144Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la145Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
145Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))146Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
146Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu147Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
147148
=== added file 'libdbusmenu-glib/dbusmenu-glib.h'
--- libdbusmenu-glib/dbusmenu-glib.h 1970-01-01 00:00:00 +0000
+++ libdbusmenu-glib/dbusmenu-glib.h 2011-01-21 16:44:53 +0000
@@ -0,0 +1,37 @@
1/*
2A library to communicate a menu object set accross DBus and
3track updates and maintain consistency.
4
5Copyright 2011 Canonical Ltd.
6
7Authors:
8 Ted Gould <ted@canonical.com>
9
10This program is free software: you can redistribute it and/or modify it
11under the terms of either or both of the following licenses:
12
131) the GNU Lesser General Public License version 3, as published by the
14Free Software Foundation; and/or
152) the GNU Lesser General Public License version 2.1, as published by
16the Free Software Foundation.
17
18This program is distributed in the hope that it will be useful, but
19WITHOUT ANY WARRANTY; without even the implied warranties of
20MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
21PURPOSE. See the applicable version of the GNU Lesser General Public
22License for more details.
23
24You should have received a copy of both the GNU Lesser General Public
25License version 3 and version 2.1 along with this program. If not, see
26<http://www.gnu.org/licenses/>
27*/
28
29#ifndef __DBUSMENU_GLIB_H__
30#define __DBUSMENU_GLIB_H__
31
32#include <libdbusmenu-glib/client.h>
33#include <libdbusmenu-glib/menuitem.h>
34#include <libdbusmenu-glib/menuitem-proxy.h>
35#include <libdbusmenu-glib/server.h>
36
37#endif /* __DBUSMENU_GLIB_H__ */
038
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2011-01-20 03:50:25 +0000
+++ libdbusmenu-gtk/Makefile.am 2011-01-21 16:44:53 +0000
@@ -20,6 +20,7 @@
20libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/20libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/
2121
22libdbusmenu_gtkinclude_HEADERS = \22libdbusmenu_gtkinclude_HEADERS = \
23 dbusmenu-gtk.h \
23 client.h \24 client.h \
24 menu.h \25 menu.h \
25 menuitem.h26 menuitem.h
2627
=== added file 'libdbusmenu-gtk/dbusmenu-gtk.h'
--- libdbusmenu-gtk/dbusmenu-gtk.h 1970-01-01 00:00:00 +0000
+++ libdbusmenu-gtk/dbusmenu-gtk.h 2011-01-21 16:44:53 +0000
@@ -0,0 +1,40 @@
1/*
2A library to communicate a menu object set accross DBus and
3track updates and maintain consistency.
4
5Copyright 2011 Canonical Ltd.
6
7Authors:
8 Ted Gould <ted@canonical.com>
9
10This program is free software: you can redistribute it and/or modify it
11under the terms of either or both of the following licenses:
12
131) the GNU Lesser General Public License version 3, as published by the
14Free Software Foundation; and/or
152) the GNU Lesser General Public License version 2.1, as published by
16the Free Software Foundation.
17
18This program is distributed in the hope that it will be useful, but
19WITHOUT ANY WARRANTY; without even the implied warranties of
20MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
21PURPOSE. See the applicable version of the GNU Lesser General Public
22License for more details.
23
24You should have received a copy of both the GNU Lesser General Public
25License version 3 and version 2.1 along with this program. If not, see
26<http://www.gnu.org/licenses/>
27*/
28
29#ifndef __DBUSMENU_GTK_H__
30#define __DBUSMENU_GTK_H__
31
32/* Start with the glib stuff */
33#include <libdbusmenu-glib/dbusmenu-glib.h>
34
35/* Now get the GTK stuff */
36#include <libdbusmenu-gtk/client.h>
37#include <libdbusmenu-gtk/menu.h>
38#include <libdbusmenu-gtk/menuitem.h>
39
40#endif /* __DBUSMENU_GLIB_H__ */

Subscribers

People subscribed via source and target branches