wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

end of line mistake

This commit is contained in:
Perberos 2011-11-12 04:28:06 -03:00
parent 09be0113ed
commit 8e150735c5
5 changed files with 86 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
autogen.sh
View File

@ -4,20 +4,23 @@
srcdir=`dirname $0` srcdir=`dirname $0`
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
PKG_NAME=mate-text-editor PKG_NAME="mate-text-editor"
(test -f $srcdir/configure.ac \ (test -f $srcdir/configure.ac) || {
&& test -f $srcdir/autogen.sh \
&& test -d $srcdir/pluma \
&& test -f $srcdir/pluma/pluma.c) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory" echo " top-level $PKG_NAME directory"
exit 1 exit 1
} }
which mate-autogen.sh || { which mate-autogen.sh || {
echo "You need to install mate-common from the MATE CVS" echo "You need to install mate-common from the MATE Git"
exit 1 exit 1
} }
REQUIRED_AUTOMAKE_VERSION=1.9 REQUIRED_MACROS=python.m4 MATE_DATADIR="$mate_datadir" USE_COMMON_DOC_BUILD=yes . mate-autogen.sh REQUIRED_AUTOMAKE_VERSION=1.9
REQUIRED_MACROS=python.m4
MATE_DATADIR="$mate_datadir"
USE_COMMON_DOC_BUILD=yes
. mate-autogen.sh

0
plugins/modelines/pluma-modeline-plugin.h Executable file → Normal file
View File

25
plugins/taglist/pluma-taglist-plugin-parser.c
View File

@ -525,21 +525,25 @@ free_tag_group (TagGroup *tag_group)
pluma_debug_message (DEBUG_PLUGINS, "END"); pluma_debug_message (DEBUG_PLUGINS, "END");
} }
void void free_taglist(void)
free_taglist (void)
{ {
GList* l; GList* l;
pluma_debug_message(DEBUG_PLUGINS, "ref_count: %d", taglist_ref_count); pluma_debug_message(DEBUG_PLUGINS, "ref_count: %d", taglist_ref_count);
if (taglist == NULL) if (taglist == NULL)
{
return; return;
}
g_return_if_fail(taglist_ref_count > 0); g_return_if_fail(taglist_ref_count > 0);
--taglist_ref_count; --taglist_ref_count;
if (taglist_ref_count > 0) if (taglist_ref_count > 0)
{
return; return;
}
for (l = taglist->tag_groups; l != NULL; l = g_list_next (l)) for (l = taglist->tag_groups; l != NULL; l = g_list_next (l))
{ {
@ -553,8 +557,7 @@ free_taglist (void)
pluma_debug_message (DEBUG_PLUGINS, "Really freed"); pluma_debug_message (DEBUG_PLUGINS, "Really freed");
} }
static TagList * static TagList* parse_taglist_dir(const gchar* dir)
parse_taglist_dir (const gchar *dir)
{ {
GError* error = NULL; GError* error = NULL;
GDir* d; GDir* d;
@ -563,6 +566,7 @@ parse_taglist_dir (const gchar *dir)
pluma_debug_message(DEBUG_PLUGINS, "DIR: %s", dir); pluma_debug_message(DEBUG_PLUGINS, "DIR: %s", dir);
d = g_dir_open(dir, 0, &error); d = g_dir_open(dir, 0, &error);
if (!d) if (!d)
{ {
pluma_debug_message(DEBUG_PLUGINS, "%s", error->message); pluma_debug_message(DEBUG_PLUGINS, "%s", error->message);
@ -572,8 +576,7 @@ parse_taglist_dir (const gchar *dir)
while ((dirent = g_dir_read_name(d))) while ((dirent = g_dir_read_name(d)))
{ {
if (g_str_has_suffix (dirent, ".tags") || if (g_str_has_suffix(dirent, ".tags") || g_str_has_suffix(dirent, ".tags.gz"))
g_str_has_suffix (dirent, ".tags.gz"))
{ {
gchar* tags_file = g_build_filename(dir, dirent, NULL); gchar* tags_file = g_build_filename(dir, dirent, NULL);
parse_taglist_file(tags_file); parse_taglist_file(tags_file);
@ -628,19 +631,13 @@ TagList* create_taglist (const gchar *data_dir)
} }
else if (home != NULL) else if (home != NULL)
{ {
pdir = g_build_filename (home, pdir = g_build_filename(home, ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL);
".config",
USER_PLUMA_TAGLIST_PLUGIN_LOCATION,
NULL);
parse_taglist_dir(pdir); parse_taglist_dir(pdir);
g_free (pdir); g_free (pdir);
} }
#else #else
pdir = g_build_filename (g_get_user_config_dir (), pdir = g_build_filename(g_get_user_config_dir(), "pluma", "taglist", NULL);
"pluma",
"taglist",
NULL);
parse_taglist_dir(pdir); parse_taglist_dir(pdir);
g_free(pdir); g_free(pdir);
#endif #endif

9
plugins/taglist/pluma-taglist-plugin-parser.h
View File

@ -38,20 +38,17 @@ typedef struct _TagList TagList;
typedef struct _TagGroup TagGroup; typedef struct _TagGroup TagGroup;
typedef struct _Tag Tag; typedef struct _Tag Tag;
struct _TagList struct _TagList {
{
GList* tag_groups; GList* tag_groups;
}; };
struct _TagGroup struct _TagGroup {
{
xmlChar* name; xmlChar* name;
GList* tags; GList* tags;
}; };
struct _Tag struct _Tag {
{
xmlChar* name; xmlChar* name;
xmlChar* begin; xmlChar* begin;
xmlChar* end; xmlChar* end;

2
pluma/pluma-commands-help.c
View File

@ -75,7 +75,7 @@ void _pluma_cmd_help_about(GtkAction* action, PlumaWindow* window)
"Copyright \xc2\xa9 1998-2000 Evan Lawrence, Alex Robert\n" "Copyright \xc2\xa9 1998-2000 Evan Lawrence, Alex Robert\n"
"Copyright \xc2\xa9 2000-2002 Chema Celorio, Paolo Maggi\n" "Copyright \xc2\xa9 2000-2002 Chema Celorio, Paolo Maggi\n"
"Copyright \xc2\xa9 2003-2006 Paolo Maggi\n" "Copyright \xc2\xa9 2003-2006 Paolo Maggi\n"
"Copyright \xc2\xa9 2004-2010 Paolo Borelli, Jesse van den Kieboom\nSteve Fr\303\251cinaux, Ignacio Casal Quinteiro" "Copyright \xc2\xa9 2004-2010 Paolo Borelli, Jesse van den Kieboom\nSteve Fr\303\251cinaux, Ignacio Casal Quinteiro\n"
"Copyright \xc2\xa9 2011 Perberos"; "Copyright \xc2\xa9 2011 Perberos";
static const gchar comments[] = \ static const gchar comments[] = \