diff options
| author | Ted Gould <ted@gould.cx> | 2011-06-21 10:40:16 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-06-21 10:40:16 -0500 |
| commit | 950a4a3e90d479988b97c06d4dc17c25e9d54c93 (patch) | |
| tree | d4739f46309e740c0d85d18d9213a0171e16e0f8 /src | |
| parent | e96275dc28bf7592c626eda8b13eab2d940f2f3f (diff) | |
| parent | 026af1ce978c413338d2b7cfecbf58d285d9f89a (diff) | |
| download | ayatana-indicator-session-950a4a3e90d479988b97c06d4dc17c25e9d54c93.tar.gz ayatana-indicator-session-950a4a3e90d479988b97c06d4dc17c25e9d54c93.tar.bz2 ayatana-indicator-session-950a4a3e90d479988b97c06d4dc17c25e9d54c93.zip | |
* New upstream release.
* GTK3 support
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 13 | ||||
| -rw-r--r-- | src/indicator-session.c | 5 | ||||
| -rw-r--r-- | src/session-service.c | 2 |
4 files changed, 17 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4fa43b9..0317de7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,13 +69,13 @@ users-service-marshal.c: $(srcdir)/users-service.list gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ ################# # Session Stuff diff --git a/src/Makefile.in b/src/Makefile.in index 3dd0627..a79ce6c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,7 +40,10 @@ libexec_PROGRAMS = indicator-session-service$(EXEEXT) \ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,6 +168,7 @@ DATADIRNAME = @DATADIRNAME@ DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -208,6 +212,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -250,6 +255,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -282,7 +288,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -986,13 +991,13 @@ users-service-marshal.c: $(srcdir)/users-service.list gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/indicator-session.c b/src/indicator-session.c index e8a2f97..c9617c4 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -29,7 +29,12 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gio/gio.h> + +#if GTK_CHECK_VERSION(3, 0, 0) +#include <libdbusmenu-gtk3/menu.h> +#else #include <libdbusmenu-gtk/menu.h> +#endif #include <libindicator/indicator.h> #include <libindicator/indicator-object.h> diff --git a/src/session-service.c b/src/session-service.c index dc53f74..ddcb7cb 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -36,7 +36,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/menuitem.h> #include <libdbusmenu-glib/client.h> -#include <libdbusmenu-gtk/menuitem.h> +#include <libdbusmenu-gtk3/menuitem.h> #include <libindicator/indicator-service.h> |