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

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

@ -31,7 +31,7 @@
/* FIXME: we should rewrite the parser to avoid using DOM */ /* FIXME: we should rewrite the parser to avoid using DOM */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <string.h> #include <string.h>
@ -47,7 +47,7 @@
#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/" #define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/"
#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/" #define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/"
TagList *taglist = NULL; TagList* taglist = NULL;
static gint taglist_ref_count = 0; static gint taglist_ref_count = 0;
static gboolean parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur); static gboolean parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur);
@ -525,25 +525,29 @@ 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))
{ {
free_tag_group ((TagGroup *) l->data); free_tag_group ((TagGroup*) l->data);
} }
g_list_free (taglist->tag_groups); g_list_free (taglist->tag_groups);
@ -553,30 +557,29 @@ 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;
const gchar *dirent; const gchar* dirent;
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);
g_error_free (error); g_error_free (error);
return taglist; return taglist;
} }
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);
g_free (tags_file); g_free (tags_file);
} }
} }
@ -586,11 +589,11 @@ parse_taglist_dir (const gchar *dir)
return taglist; return taglist;
} }
TagList* create_taglist (const gchar *data_dir) TagList* create_taglist(const gchar* data_dir)
{ {
gchar *pdir; gchar* pdir;
pluma_debug_message (DEBUG_PLUGINS, "ref_count: %d", taglist_ref_count); pluma_debug_message(DEBUG_PLUGINS, "ref_count: %d", taglist_ref_count);
if (taglist_ref_count > 0) if (taglist_ref_count > 0)
{ {
@ -599,57 +602,51 @@ TagList* create_taglist (const gchar *data_dir)
return taglist; return taglist;
} }
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
const gchar *home; const gchar* home;
const gchar *envvar; const gchar* envvar;
/* load user's taglists */ /* load user's taglists */
/* legacy dir */ /* legacy dir */
home = g_get_home_dir (); home = g_get_home_dir ();
if (home != NULL) if (home != NULL)
{ {
pdir = g_build_filename (home, pdir = g_build_filename (home,
USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY, USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY,
NULL); NULL);
parse_taglist_dir (pdir); parse_taglist_dir (pdir);
g_free (pdir); g_free (pdir);
} }
/* Support old libmate env var */ /* Support old libmate env var */
envvar = g_getenv ("MATE22_USER_DIR"); envvar = g_getenv ("MATE22_USER_DIR");
if (envvar != NULL) if (envvar != NULL)
{ {
pdir = g_build_filename (envvar, pdir = g_build_filename (envvar,
USER_PLUMA_TAGLIST_PLUGIN_LOCATION, USER_PLUMA_TAGLIST_PLUGIN_LOCATION,
NULL); NULL);
parse_taglist_dir (pdir); parse_taglist_dir (pdir);
g_free (pdir); g_free (pdir);
} }
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", parse_taglist_dir(pdir);
USER_PLUMA_TAGLIST_PLUGIN_LOCATION, g_free (pdir);
NULL); }
parse_taglist_dir (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", parse_taglist_dir(pdir);
"taglist", g_free(pdir);
NULL); #endif
parse_taglist_dir (pdir);
g_free (pdir);
#endif
/* load system's taglists */ /* load system's taglists */
parse_taglist_dir (data_dir); parse_taglist_dir(data_dir);
++taglist_ref_count; ++taglist_ref_count;
g_return_val_if_fail (taglist_ref_count == 1, taglist); g_return_val_if_fail(taglist_ref_count == 1, taglist);
return taglist; return taglist;
} }

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

@ -38,31 +38,28 @@ 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;
}; };
/* Note that the taglist is ref counted */ /* Note that the taglist is ref counted */
extern TagList *taglist; extern TagList *taglist;
TagList* create_taglist (const gchar *data_dir); TagList* create_taglist(const gchar* data_dir);
void free_taglist (void); void free_taglist(void);
#endif /* __PLUMA_TAGLIST_PLUGIN_PARSER_H__ */ #endif /* __PLUMA_TAGLIST_PLUGIN_PARSER_H__ */

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[] = \