[Goodies-commits] r5225 - in thunar-shares-plugin/trunk: . data thunar-plugin

Daniel Morales danielm at xfce.org
Wed Aug 13 18:52:43 CEST 2008


Author: danielm
Date: 2008-08-13 16:52:42 +0000 (Wed, 13 Aug 2008)
New Revision: 5225

Removed:
   thunar-shares-plugin/trunk/data/admin-dialog-editor.xml
Modified:
   thunar-shares-plugin/trunk/ChangeLog
   thunar-shares-plugin/trunk/data/Makefile.am
   thunar-shares-plugin/trunk/thunar-plugin/thunar-shares-plugin.c
   thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.c
   thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.h
   thunar-shares-plugin/trunk/thunar-plugin/tsp-admin.c
   thunar-shares-plugin/trunk/thunar-plugin/tsp-page.c
Log:
	* data/admin-dialog-editor.xml: Removed file
	* data/Makefile.am: Removed XML file
	* thunar-plugin/tsp-admin-editor.[ch]:
	* thunar-plugin/thunar-shares-plugin.c: Drop GtkBuilder code and
	writes a GObject to handle the shares-editor. $
 

Modified: thunar-shares-plugin/trunk/ChangeLog
===================================================================
--- thunar-shares-plugin/trunk/ChangeLog	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/ChangeLog	2008-08-13 16:52:42 UTC (rev 5225)
@@ -1,3 +1,11 @@
+2008-08-13	Daniel Morales <daniel at daniel.com.uy>
+
+	* data/admin-dialog-editor.xml: Removed file
+	* data/Makefile.am: Removed XML file
+	* thunar-plugin/tsp-admin-editor.[ch]:
+	* thunar-plugin/thunar-shares-plugin.c: Drop GtkBuilder code and
+	writes a GObject to handle the shares-editor.
+
 2008-08-12	Daniel Morales <daniel at daniel.com.uy>
 
 	* po/POTFILES.in: Updated files

Modified: thunar-shares-plugin/trunk/data/Makefile.am
===================================================================
--- thunar-shares-plugin/trunk/data/Makefile.am	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/data/Makefile.am	2008-08-13 16:52:42 UTC (rev 5225)
@@ -2,7 +2,6 @@
 xmldir = $(datadir)/thunar-shares
 
 xml_DATA = admin-dialog.xml		\
-	   admin-dialog-editor.xml	\
 	   dialogs.xml
 
 EXTRA_DIST = $(xml_DATA)

Deleted: thunar-shares-plugin/trunk/data/admin-dialog-editor.xml

Modified: thunar-shares-plugin/trunk/thunar-plugin/thunar-shares-plugin.c
===================================================================
--- thunar-shares-plugin/trunk/thunar-plugin/thunar-shares-plugin.c	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/thunar-plugin/thunar-shares-plugin.c	2008-08-13 16:52:42 UTC (rev 5225)
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <libshares/shares.h>
 
+#include "tsp-admin-editor.h"
 #include "tsp-provider.h"
 #include "tsp-page.h"
 
@@ -55,6 +56,7 @@
 
 	/* register the types provided by this plugin */
 	tsp_page_register_type (plugin);
+	tsp_admin_editor_register_type (plugin);
 	tsp_provider_register_type (plugin);
 
 	/* setup the plugin provider type list */

Modified: thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.c
===================================================================
--- thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.c	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.c	2008-08-13 16:52:42 UTC (rev 5225)
@@ -26,205 +26,258 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <thunarx/thunarx.h>
+
 #include <libshares/shares.h>
-#include <libshares/libshares-xml.h>
 #include <libshares/libshares-util.h>
 
 #include "tsp-admin.h"
 #include "tsp-admin-editor.h"
 
-#define XML_FILE "admin-dialog-editor.xml"
+static void tsp_admin_editor_class_init (TspAdminEditorClass  *klass);
+static void tsp_admin_editor_init       (TspAdminEditor       *editor);
+static void tsp_admin_editor_finalize   (GObject              *object);
 
-typedef struct {
-	GtkWidget  *dialog;
+static void tsp_admin_editor_response   (GtkDialog            *dialog,
+                                         gint                  response);
 
-	GtkWidget  *share_folder;
-	GtkWidget  *share_name;
-	GtkWidget  *share_comments;
-	GtkWidget  *share_write;
-	GtkWidget  *share_guest;
+static gboolean tsp_admin_editor_save_changes (TspAdminEditor *editor);
 
-	/* Widgets to hide, when edit */
-	GtkWidget  *share_label1;
-	GtkWidget  *share_hbox1;
+static void tsp_admin_editor_set_path   (TspAdminEditor       *editor,
+                                         const char           *path);
 
-	/* Current share name */
-	gchar      *old_name;
+struct _TspAdminEditorClass
+{
+  GtkDialogClass __parent__;
+};
 
-	gpointer    admin;
-} TspAdminEdit;
+struct _TspAdminEditor
+{
+  GtkDialog   __parent__;
 
-static void editor_response_cb (GtkWidget    *widget,
-                                gint          response,
-                                TspAdminEdit *editor);
+  GtkWidget  *share_folder;
+  GtkWidget  *share_folder_label;
+  GtkWidget  *share_name;
+  GtkWidget  *share_comments;
+  GtkWidget  *share_write;
+  GtkWidget  *share_guest;
 
-static void editor_destroy_cb  (GtkWidget    *widget,
-                                TspAdminEdit *editor);
+  /* Current share name */
+  gchar      *old_name;
 
-static void editor_set_values  (const gchar  *path,
-                                TspAdminEdit *editor);
+  gpointer    admin;
+};
 
+THUNARX_DEFINE_TYPE (TspAdminEditor, tsp_admin_editor, GTK_TYPE_DIALOG);
+
 static void
-editor_response_cb (GtkWidget    *widget,
-                    gint          response,
-                    TspAdminEdit *editor)
+tsp_admin_editor_class_init (TspAdminEditorClass *klass)
 {
-	if (response == GTK_RESPONSE_OK)
-	{
-		/* Save changes */
-		const gchar *comments;
-		const gchar *name;
-		ShareInfo   *share_info;
-		gchar       *local_file;
-		gboolean     is_writable;
-		gboolean     guests_ok;
+  GtkDialogClass *gtkdialog_class;
+  GObjectClass   *gobject_class;
 
-		/* Share file */
-		local_file = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (editor->share_folder));
-		comments = gtk_entry_get_text (GTK_ENTRY (editor->share_comments));
-		name = gtk_entry_get_text (GTK_ENTRY (editor->share_name));
-		is_writable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->share_write));
-		guests_ok = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->share_guest));
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = tsp_admin_editor_finalize;
 
-		share_info = tsp_shares_share (local_file, name, comments,
-		 							   is_writable, guests_ok, editor->old_name);
-		if (share_info)
-		{
-			shares_free_share_info (share_info);
-		} else {
-			/* Dunno destroy the dialog */
-			return;
-		}
+  gtkdialog_class = GTK_DIALOG_CLASS (klass);
+  gtkdialog_class->response = tsp_admin_editor_response;
+}
 
-		/* Reload share list */
-		tsp_admin_load_shares (editor->admin);
+static void
+tsp_admin_editor_init (TspAdminEditor *editor)
+{
+  GtkWidget *vbox;
+  GtkWidget *table;
+  GtkWidget *widget;
 
-		g_free (local_file);
-	}
-	gtk_widget_destroy (widget);
+  vbox = GTK_WIDGET (GTK_DIALOG (editor)->vbox);
+
+  /* Dialog setup */
+  gtk_window_set_title (GTK_WINDOW (editor), _("Thunar - Add a share"));
+  gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (editor), TRUE);
+  gtk_window_set_modal (GTK_WINDOW (editor), TRUE);
+  gtk_window_set_position (GTK_WINDOW (editor), GTK_WIN_POS_CENTER_ON_PARENT);
+  gtk_window_set_type_hint (GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_DIALOG);
+
+  /* Dialog responses and buttons */
+  gtk_dialog_add_button (GTK_DIALOG (editor), GTK_STOCK_OK, GTK_RESPONSE_OK);
+  gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_CLOSE);
+
+  /* Main container */
+  table = gtk_table_new (5, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+  gtk_box_pack_start (GTK_BOX(vbox), table, TRUE, TRUE, 0);
+
+  /* Folder chooser */
+  editor->share_folder_label = gtk_label_new (_("Folder:"));
+  gtk_misc_set_padding (GTK_MISC (editor->share_folder_label), 3, 0);
+  gtk_misc_set_alignment (GTK_MISC (editor->share_folder_label), 0.0, 0.50);
+  gtk_table_attach (GTK_TABLE (table), editor->share_folder_label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  editor->share_folder = gtk_file_chooser_button_new (NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+  gtk_table_attach (GTK_TABLE (table), editor->share_folder, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  /* Name */
+  widget = gtk_label_new (_("Share name:"));
+  gtk_misc_set_padding (GTK_MISC (widget), 3, 0);
+  gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.50);
+  gtk_table_attach (GTK_TABLE (table), widget, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  editor->share_name = gtk_entry_new ();
+  gtk_table_attach (GTK_TABLE (table), editor->share_name, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  /* Write access */
+  editor->share_write = gtk_check_button_new_with_label (_("Allow others users to write in this folder"));
+  gtk_table_attach (GTK_TABLE (table), editor->share_write, 0, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  /* Guests access */
+  editor->share_guest = gtk_check_button_new_with_label (_("Allow Guest access"));
+  gtk_table_attach (GTK_TABLE (table), editor->share_guest, 0, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  /* Comments */
+  widget = gtk_label_new (_("Comments:"));
+  gtk_misc_set_padding (GTK_MISC (widget), 3, 0);
+  gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.50);
+  gtk_table_attach (GTK_TABLE (table), widget, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  editor->share_comments = gtk_entry_new ();
+  gtk_table_attach (GTK_TABLE (table), editor->share_comments, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 5);
+
+  /* Show all */
+  gtk_widget_show_all (table);
 }
 
 static void
-editor_destroy_cb (GtkWidget    *widget,
-                   TspAdminEdit *editor)
+tsp_admin_editor_finalize (GObject *object)
 {
-	if (editor->old_name != NULL)
-		g_free (editor->old_name);
+  TspAdminEditor *editor = TSP_ADMIN_EDITOR (object);
 
-	g_free (editor);
+  /* Cleanup... */
+  if (editor->old_name != NULL)
+    g_free (editor->old_name);
+
+  (*G_OBJECT_CLASS (tsp_admin_editor_parent_class)->finalize) (object);
 }
 
-/* Displays the main admin dialog */
-void
-tsp_admin_editor_dialog_show (GtkWindow   *parent,
-                              const gchar *path,
-                              gpointer     admin)
+static void
+tsp_admin_editor_response (GtkDialog *dialog,
+                           gint       response)
 {
-	static TspAdminEdit *editor;
-	GtkBuilder          *ui;
+  if (response == GTK_RESPONSE_CLOSE){
 
-	if (editor)
-	{
-		/* Update values */
-		editor_set_values (path, editor);
+    gtk_widget_destroy (GTK_WIDGET (dialog));
 
-		/* Bring the dialog to front */
-		gtk_window_present (GTK_WINDOW (editor->dialog));
-		return;
-	}
+  } else if (response == GTK_RESPONSE_OK){
 
-	editor = g_new0 (TspAdminEdit, 1);
-	editor->admin = admin;
+    if (tsp_admin_editor_save_changes (TSP_ADMIN_EDITOR (dialog))){
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+    }
 
-	/* Get widgets */
-	ui = tsp_xml_get_file (XML_FILE,
-						"shares_editor", &editor->dialog,
-						 "share_folder", &editor->share_folder,
-						 "share_name", &editor->share_name,
-						 "share_comments", &editor->share_comments,
-						 "share_write", &editor->share_write,
-						 "share_guest", &editor->share_guest,
-						 "share_hbox1", &editor->share_hbox1,
-						 "share_label1", &editor->share_label1,
-						  NULL);
+  } else if (GTK_DIALOG_CLASS (tsp_admin_editor_parent_class)->response != NULL){
 
-	/* Connect signals */
-	tsp_xml_connect (ui, editor,
-						"shares_editor", "destroy", editor_destroy_cb,
-						"shares_editor", "response", editor_response_cb,
-						NULL);
+    (*GTK_DIALOG_CLASS (tsp_admin_editor_parent_class)->response) (dialog, response);
 
-	g_object_unref (ui);
+  }
+}
 
-	g_object_add_weak_pointer (G_OBJECT (editor->dialog), (gpointer) &editor);
+static gboolean
+tsp_admin_editor_save_changes (TspAdminEditor *editor)
+{
+  const gchar *comments;
+  const gchar *name;
+  ShareInfo   *share_info;
+  gchar       *local_file;
+  gboolean     is_writable;
+  gboolean     guests_ok;
 
-	/* Update values */
-	editor_set_values (path, editor);
+  local_file = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (editor->share_folder));
+  comments = gtk_entry_get_text (GTK_ENTRY (editor->share_comments));
+  name = gtk_entry_get_text (GTK_ENTRY (editor->share_name));
+  is_writable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->share_write));
+  guests_ok = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (editor->share_guest));
 
-	/* Show the dialog */
-	gtk_window_set_transient_for (GTK_WINDOW (editor->dialog), parent);
-	gtk_widget_show (editor->dialog);
+  share_info = tsp_shares_share (local_file,
+                                 name,
+                                 comments,
+                                 is_writable,
+                                 guests_ok,
+                                 editor->old_name);
+
+  g_free (local_file);
+
+  if (share_info)
+  {
+    shares_free_share_info (share_info);
+
+    /* Reload share list */
+    tsp_admin_load_shares (editor->admin);
+
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
-/* Updates the dialog to edit/add actions */
 static void
-editor_set_values (const gchar  *path,
-                   TspAdminEdit *editor)
+tsp_admin_editor_set_path (TspAdminEditor *editor,
+                           const char     *path)
 {
-	if (G_STR_EMPTY (path)){
-		const gchar *home_dir;
+  ShareInfo *share_info;
+  gboolean   result;
 
-		gtk_window_set_title (GTK_WINDOW (editor->dialog), _("Thunar - Add a share"));
+  /* Dialog changes */
+  gtk_widget_hide (editor->share_folder);
+  gtk_widget_hide (editor->share_folder_label);
+  gtk_window_set_title (GTK_WINDOW (editor), _("Thunar - Edit share"));
 
-		home_dir = g_get_home_dir ();
+  /* Load share info */
+  result = shares_get_share_info_for_path (path, &share_info, NULL);
+  if (share_info)
+  {
+    editor->old_name = g_strdup (share_info->share_name);
 
-		if (editor->old_name != NULL)
-			g_free (editor->old_name);
+    gtk_file_chooser_set_current_folder (
+                   GTK_FILE_CHOOSER (editor->share_folder), path);
+    gtk_toggle_button_set_active (
+                   GTK_TOGGLE_BUTTON (editor->share_write), share_info->is_writable);
+    gtk_toggle_button_set_active (
+                   GTK_TOGGLE_BUTTON (editor->share_guest), share_info->guest_ok);
+    gtk_entry_set_text (
+                   GTK_ENTRY (editor->share_name), share_info->share_name);
+    gtk_entry_set_text (
+                   GTK_ENTRY (editor->share_comments), share_info->comment);
 
-		/* Show folders chooser */
-		gtk_widget_show (editor->share_hbox1);
-		gtk_widget_show (editor->share_label1);
+    shares_free_share_info (share_info);
+  }
+}
 
-		/* Reset values */
-		gtk_file_chooser_set_current_folder (
-					GTK_FILE_CHOOSER (editor->share_folder), home_dir);
-		gtk_toggle_button_set_active (
-					GTK_TOGGLE_BUTTON (editor->share_write), FALSE);
-		gtk_toggle_button_set_active (
-					GTK_TOGGLE_BUTTON (editor->share_guest), FALSE);
-		gtk_entry_set_text (
-					GTK_ENTRY (editor->share_name), "");
-		gtk_entry_set_text (
-					GTK_ENTRY (editor->share_comments), "");
+GtkWidget *
+tsp_admin_editor_new (GtkWindow *parent,
+                      gpointer   data)
+{
+  GtkWidget *dialog;
 
-	} else {
-		/* Load values */
-		ShareInfo *share_info;
-		gboolean   result;
+  dialog = g_object_new (TSP_ADMIN_TYPE_EDITOR, NULL);
 
-		gtk_window_set_title (GTK_WINDOW (editor->dialog), _("Thunar - Edit share"));
+  if (parent != NULL)
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
 
-		/* Hide folders chooser */
-		gtk_widget_hide (editor->share_hbox1);
-		gtk_widget_hide (editor->share_label1);
+  if (data != NULL)
+    TSP_ADMIN_EDITOR(dialog)->admin = data;
 
-		result = shares_get_share_info_for_path (path, &share_info, NULL);
-		if (share_info)
-		{
-			editor->old_name = g_strdup (share_info->share_name);
+  return dialog;
+}
 
-			gtk_file_chooser_set_current_folder (
-					GTK_FILE_CHOOSER (editor->share_folder), path);
-			gtk_toggle_button_set_active (
-					GTK_TOGGLE_BUTTON (editor->share_write), share_info->is_writable);
-			gtk_toggle_button_set_active (
-					GTK_TOGGLE_BUTTON (editor->share_guest), share_info->guest_ok);
-			gtk_entry_set_text (
-					GTK_ENTRY (editor->share_name), share_info->share_name);
-			gtk_entry_set_text (
-					GTK_ENTRY (editor->share_comments), share_info->comment);
+GtkWidget *
+tsp_admin_editor_new_with_path (GtkWindow  *parent,
+                                gpointer    data,
+                                const char *path)
+{
+  GtkWidget *dialog = tsp_admin_editor_new (parent, data);
 
-			shares_free_share_info (share_info);
-		}
-	}
+  if (path != NULL)
+    tsp_admin_editor_set_path (TSP_ADMIN_EDITOR (dialog), path);
+
+  return dialog;
 }

Modified: thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.h
===================================================================
--- thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.h	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/thunar-plugin/tsp-admin-editor.h	2008-08-13 16:52:42 UTC (rev 5225)
@@ -22,14 +22,27 @@
 #ifndef __TSP_ADMIN_EDITOR_H__
 #define __TSP_ADMIN_EDITOR_H__
 
-#include <gtk/gtkwindow.h>
+#include <thunarx/thunarx.h>
 
 G_BEGIN_DECLS;
 
-void tsp_admin_editor_dialog_show (GtkWindow   *parent,
-                                   const gchar *path,
-                                   gpointer     admin);
+typedef struct _TspAdminEditorClass       TspAdminEditorClass;
+typedef struct _TspAdminEditor            TspAdminEditor;
 
+#define TSP_ADMIN_TYPE_EDITOR             (tsp_admin_editor_get_type ())
+#define TSP_ADMIN_EDITOR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TSP_ADMIN_TYPE_EDITOR, TspAdminEditor))
+#define TSP_ADMIN_EDITOR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TSP_ADMIN_TYPE_EDITOR, TspAdminEditorClass))
+#define TSP_ADMIN_IS_EDITOR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TSP_ADMIN_TYPE_EDITOR))
+#define TSP_ADMIN_IS_EDITOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), TSP_ADMIN_TYPE_EDITOR))
+#define TSP_ADMIN_EDITOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), TSP_ADMIN_TYPE_EDITOR, TspAdminEditorClass))
+
+GType   tsp_admin_editor_get_type         (void) G_GNUC_CONST G_GNUC_INTERNAL;
+void    tsp_admin_editor_register_type    (ThunarxProviderPlugin *plugin) G_GNUC_INTERNAL;
+
+GtkWidget *tsp_admin_editor_new           (GtkWindow *parent, gpointer data);
+
+GtkWidget *tsp_admin_editor_new_with_path (GtkWindow  *parent, gpointer data, const char *path);
+
 G_END_DECLS;
 
-#endif /* __TSP_ADMIN_EDITOR_H__ */
+#endif /* !__TSP_ADMIN_EDITOR_H__ */

Modified: thunar-shares-plugin/trunk/thunar-plugin/tsp-admin.c
===================================================================
--- thunar-shares-plugin/trunk/thunar-plugin/tsp-admin.c	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/thunar-plugin/tsp-admin.c	2008-08-13 16:52:42 UTC (rev 5225)
@@ -94,7 +94,11 @@
 admin_add_cb (GtkButton *button,
               TspAdmin  *admin)
 {
-	tsp_admin_editor_dialog_show (GTK_WINDOW (admin->dialog), NULL, admin);
+	GtkWidget *dialog;
+	
+	dialog = tsp_admin_editor_new (GTK_WINDOW (admin->dialog), admin);
+
+	gtk_widget_show (dialog);
 }
 
 /* Editing a shared folder */
@@ -103,18 +107,20 @@
                TspAdmin  *admin)
 {
 	GtkTreeSelection *selection;
+	GtkWidget        *dialog;
 	GtkTreeModel     *model;
 	GtkTreeIter       iter;
 	gchar            *path;
-
+	
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (admin->share_list));
 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
 	{
 		gtk_tree_model_get (model, &iter, TSP_ADMIN_COL_PATH, &path, -1);
 
-		/* Run the editor dialog */
-		tsp_admin_editor_dialog_show (GTK_WINDOW (admin->dialog), path, admin);
+		dialog = tsp_admin_editor_new_with_path (GTK_WINDOW (admin->dialog), admin, path);
 
+		gtk_widget_show (dialog);
+
 		g_free (path);
 	}
 }

Modified: thunar-shares-plugin/trunk/thunar-plugin/tsp-page.c
===================================================================
--- thunar-shares-plugin/trunk/thunar-plugin/tsp-page.c	2008-08-13 07:48:49 UTC (rev 5224)
+++ thunar-shares-plugin/trunk/thunar-plugin/tsp-page.c	2008-08-13 16:52:42 UTC (rev 5225)
@@ -26,13 +26,10 @@
 #include <thunar-vfs/thunar-vfs.h>
 
 #include <libshares/shares.h>
-#include <libshares/libshares-xml.h>
 #include <libshares/libshares-util.h>
 
 #include "tsp-page.h"
 
-#define XML_FILE "thunar-page.xml"
-
 /* Property identifiers */
 enum
 {




More information about the Goodies-commits mailing list