gedit r6740 - in trunk: . plugins/filebrowser

[icq svn gnome org]

Author: icq
Date: Sun Dec 28 18:25:18 2008
New Revision: 6740
URL: http://svn.gnome.org/viewvc/gedit?rev=6740&view=rev

Log:
2008-12-28  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * plugins/filebrowser/gedit-file-browser-widget.c:
        * plugins/filebrowser/gedit-file-browser-widget.h:
        * plugins/filebrowser/gedit-file-browser-plugin.c:
        * plugins/filebrowser/Makefile.am:
        Use data-dir property.  



Modified:
   trunk/ChangeLog
   trunk/plugins/filebrowser/Makefile.am
   trunk/plugins/filebrowser/gedit-file-browser-plugin.c
   trunk/plugins/filebrowser/gedit-file-browser-widget.c
   trunk/plugins/filebrowser/gedit-file-browser-widget.h

Modified: trunk/plugins/filebrowser/Makefile.am
==============================================================================
--- trunk/plugins/filebrowser/Makefile.am	(original)
+++ trunk/plugins/filebrowser/Makefile.am	Sun Dec 28 18:25:18 2008
@@ -7,8 +7,7 @@
 	$(GEDIT_CFLAGS) 						\
 	$(WARN_CFLAGS)							\
 	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
-	-DGEDIT_UIDIR=\""$(datadir)/gedit-2/plugins/filebrowser/"\"
+	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 
 
 BUILT_SOURCES = \
 	gedit-file-browser-enum-types.h		\

Modified: trunk/plugins/filebrowser/gedit-file-browser-plugin.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-plugin.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-plugin.c	Sun Dec 28 18:25:18 2008
@@ -687,11 +687,15 @@
 	GtkWidget * image;
 	GdkPixbuf * pixbuf;
 	GeditFileBrowserStore * store;
+	gchar *data_dir;
 
 	data = g_new (GeditFileBrowserPluginData, 1);
 	data->auto_root = FALSE;
 	data->end_loading_handle = 0;
-	data->tree_widget = GEDIT_FILE_BROWSER_WIDGET (gedit_file_browser_widget_new ());
+	
+	data_dir = gedit_plugin_get_data_dir (plugin);
+	data->tree_widget = GEDIT_FILE_BROWSER_WIDGET (gedit_file_browser_widget_new (data_dir));
+	g_free (data_dir);
 
 	g_signal_connect (data->tree_widget,
 			  "uri-activated",

Modified: trunk/plugins/filebrowser/gedit-file-browser-widget.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-widget.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-widget.c	Sun Dec 28 18:25:18 2008
@@ -45,7 +45,7 @@
 						      GEDIT_TYPE_FILE_BROWSER_WIDGET, \
 						      GeditFileBrowserWidgetPrivate))
 
-#define XML_UI_FILE GEDIT_UIDIR "gedit-file-browser-widget-ui.xml"
+#define XML_UI_FILE "gedit-file-browser-widget-ui.xml"
 #define LOCATION_DATA_KEY "gedit-file-browser-widget-location"
 
 enum 
@@ -828,7 +828,8 @@
 };
 
 static void
-create_toolbar (GeditFileBrowserWidget * obj)
+create_toolbar (GeditFileBrowserWidget * obj,
+		const gchar *data_dir)
 {
 	GtkUIManager *manager;
 	GError *error = NULL;
@@ -836,11 +837,15 @@
 	GtkWidget *toolbar;
 	GtkWidget *widget;
 	GtkAction *action;
+	gchar *ui_file;
 
 	manager = gtk_ui_manager_new ();
 	obj->priv->manager = manager;
 
-	gtk_ui_manager_add_ui_from_file (manager, XML_UI_FILE, &error);
+	ui_file = g_build_filename (data_dir, XML_UI_FILE, NULL);
+	gtk_ui_manager_add_ui_from_file (manager, ui_file, &error);
+
+	g_free (ui_file);
 
 	if (error != NULL) {
 		g_warning ("Error in adding ui from file %s: %s",
@@ -962,6 +967,8 @@
 
 	gtk_box_pack_start (GTK_BOX (obj), toolbar, FALSE, FALSE, 0);
 	gtk_widget_show (toolbar);
+	
+	set_enable_delete (obj, obj->priv->enable_delete);
 }
 
 static void 
@@ -971,6 +978,9 @@
 	GtkAction *action;
 	obj->priv->enable_delete = enable;
 	
+	if (obj->priv->action_group_selection == NULL)
+		return;
+	
 	action =
 	    gtk_action_group_get_action (obj->priv->action_group_selection,
 					 "FileDelete");
@@ -1156,14 +1166,7 @@
 			                                   g_object_unref,
 			                                   free_name_icon);
 
-	create_toolbar (obj);
-	create_combo (obj);
-	create_tree (obj);
-	create_filter (obj);
-
 	gtk_box_set_spacing (GTK_BOX (obj), 3);
-
-	gedit_file_browser_widget_show_bookmarks (obj);
 }
 
 /* Private */
@@ -1670,11 +1673,18 @@
 /* Public */
 
 GtkWidget *
-gedit_file_browser_widget_new ()
+gedit_file_browser_widget_new (const gchar *data_dir)
 {
 	GeditFileBrowserWidget *obj =
 	    g_object_new (GEDIT_TYPE_FILE_BROWSER_WIDGET, NULL);
 
+	create_toolbar (obj, data_dir);
+	create_combo (obj);
+	create_tree (obj);
+	create_filter (obj);
+
+	gedit_file_browser_widget_show_bookmarks (obj);
+
 	return GTK_WIDGET (obj);
 }
 

Modified: trunk/plugins/filebrowser/gedit-file-browser-widget.h
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-widget.h	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-widget.h	Sun Dec 28 18:25:18 2008
@@ -73,7 +73,7 @@
 GType gedit_file_browser_widget_get_type            (void) G_GNUC_CONST;
 GType gedit_file_browser_widget_register_type       (GTypeModule * module);
 
-GtkWidget *gedit_file_browser_widget_new            (void);
+GtkWidget *gedit_file_browser_widget_new            (const gchar *data_dir);
 
 void gedit_file_browser_widget_show_bookmarks       (GeditFileBrowserWidget * obj);
 void gedit_file_browser_widget_set_root             (GeditFileBrowserWidget * obj,