File nautilus-share-git20110615-6c0fa271.patch of Package nautilus-share

Overview Repositories Revisions Requests Users Attributes Meta

File nautilus-share-git20110615-6c0fa271.patch of Package nautilus-share (Revision aae1b952cc5220f8c777f93e11eebf6b)

Currently displaying revision aae1b952cc5220f8c777f93e11eebf6b , Show latest

diff --git a/ChangeLog b/ChangeLog
index a1320a9..6cf3803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+2009-10-11  Mișu Moldovan  <dumol@gnome.ro>
+
+	* configure.in: Added "ro" to ALL_LINGUAS
+
+2009-03-06  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* configure.in: Added "mr" to ALL_LINGUAS
+
+2009-02-20  Priit Laes <plaes@plaes.org>
+
+	* configure.in: Added "et" to ALL_LINGUAS
+
+2008-12-21  Andre Klapper  <a9016009@gmx.de>
+
+	* configure.in: Added "de" to ALL_LINGUAS (Thanks, Kenneth!)
+
+2008-12-21  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* configure.in: Added "da" to ALL_LINGUAS
+
+2008-10-23  Andre Klapper  <a9016009@gmx.de>
+
+        * configure.in: Added ast to ALL_LINGUAS on behalf of Mikel González.
+
+2008-10-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Added 'nb' to ALL_LINGUAS.
+
+2008-05-17  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* configure.in: Added 'he' to ALL_LINGUAS.
+
+2008-04-09  Petr Kovar  <pknbe@volny.cz>
+
+	* configure.in: Added cs to ALL_LINGUAS.
+
+2008-03-14  Andre Klapper  <a9016009@gmx.de>
+
+	* configure.in: Added missing Swedish (sv) to ALL_LINGUAS.
+
+2008-03-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+        * configure.in: Added "zh_HK" "zh_TW" to ALL_LINGUAS.
+
+2008-03-03  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: Check for nautilus extension dir
+
+	* src/Makefile.am: install nautilus extension to directory based
+	on package config file
+
+2008-01-11  Changwoo Ryu  <cwryu@debian.org>
+
+	* configure.in: Added 'ko' to ALL_LINGUAS.
+
+2007-11-22  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* configure.in: Added Portuguese (pt) to ALL_LINGUAS.
+
+2007-11-16  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* configure.in: Added 'gl' to ALL_LINGUAS.
+
+2007-10-14  Yannig Marchegay  <yannig@marchegay.org>
+
+	* configure.in: Added 'oc' to ALL_LINGUAS.
+
 2007-09-22  Sebastien Estienne <sebastien.estienne@gmail.com>
 
 	* A patch from Edward Catmur to implements a checkbox and keyfile 
diff --git a/Makefile.am b/Makefile.am
index 5642043..857d7e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = src pixmaps interfaces po
+SUBDIRS = src interfaces po
 EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in
diff --git a/configure.in b/configure.in
index 96cea69..5b3ad1b 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,6 @@ AC_PROG_INTLTOOL([0.29])
 NAUTILUS_REQUIRED=2.10.0
 EEL_REQUIRED=2.10.0
 GLIB_REQUIRED=2.4.0
-LIBGLADE_REQUIRED=2.4.0
 
 DATADIRNAME=share
 
@@ -28,9 +27,8 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
   AC_MSG_ERROR(you need to have pkgconfig installed !)
 fi
 
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED)
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
 
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
@@ -38,34 +36,32 @@ AC_SUBST(NAUTILUS_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-AC_SUBST(LIBGLADE_CFLAGS)
-AC_SUBST(LIBGLADE_LIBS)
+dnl ========================================================
+dnl Get nautilus extensionsdir
+dnl ========================================================
 
+NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUS_EXTENSION_DIR)
 
 dnl ========================================================
-dnl Set PIXMAPS_DIR 
+dnl Set INTERFACES_DIR 
 dnl ========================================================
 
 if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-  pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
   AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces", [path where glade files will be installed])
   interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces"
 else
-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-  pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
   AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces", [path where glade files will be installed])
   interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces"
 fi
 
-AC_SUBST(pixmapsdir)
 AC_SUBST(interfacesdir)
 
 dnl ========================================================
 dnl Transtlations
 dnl ========================================================
 
-ALL_LINGUAS="ar ca en_GB es de dz eu fi fr hu it pl pt_BR"
+ALL_LINGUAS="ar as ast bn_IN ca ca@valencia cs da de el en_GB es et de dz eu fi fr gl gu he hu id it kn ko lt ml mr nb oc pa pl pt pt_BR ro ru sl sv ta te uk zh_CN zh_HK zh_TW"
 GETTEXT_PACKAGE=nautilus-share
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
@@ -83,7 +79,6 @@ dnl ========================================================
 AC_CONFIG_FILES([
   Makefile 
   src/Makefile
-  pixmaps/Makefile
   interfaces/Makefile
   po/Makefile.in
 ])
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index e21799d..14fb073 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,13 +1,2 @@
-interfaces = \
-	share-dialog.glade
-
-interfaces_DATA = $(interfaces)
-
-EXTRA_DIST = \
-	$(interfaces:.glade=.glade.in)	\
-	fix.pl
-
-CLEANFILES = $(interfaces)
-
-$(interfaces): %.glade: %.glade.in
-	$(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@
+interfaces_DATA = share-dialog.ui
+EXTRA_DIST = share-dialog.ui
diff --git a/interfaces/fix.pl b/interfaces/fix.pl
deleted file mode 100755
index 17098d1..0000000
--- a/interfaces/fix.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
-# This is a general script to manipulate the GLADE files. It keeps track of 
-# the location of the read process using a stack. subst is called every
-# time a tag is opened, passing a refference to the stack, the string
-# from where the parsing stopped to the eol, and the whole string.
-
-# The first argument must be $(pixmapsdir).
-
-$PIXMAPSDIR = $ARGV[0];
-
-while (<STDIN>) {
-  if (/\s*<property\s+name\s*=\s*\"pixbuf\"\s*>(.+)<\/property>/ ||
-      /\s*<property\s+name\s*=\s*\"watermark_image\"\s*>(.+)<\/property>/ ||
-      /\s*<property\s+name\s*=\s*\"logo\"\s*>(.+)<\/property>/ ||
-      /\s*<property\s+name\s*=\s*\"icon\"\s*>(.+)<\/property>/ ||
-      /\s*<property\s+name\s*=\s*\"logo_image\"\s*>(.+)<\/property>/) {
-
-    $filename = $1;
-    @parts = split (/\//, $filename);
-    $basename = $parts[scalar @parts - 1];
-
-    $new_line = $_;
-    $new_line =~ s@$filename@$PIXMAPSDIR/$basename@;
-
-    print $new_line;
-  } else {
-    print $_;
-  }
-}
diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade.in
deleted file mode 100644
index 2c1f5e4..0000000
--- a/interfaces/share-dialog.glade.in
+++ /dev/null
@@ -1,480 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="window_folder_sharing">
-  <property name="border_width">5</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<widget class="GtkHBox" id="hbox6">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkImage" id="logo_image">
-	      <property name="visible">True</property>
-	      <property name="pixbuf">share-logo.png</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="logo_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Folder Sharing&lt;/b&gt;&lt;/big&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator1">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">5</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">12</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox_share_name">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="width_request">20</property>
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label_share_name">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Share _name:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry_share_name</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry_share_name">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="checkbutton_share_folder">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Share this _folder</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox_share_comment">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label2">
-		  <property name="width_request">20</property>
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label_share_comment">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Co_mment:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">entry_share_comment</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry_share_comment">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="checkbutton_share_rw_ro">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Allow other people to write in this folder</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="checkbutton_share_guest_ok">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Guest access (for people without a user account)</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label_status">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="label" translatable="yes"></property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">True</property>
-	  <property name="selectable">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator2">
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow1">
-	  <property name="sensitive">False</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTreeView" id="treeview_share_list">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="headers_visible">True</property>
-	      <property name="rules_hint">False</property>
-	      <property name="reorderable">False</property>
-	      <property name="enable_search">True</property>
-	      <property name="fixed_height_mode">False</property>
-	      <property name="hover_selection">False</property>
-	      <property name="hover_expand">False</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">1</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator3">
-	  <property name="sensitive">False</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">5</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button_cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button_apply">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkImage" id="image1">
-		  <property name="visible">True</property>
-		  <property name="stock">gtk-save</property>
-		  <property name="icon_size">4</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/interfaces/share-dialog.ui b/interfaces/share-dialog.ui
new file mode 100644
index 0000000..caf96d3
--- /dev/null
+++ b/interfaces/share-dialog.ui
@@ -0,0 +1,301 @@
+<?xml version="1.0"?>
+<interface>
+  
+  
+  <object class="GtkVBox" id="vbox1">
+    <property name="visible">True</property>
+    <property name="border_width">12</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkHBox" id="hbox6">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkImage" id="logo_image">
+            <property name="visible">True</property>
+            <property name="pixel_size">64</property>
+            <property name="icon_name">folder-remote</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="logo_label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Folder Sharing&lt;/b&gt;&lt;/big&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="justify">center</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator1">
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkTable" id="table1">
+        <property name="visible">True</property>
+        <property name="n_rows">5</property>
+        <property name="n_columns">2</property>
+        <property name="column_spacing">12</property>
+        <property name="row_spacing">6</property>
+        <child>
+          <object class="GtkHBox" id="hbox_share_name">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_share_name">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Share _name:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">entry_share_name</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="top_attach">1</property>
+            <property name="bottom_attach">2</property>
+            <property name="x_options">GTK_FILL</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry_share_name">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">&#x25CF;</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="right_attach">2</property>
+            <property name="top_attach">1</property>
+            <property name="bottom_attach">2</property>
+            <property name="y_options"></property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_share_folder">
+            <property name="label" translatable="yes">Share this _folder</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="right_attach">2</property>
+            <property name="x_options">GTK_FILL</property>
+            <property name="y_options"></property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_share_comment">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="width_request">20</property>
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_share_comment">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Co_mment:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">entry_share_comment</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="top_attach">2</property>
+            <property name="bottom_attach">3</property>
+            <property name="x_options">GTK_FILL</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry_share_comment">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">&#x25CF;</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="right_attach">2</property>
+            <property name="top_attach">2</property>
+            <property name="bottom_attach">3</property>
+            <property name="y_options"></property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_share_rw_ro">
+            <property name="label" translatable="yes">_Allow others to create and delete files in this folder</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="right_attach">2</property>
+            <property name="top_attach">3</property>
+            <property name="bottom_attach">4</property>
+            <property name="x_options">GTK_FILL</property>
+            <property name="y_options"></property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_share_guest_ok">
+            <property name="label" translatable="yes">_Guest access (for people without a user account)</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="right_attach">2</property>
+            <property name="top_attach">4</property>
+            <property name="bottom_attach">5</property>
+            <property name="x_options">GTK_FILL</property>
+            <property name="y_options"></property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_status">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="wrap">True</property>
+        <property name="selectable">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator2"/>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="sensitive">False</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">automatic</property>
+        <property name="vscrollbar_policy">automatic</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="treeview_share_list">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="padding">1</property>
+        <property name="position">5</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator3">
+        <property name="sensitive">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">6</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHButtonBox" id="hbuttonbox1">
+        <property name="visible">True</property>
+        <property name="spacing">5</property>
+        <property name="layout_style">end</property>
+        <child>
+          <object class="GtkButton" id="button_cancel">
+            <property name="label">gtk-cancel</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="can_default">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_apply">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="can_default">True</property>
+            <property name="receives_default">True</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="stock">gtk-save</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">7</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
deleted file mode 100644
index d176dee..0000000
--- a/pixmaps/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-pixmaps_DATA = \
-	share-logo.png
-
-EXTRA_DIST = $(pixmaps_DATA)
diff --git a/pixmaps/share-logo.png b/pixmaps/share-logo.png
deleted file mode 100644
index 98eedbc..0000000
Binary files a/pixmaps/share-logo.png and /dev/null differ
diff --git a/po/ChangeLog b/po/ChangeLog
index 8264045..504377f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,154 @@
+2009-09-01 Aron Xu <aronxu@gnome.org>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2009-03-18  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Added or in svn & Updated Oriya Translation
+
+2009-03-06  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* mr.po: Added Marathi Translations.
+
+2009-02-20  Priit Laes  <plaes@plaes.org>
+
+	* et.po: Added Estonian translation.
+
+2009-01-05  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Added Greek translation by Evgenia Petoumenou.
+
+2008-12-21  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* da.po: Added Danish translation
+
+2008-10-23  Andre Klapper  <a9016009@gmx.de>
+
+        * ast.po: Added Asturian translation on behalf of Mikel González.
+
+2008-10-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Added Norwegian bokmål translation.
+
+2008-09-28  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation by Gianvito Cavasoli.
+
+2008-09-09  Tomasz Dominikowski  <tdominikowski@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
+2008-08-13  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-9  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-07-31  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2008-06-29  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-06-29  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-06-15  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2008-05-17  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Added Hebrew translation from Rosetta.
+
+2008-04-09  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Added Czech translation by Kamil Paral,
+	thanks to Lucas Lommer (bug #526970).
+
+2008-04-06  Artem Popov  <artfwo@gmail.com>
+
+	* ru.po: Added Russian translation.
+
+2008-04-01  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-03-11  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Minor fix by Sílvia Miranda.
+
+2008-03-09  Philip Withnall  <pwithnall@svn.gnome.org>
+
+	* en_GB.po: Updated British English translation.
+
+2008-03-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+        * zh_HK.po: Added Traditional Chinese translation(Hong Kong).
+        * zh_TW.po: Added Traditional Chinese translation(Taiwan).
+
+2008-03-01  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2008-02-19  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-14  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-02-07  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2008-01-29  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by Joan Duran.
+
+2008-01-11  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Added Korean translation by Namhyung Kim.
+
+2007-12-31  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2007-12-26  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2007-11-22  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Added Portuguese translation by André Neves
+	<drakferion@gmail.com>.
+
+2007-11-20  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation by Alexandre Imache.
+
+2007-11-16  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Added Galician Translation by Iván Méndez.
+
+2007-11-01  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2007-09-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+        * es.po: Updated Spanish translation
+
+2007-09-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
 2007-09-07  Jonh Wendell  <jwendell@gnome.org>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index de7b941..83b49e2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
 src/nautilus-share.c
 src/shares.c
-interfaces/share-dialog.glade.in
+[type: gettext/glade]interfaces/share-dialog.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index b30913c..8c7c18d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,11 +7,9 @@ libnautilus_share_la_CFLAGS =				\
 	$(WARN_CFLAGS)                                  \
 	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(NAUTILUS_CFLAGS)				\
-	$(LIBGLADE_CFLAGS)				\
 	$(GLIB_CFLAGS)
 
-# FIXME: get this from the .pc file
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
 
 nautilus_extension_LTLIBRARIES=libnautilus-share.la
 
@@ -22,4 +20,4 @@ libnautilus_share_la_SOURCES =  \
 	shares.h
 
 libnautilus_share_la_LDFLAGS = -module -avoid-version
-libnautilus_share_la_LIBADD  = $(GLIB_LIBS) $(NAUTILUS_LIBS) $(LIBGLADE_LIBS)
+libnautilus_share_la_LIBADD  = $(GLIB_LIBS) $(NAUTILUS_LIBS)
diff --git a/src/nautilus-share.c b/src/nautilus-share.c
index 8768aba..e706f0e 100644
--- a/src/nautilus-share.c
+++ b/src/nautilus-share.c
@@ -31,34 +31,28 @@
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "nautilus-share.h"
 
-#include <eel/eel-vfs-extensions.h>
-
 #include <glib/gi18n-lib.h>
 
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkentry.h>
+#include <gio/gio.h>
 
-#include <glade/glade.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <time.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include "shares.h"
 
 
-#define NEED_ALWAYS_MASK      (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)	/* all usershares need go+rx */
+#define NEED_IF_GUESTOK_MASK (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* need go+rx for guest enabled usershares */
 #define NEED_IF_WRITABLE_MASK (S_IWGRP | S_IWOTH)			/* writable usershares need go+w additionally*/
-#define NEED_ALL_MASK         (NEED_ALWAYS_MASK | NEED_IF_WRITABLE_MASK)
+#define NEED_ALL_MASK         (NEED_IF_GUESTOK_MASK | NEED_IF_WRITABLE_MASK)
 
 static GObjectClass *parent_class;
 
@@ -69,7 +63,7 @@ typedef struct {
   char *path; /* Full path which is being shared */
   NautilusFileInfo *fileinfo; /* Nautilus file to which this page refers */
 
-  GladeXML *xml;
+  GtkBuilder *xml;
 
   GtkWidget *main; /* Widget that holds all the rest.  Its "PropertyPage" GObject-data points to this PropertyPage structure */
   
@@ -322,7 +316,7 @@ typedef enum {
 } ConfirmPermissionsStatus;
 
 static ConfirmPermissionsStatus
-confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_shared, gboolean is_writable)
+confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_shared, gboolean guest_ok, gboolean is_writable)
 {
   struct stat st;
   mode_t mode, new_mode, need_mask;
@@ -333,9 +327,10 @@ confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_sh
   if (stat (path, &st) != 0)
     return CONFIRM_NO_MODIFICATIONS; /* We'll just let "net usershare" give back an error if the file disappears */
 
-  mode = st.st_mode;
-  new_mode = mode | NEED_ALWAYS_MASK;
+  new_mode = mode = st.st_mode;
 
+  if (guest_ok)
+    new_mode |= NEED_IF_GUESTOK_MASK;
   if (is_writable)
     new_mode |= NEED_IF_WRITABLE_MASK;
 
@@ -389,7 +384,7 @@ property_page_commit (PropertyPage *page)
   if (is_shared && page->was_writable && !share_info.is_writable)
     restore_write_permissions (page->path);
 
-  status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.is_writable);
+  status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.guest_ok, share_info.is_writable);
   if (status == CONFIRM_CANCEL_OR_ERROR)
     return FALSE; /* the user didn't want us to change his folder's permissions */
 
@@ -414,6 +409,13 @@ property_page_commit (PropertyPage *page)
   if (!is_shared)
     restore_saved_permissions (page->path);
 
+  /* update initially shared state, so that we may undo later on */
+  if (retval)
+    {
+      page->was_initially_shared = is_shared;
+      page->is_dirty = FALSE;
+    }
+
   return retval;
 }
 
@@ -421,15 +423,15 @@ property_page_commit (PropertyPage *page)
 static gchar *
 get_fullpath_from_fileinfo(NautilusFileInfo *fileinfo)
 {
-  gchar *uri;
+  GFile *file;
   gchar *fullpath;
 
   g_assert (fileinfo != NULL);
   
-  uri = nautilus_file_info_get_uri(fileinfo);
-  fullpath = gnome_vfs_get_local_path_from_uri(uri);
-  g_assert (fullpath != NULL); /* In the beginning we checked that this was a local URI */
-  g_free(uri);
+  file = nautilus_file_info_get_location(fileinfo);
+  fullpath = g_file_get_path(file);
+  g_assert (fullpath != NULL && g_file_is_native(file)); /* In the beginning we checked that this was a local URI */
+  g_object_unref(file);
 
   return(fullpath);
 }
@@ -502,7 +504,10 @@ property_page_share_name_is_valid (PropertyPage *page)
 	  return FALSE;
 	}
       else
-	return TRUE;
+	{
+	  property_page_set_normal (page);
+	  return TRUE;
+	}
     }
 }
 
@@ -541,6 +546,8 @@ property_page_check_sensitivity (PropertyPage *page)
     apply_is_sensitive = page->was_initially_shared;
 
   gtk_widget_set_sensitive (page->button_apply, apply_is_sensitive);
+  gtk_button_set_label (GTK_BUTTON(page->button_apply),
+			page->was_initially_shared ? _("Modify _Share") : _("Create _Share"));
 }
 
 static void
@@ -637,6 +644,8 @@ button_apply_clicked_cb (GtkButton *button,
     {
       if (page->standalone_window)
 	gtk_widget_destroy (page->standalone_window);
+      else
+        property_page_check_sensitivity (page);
     }
 }
 
@@ -672,25 +681,33 @@ create_property_page (NautilusFileInfo *fileinfo)
 
       share_info = NULL;
       g_error_free (error);
+      error = NULL;
     }
 
-  page->xml = glade_xml_new(INTERFACES_DIR"/share-dialog.glade","vbox1",GETTEXT_PACKAGE);
-  page->main = glade_xml_get_widget(page->xml,"vbox1");
+
+  page->xml = gtk_builder_new ();
+  gtk_builder_set_translation_domain (page->xml, "nautilus-share");
+  g_assert (gtk_builder_add_from_file (page->xml,
+              INTERFACES_DIR"/share-dialog.ui", &error));
+
+  page->main = GTK_WIDGET (gtk_builder_get_object (page->xml, "vbox1"));
+  g_assert (page->main != NULL);
+
   g_object_set_data_full (G_OBJECT (page->main),
 			  "PropertyPage",
 			  page,
 			  free_property_page_cb);
 
-  page->checkbutton_share_folder = glade_xml_get_widget(page->xml,"checkbutton_share_folder");
-  page->hbox_share_comment = glade_xml_get_widget(page->xml,"hbox_share_comment");
-  page->hbox_share_name = glade_xml_get_widget(page->xml,"hbox_share_name");
-  page->checkbutton_share_rw_ro = glade_xml_get_widget(page->xml,"checkbutton_share_rw_ro");
-  page->checkbutton_share_guest_ok = glade_xml_get_widget(page->xml,"checkbutton_share_guest_ok");
-  page->entry_share_name = glade_xml_get_widget(page->xml,"entry_share_name");
-  page->entry_share_comment = glade_xml_get_widget(page->xml,"entry_share_comment");
-  page->label_status = glade_xml_get_widget(page->xml,"label_status");
-  page->button_cancel = glade_xml_get_widget(page->xml,"button_cancel");
-  page->button_apply = glade_xml_get_widget(page->xml,"button_apply");
+  page->checkbutton_share_folder = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_folder"));
+  page->hbox_share_comment = GTK_WIDGET (gtk_builder_get_object (page->xml,"hbox_share_comment"));
+  page->hbox_share_name = GTK_WIDGET (gtk_builder_get_object (page->xml,"hbox_share_name"));
+  page->checkbutton_share_rw_ro = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_rw_ro"));
+  page->checkbutton_share_guest_ok = GTK_WIDGET (gtk_builder_get_object (page->xml,"checkbutton_share_guest_ok"));
+  page->entry_share_name = GTK_WIDGET (gtk_builder_get_object (page->xml,"entry_share_name"));
+  page->entry_share_comment = GTK_WIDGET (gtk_builder_get_object (page->xml,"entry_share_comment"));
+  page->label_status = GTK_WIDGET (gtk_builder_get_object (page->xml,"label_status"));
+  page->button_cancel = GTK_WIDGET (gtk_builder_get_object (page->xml,"button_cancel"));
+  page->button_apply = GTK_WIDGET (gtk_builder_get_object (page->xml,"button_apply"));
 
   /* Sanity check so that we don't screw up the Glade file */
   g_assert (page->checkbutton_share_folder != NULL
@@ -867,11 +884,13 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb
 {
   char		*uri;
   char		*local_path = NULL;
+  GFile         *f;
 
   *share_info = NULL;
   *is_shareable = FALSE;
 
   uri = nautilus_file_info_get_uri (file);
+  f = nautilus_file_info_get_location(file);
   if (!uri)
     goto out;
 
@@ -900,7 +919,8 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb
   if (!nautilus_file_info_is_directory(file))
     goto out;
 
-  if(!(local_path = gnome_vfs_get_local_path_from_uri(uri)))
+  local_path = g_file_get_path(f);
+  if (!local_path || !g_file_is_native(f))
     goto out;
 
   /* FIXME: NULL GError */
@@ -911,6 +931,7 @@ get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gb
 
  out:
 
+  g_object_unref(f);
   g_free (uri);
   g_free (local_path);
 }
@@ -1086,6 +1107,7 @@ share_this_folder_callback (NautilusMenuItem *item,
   g_assert (fileinfo != NULL);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), _("Folder Sharing"));
   page = create_property_page (fileinfo);
   page->standalone_window = window;
   g_signal_connect (page->button_cancel, "clicked",
@@ -1128,7 +1150,7 @@ nautilus_share_get_file_items (NautilusMenuProvider *provider,
   item = nautilus_menu_item_new ("NautilusShare::share",
 				 _("Sharing Options"),
 				 _("Share this Folder"),
-				 "stock_shared-by-me");
+				 "folder-remote");
   g_signal_connect (item, "activate",
 		    G_CALLBACK (share_this_folder_callback),
 		    fileinfo);
@@ -1232,7 +1254,7 @@ nautilus_share_register_type (GTypeModule *module)
 void
 nautilus_module_initialize (GTypeModule  *module)
 {
-  g_print ("Initializing nautilus-share extension\n");
+  /*g_print ("Initializing nautilus-share extension\n");*/
 
   bindtextdomain("nautilus-share", NAUTILUS_SHARE_LOCALEDIR);
   bind_textdomain_codeset("nautilus-share", "UTF-8");
@@ -1244,7 +1266,7 @@ nautilus_module_initialize (GTypeModule  *module)
 void
 nautilus_module_shutdown   (void)
 {
-  g_print ("Shutting down nautilus-share extension\n");
+  /*g_print ("Shutting down nautilus-share extension\n");*/
   /* FIXME freeing */
 }
 
diff --git a/src/shares.c b/src/shares.c
index 6a869b9..f65f78d 100644
--- a/src/shares.c
+++ b/src/shares.c
@@ -78,7 +78,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 
 	stdout_contents = NULL;
 	stderr_contents = NULL;
-
+	/*
 	{
 		char **p;
 
@@ -89,7 +89,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 
 		g_message ("end of spawn args; SPAWNING\n");
 	}
-
+	*/
 	real_error = NULL;
 	retval = g_spawn_sync (NULL,			/* cwd */
 			       real_argv,
@@ -102,7 +102,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 			       &exit_status,
 			       &real_error);
 
-	g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message);
+	/* g_message ("returned from spawn: %s: %s", retval ? "SUCCESS" : "FAIL", retval ? "" : real_error->message); */
 
 	if (!retval) {
 		g_propagate_error (error, real_error);
@@ -141,7 +141,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 
 	exit_code = WEXITSTATUS (exit_status);
 
-	g_message ("exit code %d", exit_code);
+	/* g_message ("exit code %d", exit_code); */
 	if (exit_code != 0) {
 		char *str;
 		char *message;
@@ -170,7 +170,7 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 	}
 
 	if (ret_key_file) {
-		g_message ("caller wants GKeyFile");
+	  /* g_message ("caller wants GKeyFile"); */
 
 		*ret_key_file = NULL;
 
@@ -205,14 +205,14 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro
 	} else
 		retval = TRUE;
 
-	g_message ("success from calling net usershare and parsing its output");
+	/* g_message ("success from calling net usershare and parsing its output"); */
 
  out:
 	g_free (real_argv);
 	g_free (stdout_contents);
 	g_free (stderr_contents);
 
-	g_message ("------------------------------------------");
+	/* g_message ("------------------------------------------"); */
 
 	return retval;
 }
@@ -358,9 +358,9 @@ add_key_group_to_hashes (GKeyFile *key_file, const char *group)
 
 	acl = get_string_from_key_file (key_file, group, KEY_ACL);
 	if (acl) {
-		if (strcmp (acl, "Everyone:R") == 0)
+		if (strstr (acl, "Everyone:R"))
 			is_writable = FALSE;
-		else if (strcmp (acl, "Everyone:F") == 0)
+		else if (strstr (acl, "Everyone:F"))
 			is_writable = TRUE;
 		else {
 			g_message ("unknown format for key '%s/%s' as it contains '%s'.  Assuming that the share is read-only",
@@ -472,7 +472,7 @@ refresh_if_needed (GError **error)
 
 		new_timestamp = time (NULL);
 		if (new_timestamp - refresh_timestamp > TIMESTAMP_THRESHOLD) {
-			g_message ("REFRESHING SHARES");
+		  /* g_message ("REFRESHING SHARES"); */
 			retval = refresh_shares (error);
 		} else
 			retval = TRUE;
@@ -606,7 +606,7 @@ add_share (ShareInfo *info, GError **error)
 	gboolean supports_success;
 	gboolean supports_guest_ok;
 
-	g_message ("add_share() start");
+	/*	g_message ("add_share() start"); */
 
 	if (throw_error_on_add) {
 		g_set_error (error,
@@ -646,7 +646,7 @@ add_share (ShareInfo *info, GError **error)
 	copy = copy_share_info (info);
 	add_share_info_to_hashes (copy);
 
-	g_message ("add_share() end SUCCESS");
+	/* g_message ("add_share() end SUCCESS"); */
 
 	return TRUE;
 }
@@ -658,7 +658,7 @@ remove_share (const char *path, GError **error)
 	char *argv[2];
 	GError *real_error;
 
-	g_message ("remove_share() start");
+	/* g_message ("remove_share() start"); */
 
 	if (throw_error_on_remove) {
 		g_set_error (error,
@@ -699,7 +699,7 @@ remove_share (const char *path, GError **error)
 	remove_share_info_from_hashes (old_info);
 	shares_free_share_info (old_info);
 
-	g_message ("remove_share() end SUCCESS");
+	/* g_message ("remove_share() end SUCCESS"); */
 
 	return TRUE;
 }
@@ -709,11 +709,11 @@ modify_share (const char *old_path, ShareInfo *info, GError **error)
 {
 	ShareInfo *old_info;
 
-	g_message ("modify_share() start");
+ 	/* g_message ("modify_share() start"); */
 
 	old_info = lookup_share_by_path (old_path);
 	if (old_info == NULL) {
-		g_message ("modify_share() end; calling add_share() instead");
+	  /*g_message ("modify_share() end; calling add_share() instead");*/
 		return add_share (info, error);
 	}
 
@@ -748,7 +748,7 @@ modify_share (const char *old_path, ShareInfo *info, GError **error)
 		return FALSE;
 	}
 
-	g_message ("modify_share() end: will call add_share() with the new share info");
+	/* g_message ("modify_share() end: will call add_share() with the new share info"); */
 	return add_share (info, error);
 }

Places

File nautilus-share-git20110615-6c0fa271.patch of Package nautilus-share (Revision aae1b952cc5220f8c777f93e11eebf6b)

Places