[gnome-user-share] 2.91.6

[Bastien Nocera <hadess src gnome org>]

commit de9435892afec62517f6d5bf4a33f27c6744f569
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 21 15:50:28 2011 +0000

    2.91.6
    
    Port to GTK+ 3.x

 NEWS                          |    5 ++++-
 configure.in                  |   13 ++++++-------
 data/file-share-properties.ui |    1 -
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/NEWS b/NEWS
index a37a51b..5b54f5e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
-This is gnome-user-share 2.30.2, a system for easy sharing of user files.
+This is gnome-user-share 2.91.6, a system for easy sharing of user files.
+
+Major changes since 2.30.2 are:
+* Build against GTK+ 3.x
 
 Major changes since 2.30.1 are:
 * Updated translations
diff --git a/configure.in b/configure.in
index b76a72d..9ee7e68 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(gnome-user-share, 2.30.2)
+AC_INIT(gnome-user-share, 2.91.6)
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
 AM_CONFIG_HEADER(config.h)
@@ -56,14 +56,14 @@ if $have_dbus_1_1 ; then
    AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
 fi
 
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.91.5)
 AC_SUBST(USER_SHARE_CFLAGS)
 AC_SUBST(USER_SHARE_LIBS)
 
-PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-2.0 >= 2.12.0 gconf-2.0 unique-1.0)
+PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-3.0 >= 2.12.0 gconf-2.0 unique-3.0)
 AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
 AC_SUBST(USER_SHARE_CONFIG_LIBS)
-	
+
 AC_CHECK_LIB(socket, socket)
 
 have_socket=no
@@ -107,7 +107,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE", [The gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-	
 dnl ==========================================================================
 dnl Check for SELinux
 
@@ -136,7 +135,7 @@ AC_ARG_WITH(nautilusdir,
 	    [ac_with_nautilusdir=""])
 
 PKG_CHECK_MODULES(EXTENSION,
-		   libnautilus-extension)
+		   libnautilus-extension >= 2.91.7)
 if test "${ac_with_nautilusdir}" = ""; then
 	ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
 fi
@@ -187,7 +186,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 else
 	AC_MSG_RESULT(no)
 fi
-			       
+
 AC_OUTPUT([
 Makefile
 data/Makefile
diff --git a/data/file-share-properties.ui b/data/file-share-properties.ui
index ad7f36c..6c4f053 100644
--- a/data/file-share-properties.ui
+++ b/data/file-share-properties.ui
@@ -8,7 +8,6 @@
     <property name="resizable">False</property>
     <property name="icon_name">folder-remote</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>