evolution-rss r183 - in trunk: . pixmaps src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Feb 29 19:41:16 2008
New Revision: 183
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=183&view=rev

Log:
gtk fine tunning

Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/config.h.in
   trunk/configure.ac
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.am
   trunk/src/Makefile.in
   trunk/src/rss.c

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Fri Feb 29 19:41:16 2008
@@ -133,6 +133,7 @@
 GMSGFMT = @GMSGFMT@
 GPP = @GPP@
 GREP = @GREP@
+GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Fri Feb 29 19:41:16 2008
@@ -12,9 +12,6 @@
 /* Define the location where the catalogs will be installed */
 #undef GNOMELOCALEDIR
 
-/* At least 2.6 present */
-#undef GTK_2_6
-
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 29 19:41:16 2008
@@ -241,9 +241,9 @@
 AC_SUBST(RENDER_N)
 
 # check for ellipsize
-if pkg-config --atleast-version=2.6.0 gtk+-2.0; then
-    AC_DEFINE(GTK_2_6,1,[At least 2.6 present])
-fi
+GTK_VERSION=`pkg-config --modversion gtk+-2.0` 
+GTK_VERSION=`echo $GTK_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
+AC_SUBST(GTK_VERSION)
 
 dnl ***********
 dnl GConf stuff

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Fri Feb 29 19:41:16 2008
@@ -115,6 +115,7 @@
 GMSGFMT = @GMSGFMT@
 GPP = @GPP@
 GREP = @GREP@
+GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Feb 29 19:41:16 2008
@@ -11,6 +11,7 @@
 	-DEVOLUTION_VERSION=$(evolution_exec_int)		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"            	\
 	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"            	\
+	-DGTK_VERSION="$(GTK_VERSION)"	            	\
 	-DLIBSOUP_VERSION="$(SOUP_VERSION)"	            	\
 	-DGECKO_HOME=\""$(GECKO_HOME)"\"			\
 	-DRENDER=\""$(RENDER)"\"				\

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Fri Feb 29 19:41:16 2008
@@ -160,6 +160,7 @@
 GMSGFMT = @GMSGFMT@
 GPP = @GPP@
 GREP = @GREP@
+GTK_VERSION = @GTK_VERSION@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
@@ -310,6 +311,7 @@
 	-DEVOLUTION_VERSION=$(evolution_exec_int)		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"            	\
 	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"            	\
+	-DGTK_VERSION="$(GTK_VERSION)"	            	\
 	-DLIBSOUP_VERSION="$(SOUP_VERSION)"	            	\
 	-DGECKO_HOME=\""$(GECKO_HOME)"\"			\
 	-DRENDER=\""$(RENDER)"\"				\

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Feb 29 19:41:16 2008
@@ -2818,10 +2818,12 @@
 		G_CALLBACK(readrss_dialog_cb),
 		NULL);
         GtkWidget *label2 = gtk_label_new(NULL);
-#if GTK_2_6
+#if GTK_VERSION > 2006000
 	gtk_label_set_ellipsize (GTK_LABEL (label2), PANGO_ELLIPSIZE_START);
 #endif
+#if GTK_VERSION < 2008000
 	gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_CENTER);
+#endif
         readrss_label = gtk_label_new(_("Please wait"));
         if (!rf->progress_dialog)
         {