nautilus-cd-burner r2262 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Tue Dec 16 14:57:30 2008
New Revision: 2262
URL: http://svn.gnome.org/viewvc/nautilus-cd-burner?rev=2262&view=rev

Log:
2008-12-16  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* src/burn-extension.c (launch_process): Patch from A. Walton
	<awalton gnome org> to remove Eel usage (Closes: #524782)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/burn-extension.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec 16 14:57:30 2008
@@ -61,7 +61,6 @@
 GTK_REQUIRED=2.5.4
 LIBGLADE_REQUIRED=2.0.0
 LIBGNOME_REQUIRED=2.14.0
-EEL_REQUIRED=2.13.3
 NAUTILUS_REQUIRED=2.22.2
 HAL_REQUIRED=0.5.7
 DBUS_REQUIRED=0.6
@@ -97,7 +96,6 @@
 
 PKG_CHECK_MODULES(EXTENSION,
  libnautilus-extension >= $NAUTILUS_REQUIRED dnl
- eel-2.0 >= $EEL_REQUIRED dnl
  $HAL)
 NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
 AC_SUBST(NAUTILUSDIR)

Modified: trunk/src/burn-extension.c
==============================================================================
--- trunk/src/burn-extension.c	(original)
+++ trunk/src/burn-extension.c	Tue Dec 16 14:57:30 2008
@@ -28,9 +28,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <libhal.h>
-#include <eel/eel-features.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-extension/nautilus-location-widget-provider.h>
 
@@ -73,13 +70,6 @@
 
 static GObjectClass *parent_class;
 
-#ifndef EEL_CHECK_VERSION
-#define EEL_CHECK_VERSION(major,minor,micro)    \
-    (EEL_MAJOR_VERSION > (major) || \
-     (EEL_MAJOR_VERSION == (major) && EEL_MINOR_VERSION > (minor)) || \
-     (EEL_MAJOR_VERSION == (major) && EEL_MINOR_VERSION == (minor) && \
-      EEL_MICRO_VERSION >= (micro)))
-#endif
 
 #undef DEBUG_ENABLE
 
@@ -128,6 +118,7 @@
 launch_process (char **argv, GtkWindow *parent)
 {
         GError *error;
+        GtkWidget *dialog;
 
         error = NULL;
         if (!g_spawn_async (NULL,
@@ -137,16 +128,14 @@
                             NULL,
                             &error)) {
 
-#if EEL_CHECK_VERSION (2,13,3)
-                eel_show_error_dialog (_("Unable to launch the cd burner application"),
-                                       error->message,
-                                       GTK_WINDOW (parent));
-#else
-                eel_show_error_dialog (_("Unable to launch the cd burner application"),
-                                       error->message,
-                                       "",
-                                       GTK_WINDOW (parent));
-#endif
+
+                dialog = gtk_message_dialog (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING,
+					     GTK_BUTTONS_OK, _("Unable to launch the cd burner application"));
+
+                gtk_message_dialog_format_secondary_text (dialog, "%s", error->message);
+
+                gtk_dialog_run (dialog);
+                gtk_widget_destroy (dialog);
 
                 g_error_free (error);
         }