gedit-plugins r425 - in trunk: . plugins/bookmarks plugins/charmap plugins/drawspaces plugins/sessionsaver plugins/showtabbar

[jessevdk svn gnome org]

Author: jessevdk
Date: Sat Jan  3 14:08:07 2009
New Revision: 425
URL: http://svn.gnome.org/viewvc/gedit-plugins?rev=425&view=rev

Log:
	* plugins/sessionsaver/Makefile.am:
	* plugins/sessionsaver/dialogs.py:
	* plugins/bookmarks/Makefile.am:
	* plugins/charmap/Makefile.am:
	* plugins/drawspaces/gedit-drawspaces-plugin.c:
	* plugins/drawspaces/Makefile.am:
	* plugins/showtabbar/Makefile.am:

	Makefile cleanup and use get_data_dir() where applicable (also install
	data in correct data directory now)


Modified:
   trunk/ChangeLog
   trunk/plugins/bookmarks/Makefile.am
   trunk/plugins/charmap/Makefile.am
   trunk/plugins/drawspaces/Makefile.am
   trunk/plugins/drawspaces/gedit-drawspaces-plugin.c
   trunk/plugins/sessionsaver/Makefile.am
   trunk/plugins/sessionsaver/dialogs.py
   trunk/plugins/showtabbar/Makefile.am

Modified: trunk/plugins/bookmarks/Makefile.am
==============================================================================
--- trunk/plugins/bookmarks/Makefile.am	(original)
+++ trunk/plugins/bookmarks/Makefile.am	Sat Jan  3 14:08:07 2009
@@ -5,7 +5,6 @@
 INCLUDES = \
 	-I$(top_srcdir) 				\
 	$(GEDIT_CFLAGS) 				\
-	$(GUCHARMAP_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)
 

Modified: trunk/plugins/charmap/Makefile.am
==============================================================================
--- trunk/plugins/charmap/Makefile.am	(original)
+++ trunk/plugins/charmap/Makefile.am	Sat Jan  3 14:08:07 2009
@@ -6,8 +6,7 @@
 	$(GEDIT_CFLAGS) 				\
 	$(GUCHARMAP_CFLAGS)				\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	-DGEDIT_LOCALEDIR=\""$(datadir)/locale"\"
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 plugin_LTLIBRARIES = libcharmap.la
 

Modified: trunk/plugins/drawspaces/Makefile.am
==============================================================================
--- trunk/plugins/drawspaces/Makefile.am	(original)
+++ trunk/plugins/drawspaces/Makefile.am	Sat Jan  3 14:08:07 2009
@@ -5,9 +5,7 @@
 	-I$(top_srcdir) 				\
 	$(GEDIT_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	-DGEDIT_UIDIR=\""$(datadir)/gedit-2/plugins/drawspaces"\" \
-	-DGEDIT_LOCALEDIR=\""$(datadir)/locale"\"
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 plugin_LTLIBRARIES = libdrawspaces.la
 
@@ -18,7 +16,7 @@
 libdrawspaces_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libdrawspaces_la_LIBADD = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/drawspaces
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/drawspaces
 ui_DATA = drawspaces.ui
 
 # Plugin Info

Modified: trunk/plugins/drawspaces/gedit-drawspaces-plugin.c
==============================================================================
--- trunk/plugins/drawspaces/gedit-drawspaces-plugin.c	(original)
+++ trunk/plugins/drawspaces/gedit-drawspaces-plugin.c	Sat Jan  3 14:08:07 2009
@@ -38,7 +38,7 @@
 #define GCONF_KEY_DRAW_NEWLINE GCONF_KEY_BASE "/draw_newline"
 #define GCONF_KEY_DRAW_NBSP    GCONF_KEY_BASE "/draw_nbsp"
 
-#define UI_FILE GEDIT_UIDIR "/drawspaces.ui"
+#define UI_FILE "drawspaces.ui"
 
 #define WINDOW_DATA_KEY "GeditDrawspacesPluginWindowData"
 
@@ -492,6 +492,9 @@
 	DrawspacesConfigureDialog *dialog = NULL;
 	gboolean ret;
 	GtkWidget *error_widget;
+	gchar *datadir;
+	gchar *filename;
+	
 	gchar *root_objects [] = {
 		"config-dialog",
 		NULL
@@ -499,7 +502,10 @@
 
 	dialog = g_slice_new (DrawspacesConfigureDialog);
 
-	ret = gedit_utils_get_ui_objects (UI_FILE,
+	datadir = gedit_plugin_get_data_dir (GEDIT_PLUGIN (plugin));
+	filename = g_build_filename (datadir, UI_FILE, NULL);
+
+	ret = gedit_utils_get_ui_objects (filename,
 					  root_objects,
 					  &error_widget,
 					  "config-dialog", &dialog->dialog,
@@ -509,6 +515,9 @@
 					  "draw-nbsp", &dialog->draw_nbsp,
 					  NULL);
 
+	g_free (datadir);
+	g_free (filename);
+
 	if(!ret)
 	{
 		GtkWidget *dialog_error;

Modified: trunk/plugins/sessionsaver/Makefile.am
==============================================================================
--- trunk/plugins/sessionsaver/Makefile.am	(original)
+++ trunk/plugins/sessionsaver/Makefile.am	Sat Jan  3 14:08:07 2009
@@ -6,11 +6,13 @@
 
 sessionsaverdir=$(plugindir)/sessionsaver
 sessionsaver_PYTHON = __init__.py store.py dialogs.py
-sessionsaver_DATA = sessionsaver.ui
+
+uidir=$(GEDIT_PLUGINS_DATA_DIR)/sessionsaver
+ui_DATA = sessionsaver.ui
 
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
-EXTRA_DIST = $(plugin_in_files) $(sessionsaver_DATA)
+EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)

Modified: trunk/plugins/sessionsaver/dialogs.py
==============================================================================
--- trunk/plugins/sessionsaver/dialogs.py	(original)
+++ trunk/plugins/sessionsaver/dialogs.py	Sat Jan  3 14:08:07 2009
@@ -91,14 +91,14 @@
         return None
 
 class Dialog(object):
-    UI_FILE = os.path.join(os.path.dirname(__file__), "sessionsaver.ui")
+    UI_FILE = "sessionsaver.ui"
 
     def __new__(cls, *args):
         if not cls.__dict__.has_key('_instance') or cls._instance is None:
             cls._instance = object.__new__(cls, *args)
         return cls._instance
 
-    def __init__(self, main_widget, parent_window = None):
+    def __init__(self, main_widget, datadir, parent_window = None):
         super(Dialog, self).__init__()
 
         if parent_window is None:
@@ -106,7 +106,7 @@
         self.parent = parent_window
 
         self.ui = gtk.Builder()
-        self.ui.add_from_file(self.UI_FILE)
+        self.ui.add_from_file(os.path.join(datadir, self.UI_FILE))
         self.ui.set_translation_domain(domain=GETTEXT_PACKAGE)
         self.dialog = self.ui.get_object(main_widget)
         self.dialog.connect('delete-event', self.on_delete_event)
@@ -131,7 +131,7 @@
 
 class SaveSessionDialog(Dialog):
     def __init__(self, window, plugin):
-        super(SaveSessionDialog, self).__init__('save-session-dialog', window)
+        super(SaveSessionDialog, self).__init__('save-session-dialog', plugin.get_data_dir(), window)
         self.plugin = plugin
 
         model = SessionModel(plugin.sessions)
@@ -155,7 +155,7 @@
 
 class SessionManagerDialog(Dialog):
     def __init__(self, plugin):
-        super(SessionManagerDialog, self).__init__('session-manager-dialog')
+        super(SessionManagerDialog, self).__init__('session-manager-dialog', plugin.get_data_dir())
         self.plugin = plugin
 
         model = SessionModel(plugin.sessions)

Modified: trunk/plugins/showtabbar/Makefile.am
==============================================================================
--- trunk/plugins/showtabbar/Makefile.am	(original)
+++ trunk/plugins/showtabbar/Makefile.am	Sat Jan  3 14:08:07 2009
@@ -5,8 +5,7 @@
 	-I$(top_srcdir) 				\
 	$(GEDIT_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 plugin_LTLIBRARIES = libshowtabbar.la