[gnome-settings-daemon/gnome-3-0] xrandr: Never use a notification for errors

[Bastien Nocera <hadess src gnome org>]

commit 95652d5e2c5b9696ba1af1aa4a23873c4c59c8b7
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 4 12:25:04 2011 +0100

    xrandr: Never use a notification for errors
    
    Use a dialogue instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=648303

 plugins/xrandr/Makefile.am          |    2 --
 plugins/xrandr/gsd-xrandr-manager.c |   14 --------------
 2 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 0bc78a2..ad9d43e 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -49,7 +49,6 @@ libxrandr_la_CPPFLAGS =						\
 libxrandr_la_CFLAGS =			\
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(LIBNOTIFY_CFLAGS)		\
 	$(GNOME_DESKTOP_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -58,7 +57,6 @@ libxrandr_la_LDFLAGS = 			\
 
 libxrandr_la_LIBADD  =			\
 	$(SETTINGS_PLUGIN_LIBS)		\
-	$(LIBNOTIFY_LIBS)		\
 	$(GNOME_DESKTOP_LIBS)
 
 plugin_in_files =			\
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 229a61a..b5defc7 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -45,8 +45,6 @@
 #include <libgnome-desktop/gnome-rr.h>
 #include <libgnome-desktop/gnome-rr-labeler.h>
 
-#include <libnotify/notify.h>
-
 #include "gsd-enums.h"
 #include "gnome-settings-profile.h"
 #include "gsd-xrandr-manager.h"
@@ -1110,17 +1108,6 @@ generate_fn_f7_configs (GsdXrandrManager *mgr)
 static void
 error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to_display, const char *secondary_text)
 {
-#if 1
-        NotifyNotification *notification;
-
-        g_assert (error_to_display == NULL || secondary_text == NULL);
-
-        notification = notify_notification_new (primary_text,
-                                                error_to_display ? error_to_display->message : secondary_text,
-                                                GSD_XRANDR_ICON_NAME);
-
-        notify_notification_show (notification, NULL); /* NULL-GError */
-#else
         GtkWidget *dialog;
 
         dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
@@ -1130,7 +1117,6 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
 
         gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (dialog);
-#endif /* 1 */
 }
 
 static void