[Xfce4-commits] <xfce4-panel:devel> Use new exo-1 library.

[Nick Schermer]

Updating branch refs/heads/devel
         to 280fb0ecc29dbc5a3b4e8849c5897b026e2713ab (commit)
       from e8d51d88337a1486ae5a70e291cfdc4a2b9e024e (commit)

commit 280fb0ecc29dbc5a3b4e8849c5897b026e2713ab
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Aug 29 20:26:01 2009 +0200

    Use new exo-1 library.

 configure.in.in                  |    2 +-
 panel/panel-dialogs.c            |    8 ++++++--
 panel/panel-item-dialog.c        |    2 +-
 panel/panel-preferences-dialog.c |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 46f8333..eeb28e5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -100,7 +100,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4MENU], [libxfce4menu-0.1], [4.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
diff --git a/panel/panel-dialogs.c b/panel/panel-dialogs.c
index d1e275e..c59654a 100644
--- a/panel/panel-dialogs.c
+++ b/panel/panel-dialogs.c
@@ -32,6 +32,8 @@
 #include <panel/panel-dialogs.h>
 #include <panel/panel-application.h>
 
+
+
 void
 panel_dialogs_show_about (void)
 {
@@ -43,9 +45,11 @@ panel_dialogs_show_about (void)
     NULL
   };
 
+#if !GTK_CHECK_VERSION (2, 18, 0)
   /* set exo hooks for urls and email */
-  gtk_about_dialog_set_email_hook (exo_url_about_dialog_hook, NULL, NULL);
-  gtk_about_dialog_set_url_hook (exo_url_about_dialog_hook, NULL, NULL);
+  gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
+  gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
+#endif
 
   /* show the dialog */
   gtk_show_about_dialog (NULL,
diff --git a/panel/panel-item-dialog.c b/panel/panel-item-dialog.c
index 88a50b0..f9a57c1 100644
--- a/panel/panel-item-dialog.c
+++ b/panel/panel-item-dialog.c
@@ -291,7 +291,7 @@ panel_item_dialog_response (GtkDialog *gtk_dialog,
     {
       /* open the help url on this screen */
       screen = gtk_widget_get_screen (GTK_WIDGET (gtk_dialog));
-      if (!exo_url_show_on_screen (ITEMS_HELP_URL, NULL, screen, &error))
+      if (!gtk_show_uri (screen, ITEMS_HELP_URL, gtk_get_current_event_time (), &error))
         {
           /* show error and cleanup */
           g_warning ("Failed to open help: %s", error->message);
diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index d6217ff..78fa55e 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -248,7 +248,7 @@ panel_preferences_dialog_response (GtkWidget              *window,
       screen = gtk_widget_get_screen (window);
 
       /* open the help url */
-      if (exo_url_show_on_screen (PREFERENCES_HELP_URL, NULL, screen, &error) == FALSE)
+      if (!gtk_show_uri (screen, PREFERENCES_HELP_URL, gtk_get_current_event_time (), &error))
         {
           /* show error and cleanup */
           g_warning ("Failed to open help: %s", error->message);