Application Indicators

Merge lp:~charlesk/indicator-application/nogtk2 into lp:indicator-application/12.10

  1. nogtk2
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 233
Merged at revision: 233
Proposed branch: lp:~charlesk/indicator-application/nogtk2
Merge into: lp:indicator-application/12.10
Diff against target: 78 lines (+8/-39)
2 files modified
configure.ac (+8/-33)
src/Makefile.am (+0/-6)
To merge this branch: bzr merge lp:~charlesk/indicator-application/nogtk2
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
jenkins continuous-integration Pending
Review via email: mp+105003@code.launchpad.net

Commit message

remove gtk2 support

Description of the change

remove gtk2 support

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-04-11 17:15:43 +0000
3+++ configure.ac 2012-05-07 23:45:24 +0000
4@@ -29,8 +29,7 @@
5 # Dependencies
6 ###########################
7
8-GTK_REQUIRED_VERSION=2.18
9-GTK3_REQUIRED_VERSION=2.91
10+GTK_REQUIRED_VERSION=3.0.0
11 GIO_REQUIRED_VERSION=2.26
12 INDICATOR_REQUIRED_VERSION=0.3.5
13 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
14@@ -39,36 +38,13 @@
15
16 LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
17
18-AC_ARG_WITH([gtk],
19- [AS_HELP_STRING([--with-gtk],
20- [Which version of gtk to use @<:@default=3@:>@])],
21- [],
22- [with_gtk=3])
23-AS_IF([test "x$with_gtk" = x3],
24- [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
25- gio-2.0 >= $GIO_REQUIRED_VERSION
26- indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
27- json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
28- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
29- dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
30-
31- PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
32-
33- AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
34- ],
35- [test "x$with_gtk" = x2],
36- [PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
37- gio-2.0 >= $GIO_REQUIRED_VERSION
38- indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
39- json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
40- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
41- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
42-
43- PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
44- ],
45- [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
46-)
47-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
48+PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK_REQUIRED_VERSION
49+ gio-2.0 >= $GIO_REQUIRED_VERSION
50+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
51+ json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
52+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
53+ dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
54+PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
55
56 ###########################
57 # gcov coverage reporting
58@@ -142,6 +118,5 @@
59
60 Prefix: $prefix
61 Indicator Dir: $INDICATORDIR
62- GTK+ Version: $with_gtk
63 gcov: $use_gcov
64 ])
65
66=== modified file 'src/Makefile.am'
67--- src/Makefile.am 2011-12-06 21:49:39 +0000
68+++ src/Makefile.am 2012-05-07 23:45:24 +0000
69@@ -1,9 +1,3 @@
70-if USE_GTK3
71-VER=3
72-else
73-VER=
74-endif
75-
76 CLEANFILES =
77 DISTCLEANFILES =
78 BUILT_SOURCES =

Subscribers

People subscribed via source and target branches