gedit r6745 - in trunk: . plugins/taglist win32

[icq svn gnome org]

Author: icq
Date: Sun Dec 28 21:27:48 2008
New Revision: 6745
URL: http://svn.gnome.org/viewvc/gedit?rev=6745&view=rev

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

        * plugins/taglist/gedit-taglist-plugin-panel.h:
        * plugins/taglist/gedit-taglist-plugin-parser.c:
        * plugins/taglist/Makefile.am:
        * plugins/taglist/gedit-taglist-plugin-panel.c:
        * plugins/taglist/gedit-taglist-plugin-parser.h:
        * plugins/taglist/gedit-taglist-plugin.c:
        Use data-dir property.

        * win32/build-installer:
        * win32/gedit.iss.in:
        Remove taglist as now it is in plugins dir.



Modified:
   trunk/ChangeLog
   trunk/plugins/taglist/Makefile.am
   trunk/plugins/taglist/gedit-taglist-plugin-panel.c
   trunk/plugins/taglist/gedit-taglist-plugin-panel.h
   trunk/plugins/taglist/gedit-taglist-plugin-parser.c
   trunk/plugins/taglist/gedit-taglist-plugin-parser.h
   trunk/plugins/taglist/gedit-taglist-plugin.c
   trunk/win32/build-installer
   trunk/win32/gedit.iss.in

Modified: trunk/plugins/taglist/Makefile.am
==============================================================================
--- trunk/plugins/taglist/Makefile.am	(original)
+++ trunk/plugins/taglist/Makefile.am	Sun Dec 28 21:27:48 2008
@@ -1,7 +1,7 @@
 # Tag list plugin
 plugindir = $(libdir)/gedit-2/plugins
 
-taglistdir = $(datadir)/gedit-2/taglist
+taglistdir = $(datadir)/gedit-2/plugins/taglist
 
 taglist_in_files = \
 	HTML.tags.xml.in	\
@@ -16,9 +16,7 @@
 	$(GEDIT_CFLAGS) 					\
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" 		\
-	-DGEDIT_TAGLIST_DIR=\""$(taglistdir)/"\"
+	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 plugin_LTLIBRARIES = libtaglist.la
 

Modified: trunk/plugins/taglist/gedit-taglist-plugin-panel.c
==============================================================================
--- trunk/plugins/taglist/gedit-taglist-plugin-panel.c	(original)
+++ trunk/plugins/taglist/gedit-taglist-plugin-panel.c	Sun Dec 28 21:27:48 2008
@@ -64,6 +64,8 @@
 	GtkWidget *preview;
 
 	TagGroup *selected_tag_group;
+	
+	gchar *data_dir;
 };
 
 GEDIT_PLUGIN_DEFINE_TYPE (GeditTaglistPluginPanel, gedit_taglist_plugin_panel, GTK_TYPE_VBOX)
@@ -129,7 +131,9 @@
 static void
 gedit_taglist_plugin_panel_finalize (GObject *object)
 {
-	/* GeditTaglistPluginPanel *tab = GEDIT_TAGLIST_PLUGIN_PANEL (object); */
+	GeditTaglistPluginPanel *panel = GEDIT_TAGLIST_PLUGIN_PANEL (object);
+	
+	g_free (panel->priv->data_dir);
 
 	G_OBJECT_CLASS (gedit_taglist_plugin_panel_parent_class)->finalize (object);
 }
@@ -574,11 +578,13 @@
                  GdkEventExpose *event,
                  gpointer        user_data)
 {
+	GeditTaglistPluginPanel *ppanel = GEDIT_TAGLIST_PLUGIN_PANEL (panel);
+
 	gedit_debug (DEBUG_PLUGINS);
 
 	/* If needed load taglists from files at the first expose */
 	if (taglist == NULL)
-		create_taglist ();
+		create_taglist (ppanel->priv->data_dir);
 
 	/* And populate combo box */
 	populate_tag_groups_combo (GEDIT_TAGLIST_PLUGIN_PANEL (panel));
@@ -654,6 +660,7 @@
 	gedit_debug (DEBUG_PLUGINS);
 
 	panel->priv = GEDIT_TAGLIST_PLUGIN_PANEL_GET_PRIVATE (panel);
+	panel->priv->data_dir = NULL;
 
 	/* Build the window content */
 	panel->priv->tag_groups_combo = gtk_combo_box_new_text ();
@@ -752,11 +759,18 @@
 }
 
 GtkWidget *
-gedit_taglist_plugin_panel_new (GeditWindow *window)
+gedit_taglist_plugin_panel_new (GeditWindow *window,
+				const gchar *data_dir)
 {
+	GeditTaglistPluginPanel *panel;
+
 	g_return_val_if_fail (GEDIT_IS_WINDOW (window), NULL);
 
-	return GTK_WIDGET (g_object_new (GEDIT_TYPE_TAGLIST_PLUGIN_PANEL,
-					 "window", window,
-					 NULL));
+	panel = g_object_new (GEDIT_TYPE_TAGLIST_PLUGIN_PANEL,
+			      "window", window,
+			      NULL);
+	
+	panel->priv->data_dir = g_strdup (data_dir);
+	
+	return GTK_WIDGET (panel);
 }

Modified: trunk/plugins/taglist/gedit-taglist-plugin-panel.h
==============================================================================
--- trunk/plugins/taglist/gedit-taglist-plugin-panel.h	(original)
+++ trunk/plugins/taglist/gedit-taglist-plugin-panel.h	Sun Dec 28 21:27:48 2008
@@ -81,7 +81,8 @@
 							
 GType 		 gedit_taglist_plugin_panel_get_type		(void) G_GNUC_CONST;
 
-GtkWidget	*gedit_taglist_plugin_panel_new 		(GeditWindow *window);
+GtkWidget	*gedit_taglist_plugin_panel_new 		(GeditWindow *window,
+								 const gchar *data_dir);
 
 G_END_DECLS
 

Modified: trunk/plugins/taglist/gedit-taglist-plugin-parser.c
==============================================================================
--- trunk/plugins/taglist/gedit-taglist-plugin-parser.c	(original)
+++ trunk/plugins/taglist/gedit-taglist-plugin-parser.c	Sun Dec 28 21:27:48 2008
@@ -580,7 +580,7 @@
 		if (strncmp (e->d_name + strlen (e->d_name) - 5, ".tags", 5) == 0 ||
 		    strncmp (e->d_name + strlen (e->d_name) - 8, ".tags.gz", 8) == 0)
 		{
-			gchar *tags_file = g_strconcat (dir, e->d_name, NULL);
+			gchar *tags_file = g_build_filename (dir, e->d_name, NULL);
 			parse_taglist_file (tags_file);
 			g_free (tags_file);
 		}
@@ -590,7 +590,7 @@
 	return taglist;
 }
 
-TagList* create_taglist (void)
+TagList* create_taglist (const gchar *data_dir)
 {
 	const gchar *home;
 
@@ -603,6 +603,7 @@
 		return taglist;
 	}
 
+#ifndef G_OS_WIN32
 	/* load user's taglists */
 	home = g_get_home_dir ();
 	if (home != NULL)
@@ -621,9 +622,19 @@
 		parse_taglist_dir (pdir);
 		g_free (pdir);
 	}
+#else
+	gchar *pdir;
 	
-	/* load system's taglists */	
-	parse_taglist_dir (GEDIT_TAGLIST_DIR);
+	pdir = g_build_filename (g_get_user_config_dir (),
+				 "gedit",
+				 "taglist",
+				 NULL);
+	parse_taglist_dir (pdir);
+	g_free (pdir);
+#endif
+	
+	/* load system's taglists */
+	parse_taglist_dir (data_dir);
 
 	++taglist_ref_count;
 	g_return_val_if_fail (taglist_ref_count == 1, taglist);

Modified: trunk/plugins/taglist/gedit-taglist-plugin-parser.h
==============================================================================
--- trunk/plugins/taglist/gedit-taglist-plugin-parser.h	(original)
+++ trunk/plugins/taglist/gedit-taglist-plugin-parser.h	Sun Dec 28 21:27:48 2008
@@ -60,7 +60,7 @@
 /* Note that the taglist is ref counted */
 extern TagList *taglist;
 
-TagList* create_taglist (void);
+TagList* create_taglist (const gchar *data_dir);
 
 void free_taglist (void);
 

Modified: trunk/plugins/taglist/gedit-taglist-plugin.c
==============================================================================
--- trunk/plugins/taglist/gedit-taglist-plugin.c	(original)
+++ trunk/plugins/taglist/gedit-taglist-plugin.c	Sun Dec 28 21:27:48 2008
@@ -81,13 +81,17 @@
 {
 	GeditPanel *side_panel;
 	GtkWidget *taglist_panel;
+	gchar *data_dir;
 	
 	gedit_debug (DEBUG_PLUGINS);
 	
 	g_return_if_fail (g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY) == NULL);
 	
 	side_panel = gedit_window_get_side_panel (window);
-	taglist_panel = gedit_taglist_plugin_panel_new (window);
+	
+	data_dir = gedit_plugin_get_data_dir (plugin);
+	taglist_panel = gedit_taglist_plugin_panel_new (window, data_dir);
+	g_free (data_dir);
 	
 	gedit_panel_add_item_with_stock_icon (side_panel, 
 					      taglist_panel, 

Modified: trunk/win32/build-installer
==============================================================================
--- trunk/win32/build-installer	(original)
+++ trunk/win32/build-installer	Sun Dec 28 21:27:48 2008
@@ -199,10 +199,6 @@
 mkdir -p installer/share/gedit-2/logo || exit
 cp /local/share/gedit-2/logo/gedit-logo.png installer/share/gedit-2/logo || exit
 
-#Taglist
-mkdir -p installer/share/gedit-2/taglist || exit
-cp /local/share/gedit-2/taglist/* installer/share/gedit-2/taglist || exit
-
 #Plugins
 mkdir -p installer/share/gedit-2/plugins || exit
 cp -R /local/share/gedit-2/plugins/* installer/share/gedit-2/plugins || exit

Modified: trunk/win32/gedit.iss.in
==============================================================================
--- trunk/win32/gedit.iss.in	(original)
+++ trunk/win32/gedit.iss.in	Sun Dec 28 21:27:48 2008
@@ -126,7 +126,6 @@
 ; Other shared gedit files
 Source: "share\gedit-2\ui\*"; DestDir: "{app}\share\gedit-2\ui"; Components: main
 Source: "share\gedit-2\icons\gedit-plugin.png"; DestDir: "{app}\share\gedit-2\icons"; Components: main
-Source: "share\gedit-2\taglist\*"; DestDir: "{app}\share\gedit-2\taglist"; Components: main; Flags: recursesubdirs
 Source: "share\gedit-2\logo\gedit-logo.png"; Destdir: "{app}\share\gedit-2\logo\"; Components: main
 
 ; Plugins