Commit c98ef5ff authored by Naba Kumar's avatar Naba Kumar

Renamed glade files to anjuta-editor-* to give name space for the schema

	* plugins/editor/Makefile.am:
	* plugins/editor/editor.glade:
	* plugins/editor/plugin.c:
	* plugins/editor/style-editor.c:
	* plugins/sourceview/Makefile.am:
	* plugins/sourceview/plugin.c:
	* plugins/sourceview/sourceview.glade:
	* plugins/valgrind/Makefile.am:

	Renamed glade files to anjuta-editor-* to give name space for the
	schema files (because they are installed in system directory).

	* scripts/build-schemas.mk: Install the schemas files also (need for
	binary package installation/uninstallation).

svn path=/trunk/; revision=3391
parent 4126931f
2007-12-25 Naba Kumar <naba@gnome.org>
* plugins/editor/Makefile.am:
* plugins/editor/editor.glade:
* plugins/editor/plugin.c:
* plugins/editor/style-editor.c:
* plugins/sourceview/Makefile.am:
* plugins/sourceview/plugin.c:
* plugins/sourceview/sourceview.glade:
* plugins/valgrind/Makefile.am:
Renamed glade files to anjuta-editor-* to give name space for the
schema files (because they are installed in system directory).
* scripts/build-schemas.mk: Install the schemas files also (need for
binary package installation/uninstallation).
2007-12-25 Johannes Schmid <jhs@gnome.org>
* plugins/language-support-cpp-java/plugin.c:
......
......@@ -5,7 +5,7 @@ if HAVE_PLUGIN_SCINTILLA
# Plugin glade file
editor_gladedir = $(anjuta_glade_dir)
editor_glade_DATA = editor.glade
editor_glade_DATA = anjuta-editor-scintilla.glade
# Plugin Icon file
editor_pixmapsdir = $(anjuta_image_dir)
......@@ -76,7 +76,7 @@ libanjuta_editor_la_SOURCES= \
endif
prefs_glade_files = editor.glade
prefs_glade_files = anjuta-editor-scintilla.glade
include $(top_srcdir)/scripts/build-schemas.mk
libanjuta_editor_la_DEPENDENCIES = \
......
......@@ -37,7 +37,7 @@
#include "style-editor.h"
#include "text_editor.h"
#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/editor.glade"
#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.glade"
#define ICON_FILE "anjuta-editor-scintilla-plugin-48.png"
gpointer parent_class;
......
......@@ -31,7 +31,7 @@
#include "style-editor.h"
#define string_assign(dest, src) g_free ((*dest)); (*dest) = g_strdup ((src));
#define GLADE_FILE PACKAGE_DATA_DIR"/glade/editor.glade"
#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.glade"
gchar *hilite_style[] = {
"Normal <Default>", "style.*.32",
......
......@@ -2,7 +2,7 @@ if HAVE_PLUGIN_SOURCEVIEW
# Plugin glade file
sourceview_gladedir = $(anjuta_glade_dir)
sourceview_glade_DATA = sourceview.glade
sourceview_glade_DATA = anjuta-editor-sourceview.glade
# Plugin Icon file
sourceview_pixmapsdir = $(anjuta_image_dir)
......@@ -94,7 +94,7 @@ libanjuta_sourceview_la_LIBADD = \
$(LIBANJUTA_LIBS) \
$(top_builddir)/tagmanager/libanjuta-ctags.la
prefs_glade_files = sourceview.glade
prefs_glade_files = anjuta-editor-sourceview.glade
include $(top_srcdir)/scripts/build-schemas.mk
libanjuta_sourceview_la_DEPENDENCIES = \
......
......@@ -35,7 +35,7 @@
#include "plugin.h"
#include "sourceview.h"
#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/sourceview.glade"
#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-editor-sourceview.glade"
#define ICON_FILE "anjuta-editor-sourceview-plugin-48.png"
#define COLOR_USE_THEME_BUTTON "preferences_toggle:bool:1:0:sourceview.color.use_theme"
......
......@@ -49,7 +49,6 @@ libanjuta_valgrind_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
libanjuta_valgrind_la_LIBADD = \
$(LIBANJUTA_LIBS) \
$(PLUGIN_VALGRIND_LIBS)
# Plugin sources
libanjuta_valgrind_la_SOURCES = \
......@@ -122,7 +121,6 @@ MARSHAL_GENERATED = \
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = anjuta-valgrind.schemas
EXTRA_DIST = \
$(plugin_in_files) \
$(valgrind_plugin_DATA) \
......@@ -133,8 +131,17 @@ EXTRA_DIST = \
$(schema_DATA) \
vgmarshal.list
if GCONF_SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
uninstall-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
else
install-data-local:
uninstall-local:
endif
noinst_PROGRAMS = \
bugged-prg-test
......
# Targets for handing glade-to-GConf schema conversion for prefs keys
prefs_glade_schemas = $(prefs_glade_files:.glade=.schemas)
prefs_glade_schemasdir = @GCONF_SCHEMA_FILE_DIR@
prefs_glade_schemas_DATA = $(prefs_glade_files:.glade=.schemas)
build-schema-files:
for p in $(prefs_glade_files); do \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment