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

[Charles Kerr]

[lp:~charlesk/indicator-datetime/nogtk2]

177. By Charles Kerr on 2012-05-08

remove AC_ARG_WITH

[Lars Karlitski (larsu)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-04-04 21:06:51 +0000
+++ configure.ac	2012-05-08 23:03:19 +0000
@@ -43,16 +43,6 @@
 PKG_PROG_PKG_CONFIG
 
 ###########################
-# GTK+ version option
-###########################
-
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use for the indicator @<:@default=3@:>@])],
-  [],
-  [with_gtk=3])
-
-###########################
 # Dependencies
 ###########################
 
@@ -71,22 +61,11 @@
 GTK3_REQUIRED_VERSION=3.1.4
 GCONF_REQUIRED_VERSION=2.31
 
-AS_IF([test "x$with_gtk" = x3],
-    [PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                  glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                  dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
-        ],
-      [test "x$with_gtk" = x2],
-    [PKG_CHECK_MODULES(INDICATOR, indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                  glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                  dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
-        ],
-    [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
+PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                             glib-2.0 >= $GLIB_REQUIRED_VERSION
+                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                             dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                             libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
 
 PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                            glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -123,7 +102,7 @@
    if test x${have_ccpanel} = xyes; then
       AC_DEFINE(HAVE_CCPANEL, 1, [Define to 1 to enable Control Center panel])
       PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
-                                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
+                                gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
    fi
    if test x${with_ccpanel} = xyes && test x${have_ccpanel} = xno; then
      AC_MSG_ERROR([Control Center panel configured but not found])
@@ -167,15 +146,10 @@
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
 	],
-	[AS_IF([test "x$with_gtk" = "x2"],
-		[
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
-		],
-		[
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
-		])])
+	[
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
+	])
 
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2012-04-23 00:30:07 +0000
+++ src/datetime-service.c	2012-05-08 23:03:19 +0000
@@ -952,17 +952,10 @@
         if (color_spec != NULL) {
         	g_debug("Creating a cairo surface: size, %d by %d", width, height);         
         	cairo_surface_t *surface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, width, height ); 
-
 			cairo_t *cr = cairo_create(surface);
-#if GTK_CHECK_VERSION(3,0,0)
         	GdkRGBA rgba;
         	if (gdk_rgba_parse (&rgba, color_spec))
         		gdk_cairo_set_source_rgba (cr, &rgba);
-#else
-			GdkColor color;
-			if (gdk_color_parse (color_spec, &color))
-				gdk_cairo_set_source_color (cr, &color);
-#endif
 			cairo_paint(cr);
     		cairo_set_source_rgba(cr, 0,0,0,0.5);
     		cairo_set_line_width(cr, 1);

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2012-03-07 20:49:58 +0000
+++ src/indicator-datetime.c	2012-05-08 23:03:19 +0000
@@ -1220,11 +1220,7 @@
 
 	mi_data->gmi = gtk_menu_item_new();
 
-#if GTK_CHECK_VERSION(3,0,0)
 	GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-#else
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 4);
-#endif
 
 	/* Icon, probably someone's face or avatar on an IM */
 	mi_data->icon = gtk_image_new();
@@ -1435,11 +1431,7 @@
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi),
 		dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO));
 
-#if GTK_CHECK_VERSION(3,0,0)
 	GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-#else
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 4);
-#endif
 
   	/* Label, probably a username, chat room or mailbox name */
 	mi_data->label = gtk_label_new("");