diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 10:11:32 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 10:11:32 -0400 |
| commit | 95d709f429490ec4d3a636b8cf0747ceedbbc995 (patch) | |
| tree | e6e64ca83555d0074177a386bb9e604f6fda4915 /tools | |
| parent | 36fb97c7c97c3b40b48190e8e37b494bdff9edb9 (diff) | |
| parent | 8677620e7825d0ac249f5bc71210e4cf5dab53ec (diff) | |
| download | libayatana-indicator-95d709f429490ec4d3a636b8cf0747ceedbbc995.tar.gz libayatana-indicator-95d709f429490ec4d3a636b8cf0747ceedbbc995.tar.bz2 libayatana-indicator-95d709f429490ec4d3a636b8cf0747ceedbbc995.zip | |
* New upstream release.
* Build Fixes
* Adding license to test files (LP: #684886)
* Bump API/ABI versions appropriately and make easier to edit them in
the future
* Adding a name-hint to the indicator entries
* Merging scroll functions into a single good one (LP: #804618)
* debian/*install, control: Changing ABI version number bump in package names
* debian/rules: Making GTK2 the special case as GTK3 is default now
* debian/*install: Fixing pkgconfig file names
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 7 | ||||
| -rw-r--r-- | tools/indicator-loader.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 10f3bc2..e01a0d4 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -40,7 +40,10 @@ host_triplet = @host@ subdir = tools 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/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 = $(install_sh) -d @@ -72,7 +75,7 @@ indicator_loader3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(indicator_loader3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 03614aa..027d364 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -44,7 +44,11 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d g_debug("Signal: Entry Added"); GtkWidget * menuitem = gtk_menu_item_new(); +#if GTK_CHECK_VERSION(3,0,0) + GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); +#else GtkWidget * hbox = gtk_hbox_new(FALSE, 3); +#endif if (entry->image != NULL) { gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0); |