vino r908 - in trunk: . capplet

[jwendell svn gnome org]

Author: jwendell
Date: Mon Aug 18 14:18:12 2008
New Revision: 908
URL: http://svn.gnome.org/viewvc/vino?rev=908&view=rev

Log:
2008-08-18  Jonh Wendell <jwendell gnome org>

	* capplet/vino-preferences.c:
	* configure.in: Get rid of libgnomeui. Requires gtk+ >= 2.13.1 and
	glib >= 2.17.0.


Modified:
   trunk/ChangeLog
   trunk/capplet/vino-preferences.c
   trunk/configure.in

Modified: trunk/capplet/vino-preferences.c
==============================================================================
--- trunk/capplet/vino-preferences.c	(original)
+++ trunk/capplet/vino-preferences.c	Mon Aug 18 14:18:12 2008
@@ -33,9 +33,8 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
 #include <dbus/dbus-glib.h>
+#include <glib/gi18n.h>
 
 #ifdef VINO_ENABLE_KEYRING
 #include <gnome-keyring.h>
@@ -1347,7 +1346,7 @@
   screen = gtk_widget_get_screen (GTK_WIDGET (button));
 
   error = NULL;
-  if (!gnome_url_show_on_screen (link, screen, &error))
+  if (!gtk_show_uri (screen, link, GDK_CURRENT_TIME, &error))
     {
       /* FIXME better error handling!
        *       What best to do? For the specific case
@@ -1414,7 +1413,8 @@
 				  int                    response,
 				  VinoPreferencesDialog *dialog)
 {
-  GError *error;
+  GError    *error;
+  GdkScreen *screen;
 
   if (response != GTK_RESPONSE_HELP)
     {
@@ -1422,8 +1422,10 @@
       return;
     }
 
+  screen = gtk_widget_get_screen (widget);
   error = NULL;
-  gnome_help_display_desktop (NULL, "user-guide", "user-guide.xml", "goscustdesk-90", &error);
+
+  gtk_show_uri (screen, "ghelp:user-guide?goscustdesk-90", GDK_CURRENT_TIME, &error);
   if (error)
     {
       GtkWidget *message_dialog;
@@ -1601,8 +1603,7 @@
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
-		      argc, argv, NULL);
+  gtk_init (&argc, &argv);
 
   if (vino_preferences_is_running (&dialog))
     return 0;

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 18 14:18:12 2008
@@ -43,11 +43,14 @@
    AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
-PKG_CHECK_MODULES(VINO_SERVER, glib-2.0 >= 2.12.0 gtk+-x11-2.0 gconf-2.0 libglade-2.0 libbonobo-2.0 dbus-glib-1)
-	
-PKG_CHECK_MODULES(VINO_CAPPLET, glib-2.0 >= 2.12.0 gtk+-2.0 >= 2.10.0 gconf-2.0 libglade-2.0 libgnomeui-2.0 dbus-glib-1)
+GTK_VERSION=2.13.1
+GLIB_VERSION=2.17.0
 
-PKG_CHECK_MODULES(VINO_TOOLS, glib-2.0 >= 2.12.0 gconf-2.0 gobject-2.0 >= 2.12.0 gnome-keyring-1)
+PKG_CHECK_MODULES(VINO_SERVER, glib-2.0 >= $GLIB_VERSION gtk+-x11-2.0 >= $GTK_VERSION gconf-2.0 libglade-2.0 libbonobo-2.0 dbus-glib-1)
+
+PKG_CHECK_MODULES(VINO_CAPPLET, glib-2.0 >= $GLIB_VERSION gtk+-2.0 >= $GTK_VERSION gconf-2.0 libglade-2.0 dbus-glib-1)
+
+PKG_CHECK_MODULES(VINO_TOOLS, glib-2.0 >= $GLIB_VERSION gconf-2.0 gobject-2.0 >= $GLIB_VERSION gnome-keyring-1)
 
 dnl --enable-libnotify=(yes|no|auto)
 LIBNOTIFY_VERSION=0.4.4