Session Menu

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

  1. nogtk2
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 256
Merged at revision: 256
Proposed branch: lp:~charlesk/indicator-session/nogtk2
Merge into: lp:indicator-session/12.10
Diff against target: 133 lines (+18/-65)
2 files modified
configure.ac (+18/-61)
src/user-widget.c (+0/-4)
To merge this branch: bzr merge lp:~charlesk/indicator-session/nogtk2
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Review via email: mp+105002@code.launchpad.net

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
=== modified file 'configure.ac'
--- configure.ac 2012-04-27 20:17:47 +0000
+++ configure.ac 2012-05-07 23:36:17 +0000
@@ -28,55 +28,27 @@
28# Dependencies 28# Dependencies
29###########################29###########################
3030
31GTK_REQUIRED_VERSION=2.1231GTK_REQUIRED_VERSION=3.0
32GTK3_REQUIRED_VERSION=3.0
33INDICATOR_REQUIRED_VERSION=0.3.1932INDICATOR_REQUIRED_VERSION=0.3.19
34DBUSMENUGTK_REQUIRED_VERSION=0.5.9033DBUSMENUGTK_REQUIRED_VERSION=0.5.90
35POLKIT_REQUIRED_VERSION=0.9234POLKIT_REQUIRED_VERSION=0.92
36DBUSTEST_REQUIRED_VERSION=0.0.535DBUSTEST_REQUIRED_VERSION=0.0.5
3736DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
38AC_ARG_WITH([gtk],37
39 [AS_HELP_STRING([--with-gtk],38
40 [Which version of gtk to use for the indicator @<:@default=3@:>@])],39PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
41 [],40 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
42 [with_gtk=3])41 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
43
44AS_IF([test "x$with_gtk" = x3],
45 [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
46 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
47 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
48 ],
49 [test "x$with_gtk" = x2],
50 [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
51 indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
52 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
53 ],
54 [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])]
55)
56
57AC_SUBST(APPLET_CFLAGS)42AC_SUBST(APPLET_CFLAGS)
58AC_SUBST(APPLET_LIBS)43AC_SUBST(APPLET_LIBS)
5944
60DBUSMENUGLIB_REQUIRED_VERSION=0.1.145
6146PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
62AS_IF([test "x$with_gtk" = x3],47 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
63 [PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION48 dbus-glib-1
64 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION49 gio-unix-2.0
65 dbus-glib-150 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
66 gio-unix-2.051 packagekit-glib2)
67 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
68 packagekit-glib2)
69 ],
70 [test "x$with_gtk" = x2],
71 [PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
72 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
73 dbus-glib-1
74 gio-unix-2.0
75 indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
76 packagekit-glib2)
77 ]
78)
79
80AC_SUBST(SESSIONERVICE_CFLAGS)52AC_SUBST(SESSIONERVICE_CFLAGS)
81AC_SUBST(SESSIONERVICE_LIBS)53AC_SUBST(SESSIONERVICE_LIBS)
8254
@@ -84,11 +56,6 @@
84AC_SUBST(GUDEV_CFLAGS)56AC_SUBST(GUDEV_CFLAGS)
85AC_SUBST(GUDEV_LIBS)57AC_SUBST(GUDEV_LIBS)
8658
87AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
88AS_IF([test "x$with_gtk" = x3], [
89 AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
90 ])
91
92###########################59###########################
93# GTK Logout Helper60# GTK Logout Helper
94###########################61###########################
@@ -98,19 +65,10 @@
98 enable_gtklogouthelper=auto)65 enable_gtklogouthelper=auto)
9966
100if test x"$enable_gtklogouthelper" != x"no" ; then67if test x"$enable_gtklogouthelper" != x"no" ; then
101 AS_IF([test "x$with_gtk" = x3],68 PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK_REQUIRED_VERSION
102 [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION69 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
103 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,70 [have_gtklogouthelper=yes],
104 [have_gtklogouthelper=yes],71 [have_gtklogouthelper=no])
105 [have_gtklogouthelper=no])
106 ],
107 [test "x$with_gtk" = x2],
108 [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
109 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
110 [have_gtklogouthelper=yes],
111 [have_gtklogouthelper=no])
112 ]
113 )
114 if test x${have_gtklogouthelper} = xyes; then72 if test x${have_gtklogouthelper} = xyes; then
115 AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])73 AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])
116 fi74 fi
@@ -281,7 +239,6 @@
281239
282 Prefix: $prefix240 Prefix: $prefix
283 Indicator Dir: $INDICATORDIR241 Indicator Dir: $INDICATORDIR
284 Indicator GTK: $with_gtk
285 Logout Helper: $have_gtklogouthelper242 Logout Helper: $have_gtklogouthelper
286 APT support: $enable_apt243 APT support: $enable_apt
287 Unit Tests: $enable_tests244 Unit Tests: $enable_tests
288245
=== modified file 'src/user-widget.c'
--- src/user-widget.c 2012-02-08 17:30:50 +0000
+++ src/user-widget.c 2012-05-07 23:36:17 +0000
@@ -137,11 +137,7 @@
137 137
138 priv->user_name = gtk_label_new ("");138 priv->user_name = gtk_label_new ("");
139139
140#if HAVE_GTK3
141 priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);140 priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
142#else
143 priv->container = gtk_hbox_new (FALSE, 0);
144#endif
145141
146 priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",142 priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",
147 GTK_ICON_SIZE_MENU);143 GTK_ICON_SIZE_MENU);

Subscribers

People subscribed via source and target branches