ekiga r6803 - in trunk: . lib/engine/gui/gtk-core src/gui

[jschamp svn gnome org]

Author: jschamp
Date: Tue Sep  2 18:07:34 2008
New Revision: 6803
URL: http://svn.gnome.org/viewvc/ekiga?rev=6803&view=rev

Log:
Remove some GTK+ version checks, bump required version to 2.12.0 for configure.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
   trunk/src/gui/main.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Sep  2 18:07:34 2008
@@ -175,7 +175,7 @@
 dnl ###############################
 dnl   Mandatory GTK support
 dnl ###############################
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0])
+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12.0])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 

Modified: trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp	Tue Sep  2 18:07:34 2008
@@ -687,9 +687,7 @@
   g_free (label_text);
 
   gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-#if GTK_CHECK_VERSION(2,10,0)
   gtk_label_set_line_wrap_mode (GTK_LABEL (widget), PANGO_WRAP_WORD);
-#endif
   gtk_box_pack_start (GTK_BOX (preamble), widget, FALSE, FALSE, 0);
 
   submitter = new InstructionsSubmitter (_instructions);
@@ -732,9 +730,7 @@
 
     widget = gtk_label_new (NULL);
     gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-#if GTK_CHECK_VERSION(2,10,0)
     gtk_label_set_line_wrap_mode (GTK_LABEL (widget), PANGO_WRAP_WORD);
-#endif
     gtk_label_set_markup_with_mnemonic (GTK_LABEL (widget),
 					("<span foreground=\"red\">" + _error + "</span>").c_str ());
     gtk_container_add (GTK_CONTAINER (preamble), widget);
@@ -875,9 +871,7 @@
 
   label = gtk_label_new_with_mnemonic (description.c_str ());
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION(2,10,0)
   gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD);
-#endif
   gtk_table_attach_defaults (GTK_TABLE (fields), label,
 			     0, 2, rows -1, rows);
   rows++;
@@ -917,9 +911,7 @@
 
   label = gtk_label_new_with_mnemonic (description.c_str ());
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION(2,10,0)
   gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD);
-#endif
 
   model = gtk_list_store_new (SingleChoiceSubmitter::COLUMN_NUMBER,
 			      G_TYPE_STRING, G_TYPE_STRING);

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Tue Sep  2 18:07:34 2008
@@ -3056,10 +3056,8 @@
 			    G_GNUC_UNUSED GdkEventFocus *event,
 			    G_GNUC_UNUSED gpointer user_data)
 {
-#if GTK_MINOR_VERSION >= 8
   if (gtk_window_get_urgency_hint (GTK_WINDOW (main_window)))
       gtk_window_set_urgency_hint (GTK_WINDOW (main_window), FALSE);
-#endif
 
   return FALSE;
 }