[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#689113: unblock: gnome-session/3.4.2.1-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock gnome-session for these changes:
 - switch of the default browser (upon request of the RT)
 - replacement of the fallback dialog by a notification, which was 
   requested for live images

gnome-session (3.4.2.1-3) unstable; urgency=low

  * defaults.list:
    + epiphany.desktop → epiphany-browser.desktop.
    + Anyway replace epiphany with iceweasel.
    + Update default handlers for LibreOffice.
  * 04_fallback_warning_notify.patch: use libnotify to show the fallback 
    warning instead of a dialog.
  * Build-depend on libnotify.

unblock gnome-session/3.4.2.1-3

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-
Index: debian/defaults.list
===================================================================
--- debian/defaults.list	(révision 35680)
+++ debian/defaults.list	(copie de travail)
@@ -42,10 +42,6 @@
 image/x-tga=gimp.desktop
 image/x-xcf=gimp.desktop
 image/x-xwindowdump=gimp.desktop
-application/xhtml+xml=epiphany.desktop
-text/html=epiphany.desktop
-x-scheme-handler/http=epiphany-newtab.desktop
-x-scheme-handler/https=epiphany-newtab.desktop
 application/pdf=evince.desktop
 application/x-bzpdf=evince.desktop
 application/x-gzpdf=evince.desktop
@@ -146,87 +142,84 @@
 application/x-font-pcf=gnome-font-viewer.desktop
 application/x-font-type1=gnome-font-viewer.desktop
 application/x-font-otf=gnome-font-viewer.desktop
-application/csv=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
 application/tab-separated-values=gnumeric.desktop
+text/tab-separated-values=gnumeric.desktop
+text/csv=gnumeric.desktop
+text/x-csv=gnumeric.desktop
 application/vnd.lotus-1-2-3=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
 application/x-123=gnumeric.desktop
 application/x-applix-spreadsheet=gnumeric.desktop
-application/x-dbase=gnumeric.desktop
-application/x-dbf=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
 application/x-mps=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
 application/x-oleo=gnumeric.desktop
 application/x-planperfect=gnumeric.desktop
 application/x-quattropro=gnumeric.desktop
 application/x-sc=gnumeric.desktop
 application/x-sylk=gnumeric.desktop
 application/x-xbase=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-application/xls=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-text/csv=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-text/x-csv=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-x-content/software=nautilus-autorun-software.desktop
-inode/directory=nautilus.desktop
-application/x-gnome-saved-search=nautilus.desktop
+text/html=iceweasel.desktop
+application/xhtml+xml=iceweasel.desktop
+application/rss+xml=iceweasel.desktop
+application/rdf+xml=iceweasel.desktop
+x-scheme-handler/http=iceweasel.desktop
+x-scheme-handler/https=iceweasel.desktop
 application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-flat-xml=libreoffice-calc.desktop
 application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop
 application/vnd.sun.xml.calc=libreoffice-calc.desktop
 application/vnd.sun.xml.calc.template=libreoffice-calc.desktop
-application/vnd.stardivision.calc=libreoffice-calc.desktop
-application/vnd.stardivision.chart=libreoffice-calc.desktop
+application/msexcel=libreoffice-calc.desktop
+application/vnd.ms-excel=libreoffice-calc.desktop
 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop
 application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop
 application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop
 application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop
 application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop
+application/x-dbf=libreoffice-calc.desktop
+text/spreadsheet=libreoffice-calc.desktop
 application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.graphics-flat-xml=libreoffice-draw.desktop
 application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop
 application/vnd.sun.xml.draw=libreoffice-draw.desktop
 application/vnd.sun.xml.draw.template=libreoffice-draw.desktop
-application/vnd.stardivision.draw=libreoffice-draw.desktop
+application/vnd.visio=libreoffice-draw.desktop
+
 application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop
+application/vnd.oasis.opendocument.presentation-flat-xml=libreoffice-impress.desktop
 application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop
 application/vnd.sun.xml.impress=libreoffice-impress.desktop
 application/vnd.sun.xml.impress.template=libreoffice-impress.desktop
-application/vnd.stardivision.impress=libreoffice-impress.desktop
 application/mspowerpoint=libreoffice-impress.desktop
 application/vnd.ms-powerpoint=libreoffice-impress.desktop
 application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop
 application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop
 application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop
 application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.slide=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.slideshow=libreoffice-impress.desktop
 application/vnd.oasis.opendocument.formula=libreoffice-math.desktop
 application/vnd.sun.xml.math=libreoffice-math.desktop
-application/vnd.stardivision.math=libreoffice-math.desktop
 application/vnd.oasis.opendocument.text=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-flat-xml=libreoffice-writer.desktop
 application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop
 application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop
 application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop
 application/vnd.sun.xml.writer=libreoffice-writer.desktop
 application/vnd.sun.xml.writer.template=libreoffice-writer.desktop
 application/vnd.sun.xml.writer.global=libreoffice-writer.desktop
-application/vnd.stardivision.writer=libreoffice-writer.desktop
-application/msword=libreoffice-writer.desktop
-application/vnd.ms-word=libreoffice-writer.desktop
+eapplication/vnd.ms-word=libreoffice-writer.desktop
 application/x-doc=libreoffice-writer.desktop
+application/x-hwp=libreoffice-writer.desktop
 application/vnd.wordperfect=libreoffice-writer.desktop
 application/wordperfect=libreoffice-writer.desktop
+application/vnd.lotus-wordpro=libreoffice-writer.desktop
 application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop
 application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop
 application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop
 application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop
+x-content/software=nautilus-autorun-software.desktop
+inode/directory=nautilus.desktop
+application/x-gnome-saved-search=nautilus.desktop
 x-content/audio-player=rhythmbox.desktop
 x-content/audio-cdda=sound-juicer.desktop
 application/x-shockwave-flash=swfdec-player.desktop
Index: debian/patches/04_fallback_warning_notify.patch
===================================================================
--- debian/patches/04_fallback_warning_notify.patch	(révision 0)
+++ debian/patches/04_fallback_warning_notify.patch	(révision 35786)
@@ -0,0 +1,120 @@
+From 2ee08ec8374d4bfacc14118c34a1bd3392d5fbf2 Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss@debian.org>
+Date: Sun, 23 Sep 2012 11:11:03 +0200
+Subject: [PATCH] Display fallback warning using libnotify
+
+This avoids annoying users, especially those using live systems, with a
+dialog they have to click on.
+---
+ configure.ac                |    2 ++
+ gnome-session/gsm-manager.c |   61 +++++++++++++++++++------------------------
+ 2 files changed, 29 insertions(+), 34 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b75f269..60a7461 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@ GTK3_REQUIRED=2.90.7
+ DBUS_GLIB_REQUIRED=0.76
+ UPOWER_REQUIRED=0.9.0
+ JSON_GLIB_REQUIRED=0.10
++LIBNOTIFY_REQUIRED=0.7
+ 
+ dnl ====================================================================
+ dnl Dependency Checks
+@@ -54,6 +55,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+         upower-glib >= $UPOWER_REQUIRED
+         json-glib-1.0 >= $JSON_GLIB_REQUIRED
++        libnotify >= $LIBNOTIFY_REQUIRED
+ )
+ 
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
+index 9f7cff5..5aebc08 100644
+--- a/gnome-session/gsm-manager.c
++++ b/gnome-session/gsm-manager.c
+@@ -40,6 +40,8 @@
+ 
+ #include <gtk/gtk.h> /* for logout dialog */
+ 
++#include <libnotify/notify.h>
++
+ #include "gsm-manager.h"
+ #include "gsm-manager-glue.h"
+ 
+@@ -1341,46 +1343,37 @@ end_session_or_show_shell_dialog (GsmManager *manager)
+ }
+ 
+ static void
++on_link_clicked (NotifyNotification *notif,
++                             char *action,
++                             gpointer data)
++{
++        char *uri = data;
++        gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
++}
++
++static gboolean
++notification_show_timeout (gpointer data)
++{
++        NotifyNotification *notif = (NotifyNotification *) data;
++        notify_notification_show (notif, NULL);
++        g_object_unref (G_OBJECT (notif));
++        return FALSE;
++}
++
++static void
+ show_fallback_dialog (const char *title,
+                       const char *description,
+                       const char *link_text,
+                       const char *uri)
+ {
+-        GtkWidget *dialog, *image, *link, *hbox;
+-
+-        dialog = gtk_message_dialog_new (NULL, 0,
+-                                         GTK_MESSAGE_WARNING,
+-                                         GTK_BUTTONS_CLOSE,
+-                                         "%s", title);
+-
+-        gtk_window_set_icon_name (GTK_WINDOW (dialog), GSM_ICON_COMPUTER_FAIL);
++        NotifyNotification *notif;
+ 
+-        image = gtk_image_new_from_icon_name (GSM_ICON_COMPUTER_FAIL,
+-                                              gsm_util_get_computer_fail_icon_size ());
+-        gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
+-
+-        if (description) {
+-                gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+-                                                            "%s", description);
+-        }
+-
+-        hbox = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
+-
+-        if (uri) {
+-                if (link_text) {
+-                        link = gtk_link_button_new_with_label (uri, link_text);
+-                } else {
+-                        link = gtk_link_button_new (uri);
+-                }
+-                gtk_box_pack_start (GTK_BOX (hbox), link, FALSE, FALSE, 0);
+-        }
+-
+-        gtk_widget_show_all (dialog);
+-
+-        g_signal_connect (dialog,
+-                          "response",
+-                          G_CALLBACK (gtk_widget_destroy),
+-                          NULL);
++        notify_init ("GNOME");
++        notif = notify_notification_new (title, description, GSM_ICON_COMPUTER_FAIL);
++        notify_notification_set_timeout (notif, 15*1000);
++        notify_notification_add_action (notif, "link-click", link_text, NOTIFY_ACTION_CALLBACK (on_link_clicked), g_strdup (uri), g_free);
++        /* Give the notification daemon a chance to finish initialization */
++        g_timeout_add_seconds (2, (GSourceFunc) notification_show_timeout, (gpointer) notif);
+ }
+ 
+ static void
+-- 
+1.7.10.4
+
Index: debian/patches/series
===================================================================
--- debian/patches/series	(révision 35680)
+++ debian/patches/series	(copie de travail)
@@ -2,6 +2,7 @@
 02_fallback_desktop.patch
 03_fallback_desktop_makefile.patch
 #10_session_save.patch
+04_fallback_warning_notify.patch
 12_no_gdm_fallback.patch
 13_display_session_properties.patch
 14_hide_session_properties_help.patch
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 35680)
+++ debian/changelog	(copie de travail)
@@ -1,3 +1,15 @@
+gnome-session (3.4.2.1-3) unstable; urgency=low
+
+  * defaults.list:
+    + epiphany.desktop → epiphany-browser.desktop.
+    + Anyway replace epiphany with iceweasel.
+    + Update default handlers for LibreOffice.
+  * 04_fallback_warning_notify.patch: use libnotify to show the fallback 
+    warning instead of a dialog.
+  * Build-depend on libnotify.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 29 Sep 2012 10:19:13 +0200
+
 gnome-session (3.4.2.1-2) unstable; urgency=low
 
   * debian/patches/13_display_session_properties.patch: Display
Index: debian/control
===================================================================
Index: debian/control.in
===================================================================
--- debian/control.in	(révision 35680)
+++ debian/control.in	(copie de travail)
@@ -16,6 +16,7 @@
                libdbus-glib-1-dev (>= 0.76),
                libgconf2-dev (>= 2.10.1-6),
                libjson-glib-dev (>= 0.10),
+               libnotify-dev (>= 0.7),
                libsm-dev,
                libice-dev,
                libx11-dev,

Reply to: