diff -u nautilus-share-0.7.2/debian/control nautilus-share-0.7.2/debian/control
--- nautilus-share-0.7.2/debian/control
+++ nautilus-share-0.7.2/debian/control
@@ -1,7 +1,7 @@
 Source: nautilus-share
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> 
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Thierry Randrianiriana <randrianiriana@gmail.com>
 Build-Depends: debhelper (>= 5), autotools-dev, intltool (>= 0.29), libgnomeui-dev, libnautilus-extension-dev, libglade2-dev, libeel2-dev, dpatch
 Standards-Version: 3.7.2
diff -u nautilus-share-0.7.2/debian/changelog nautilus-share-0.7.2/debian/changelog
--- nautilus-share-0.7.2/debian/changelog
+++ nautilus-share-0.7.2/debian/changelog
@@ -1,3 +1,13 @@
+nautilus-share (0.7.2-0ubuntu6) hardy-proposed; urgency=low
+
+  * 02_install_missing_samba.dpatch:
+   - prompt for restarting session when installing samba to take into account
+     sambashare group membership and libpam-smbpass to create NTLM password
+     hash (LP: #212098) 
+   - hidden window was not destroyed if user accepts installing samba 
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 27 Nov 2008 21:18:59 +0100
+
 nautilus-share (0.7.2-0ubuntu5) hardy; urgency=low
 
   * 02_install_missing_samba.dpatch:
diff -u nautilus-share-0.7.2/debian/patches/02_install_missing_samba.dpatch nautilus-share-0.7.2/debian/patches/02_install_missing_samba.dpatch
--- nautilus-share-0.7.2/debian/patches/02_install_missing_samba.dpatch
+++ nautilus-share-0.7.2/debian/patches/02_install_missing_samba.dpatch
@@ -5,9 +5,17 @@
 
 @DPATCH@
 diff -urNad nautilus-share-0.7.2~/src/nautilus-share.c nautilus-share-0.7.2/src/nautilus-share.c
---- nautilus-share-0.7.2~/src/nautilus-share.c	2007-09-22 17:21:07.000000000 +0200
-+++ nautilus-share-0.7.2/src/nautilus-share.c	2008-04-10 11:50:00.000000000 +0200
-@@ -45,6 +45,9 @@
+--- nautilus-share-0.7.2~/src/nautilus-share.c	2008-11-26 19:37:45.000000000 +0100
++++ nautilus-share-0.7.2/src/nautilus-share.c	2008-11-26 20:51:11.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <libnautilus-extension/nautilus-property-page-provider.h>
+ 
+ #include <libgnomevfs/gnome-vfs-utils.h>
++#include <libgnomeui/libgnomeui.h>
+ #include "nautilus-share.h"
+ 
+ #include <eel/eel-vfs-extensions.h>
+@@ -45,6 +46,9 @@
  #include <gtk/gtk.h>
  #include <gtk/gtkentry.h>
  
@@ -17,7 +25,7 @@
  #include <glade/glade.h>
  
  #include <string.h>
-@@ -52,6 +55,7 @@
+@@ -52,6 +56,7 @@
  
  #include <unistd.h>
  #include <stdlib.h>
@@ -25,7 +33,7 @@
  
  #include "shares.h"
  
-@@ -573,6 +577,170 @@
+@@ -573,6 +578,195 @@
    property_page_check_sensitivity (page);
  }
  
@@ -146,6 +154,7 @@
 +check_and_install_samba (PropertyPage *page)
 +{
 +   GtkWidget *dialog;
++   GtkWidget *dialog_ask_restart;
 +   GtkWidget *nfs_check, *smb_check;
 +   gint response;
 +   gboolean retval = FALSE;
@@ -171,7 +180,6 @@
 +   // run synaptic
 +   if (response == GTK_RESPONSE_OK) {
 +      pid_t pid;
-+      gboolean retval = FALSE;
 +      
 +      gchar **packages = g_new0 (gchar*, 3);
 +      packages[0] = g_strdup("samba");
@@ -185,10 +193,35 @@
 +      unlink (path);
 +      g_free (path);
 +      g_strfreev (packages);
++      response = NULL;
++
++      // ask for reloading session to make libpam-smbpass create NTLM password hash
++      if (retval == TRUE) {   
++         dialog_ask_restart = gtk_message_dialog_new (NULL,
++						      GTK_DIALOG_MODAL,
++						      GTK_MESSAGE_WARNING,
++						      GTK_BUTTONS_CLOSE,
++						      _("Restart your session"));
++         gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog_ask_restart),
++						     _("You need to restart your session in order to enable sharing."));
++         gtk_dialog_add_button (GTK_DIALOG (dialog_ask_restart), _("Restart session"), GTK_RESPONSE_OK);
++
++         response = gtk_dialog_run (GTK_DIALOG (dialog_ask_restart));
++         gtk_widget_destroy (dialog_ask_restart);
++      }
 +
-+      return TRUE;
 +   }
 +   gtk_widget_destroy (dialog);
++
++   // Tell gnome-session to save and exit the session
++   if (response == GTK_RESPONSE_OK) {
++      gnome_client_request_save (gnome_master_client(),
++				 GNOME_SAVE_GLOBAL,
++				 TRUE,
++				 GNOME_INTERACT_ANY,
++				 TRUE,
++				 TRUE);
++   }
 +   
 +   return retval;
 +}
@@ -196,7 +229,7 @@
  /*--------------------------------------------------------------------------*/
  static void
  on_checkbutton_share_folder_toggled    (GtkToggleButton *togglebutton,
-@@ -582,6 +750,12 @@
+@@ -582,6 +776,12 @@
  
    page = user_data;