gnome-main-menu r488 - in trunk: . libslab

[awalton svn gnome org]

Author: awalton
Date: Mon Aug 11 16:18:05 2008
New Revision: 488
URL: http://svn.gnome.org/viewvc/gnome-main-menu?rev=488&view=rev

Log:
2008-08-11  A. Walton  <awalton gnome org>

	reviewed by: Federico Mena Quintero

	* directory-tile.c (delete_trigger):
	* document-tile.c (delete_trigger):
	Remove Eel dependency from libslab. Bug #524778.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libslab/ChangeLog
   trunk/libslab/directory-tile.c
   trunk/libslab/document-tile.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 11 16:18:05 2008
@@ -48,7 +48,7 @@
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(LIBSLAB, [ $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0 ])
+PKG_CHECK_MODULES(LIBSLAB, [ $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango ])
 
 AC_SUBST(LIBSLAB_CFLAGS)
 AC_SUBST(LIBSLAB_LIBS)

Modified: trunk/libslab/directory-tile.c
==============================================================================
--- trunk/libslab/directory-tile.c	(original)
+++ trunk/libslab/directory-tile.c	Mon Aug 11 16:18:05 2008
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n.h>
 #include <string.h>
-#include <eel/eel-alert-dialog.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <libgnomevfs/gnome-vfs.h>
@@ -554,7 +553,6 @@
 static void
 delete_trigger (Tile *tile, TileEvent *event, TileAction *action)
 {
-	gchar     *prompt;
 	GtkDialog *confirm_dialog;
 	gint       result;
 
@@ -565,13 +563,9 @@
 
 
 	if (GPOINTER_TO_INT (libslab_get_gconf_value (GCONF_CONFIRM_DELETE_KEY))) {
-		prompt = g_strdup_printf (
-			_("Are you sure you want to permanently delete \"%s\"?"),
-			DIRECTORY_TILE_GET_PRIVATE (tile)->basename);
-
-		confirm_dialog = GTK_DIALOG (eel_alert_dialog_new (
-			NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-			prompt, _("If you delete an item, it is permanently lost.")));
+		confirm_dialog = GTK_DIALOG(gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, 
+				GTK_BUTTONS_NONE, _("Are you sure you want to permanently delete \"%s\"?"), DIRECTORY_TILE_GET_PRIVATE (tile)->basename));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(confirm_dialog), _("If you delete an item, it is permanently lost."));
 							
 		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_DELETE, GTK_RESPONSE_YES);
@@ -580,7 +574,6 @@
 		result = gtk_dialog_run (confirm_dialog);
 
 		gtk_widget_destroy (GTK_WIDGET (confirm_dialog));
-		g_free (prompt);
 
 		if (result != GTK_RESPONSE_YES)
 			return;

Modified: trunk/libslab/document-tile.c
==============================================================================
--- trunk/libslab/document-tile.c	(original)
+++ trunk/libslab/document-tile.c	Mon Aug 11 16:18:05 2008
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n.h>
 #include <string.h>
-#include <eel/eel-alert-dialog.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
@@ -998,7 +997,6 @@
 {
 	DocumentTilePrivate *priv = DOCUMENT_TILE_GET_PRIVATE (tile);
 
-	gchar     *prompt;
 	GtkDialog *confirm_dialog;
 	gint       result;
 
@@ -1009,12 +1007,9 @@
 
 
 	if (GPOINTER_TO_INT (libslab_get_gconf_value (GCONF_CONFIRM_DELETE_KEY))) {
-		prompt = g_strdup_printf (
-			_("Are you sure you want to permanently delete \"%s\"?"), priv->basename);
-
-		confirm_dialog = GTK_DIALOG (eel_alert_dialog_new (
-			NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-			prompt, _("If you delete an item, it is permanently lost.")));
+		confirm_dialog = GTK_DIALOG(gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, 
+				GTK_BUTTONS_NONE, _("Are you sure you want to permanently delete \"%s\"?"), priv->basename));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(confirm_dialog), _("If you delete an item, it is permanently lost."));
 							
 		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_DELETE, GTK_RESPONSE_YES);
@@ -1023,7 +1018,6 @@
 		result = gtk_dialog_run (confirm_dialog);
 
 		gtk_widget_destroy (GTK_WIDGET (confirm_dialog));
-		g_free (prompt);
 
 		if (result != GTK_RESPONSE_YES)
 			return;