diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-03 21:24:47 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-03 21:24:47 -0600 |
| commit | fe4253d9430d99d87bde3e8afb3837be35009c82 (patch) | |
| tree | 38e687a09cecf1bac01bf081951e3e9edede9f57 /src | |
| parent | 6456a3f6beacbfbf4866ebfcc60bb95cb17fe71c (diff) | |
| parent | 5ffa1850a8aefb9591309c6f884411543dd1fe04 (diff) | |
| download | ayatana-indicator-application-fe4253d9430d99d87bde3e8afb3837be35009c82.tar.gz ayatana-indicator-application-fe4253d9430d99d87bde3e8afb3837be35009c82.tar.bz2 ayatana-indicator-application-fe4253d9430d99d87bde3e8afb3837be35009c82.zip | |
Merging with trunk to get the GTK 3 build. Though, we don't really use it yet.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/appindicator3-0.1.pc.in | 14 | ||||
| -rw-r--r-- | src/indicator-application.c | 7 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e461599..3d1df8c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,9 @@ +if USE_GTK3 +VER=3 +else +VER= +endif + CLEANFILES = DISTCLEANFILES = BUILT_SOURCES = diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in new file mode 100644 index 0000000..a485910 --- /dev/null +++ b/src/appindicator3-0.1.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +Cflags: -I${includedir}/libappindicator3-0.1 +Requires: dbusmenu-glib gtk+-3.0 +Libs: -L${libdir} -lappindicator3 + +Name: appindicator3-0.1 +Description: Application indicators +Version: @VERSION@ + diff --git a/src/indicator-application.c b/src/indicator-application.c index 36e1446..ecf19e8 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -21,6 +21,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* G Stuff */ #include <glib.h> @@ -29,7 +32,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>. /* DBus Stuff */ #include <dbus/dbus-glib.h> +#ifdef HAVE_GTK3 +#include <libdbusmenu-gtk3/menu.h> +#else #include <libdbusmenu-gtk/menu.h> +#endif /* Indicator Stuff */ #include <libindicator/indicator.h> |