Kaydet (Commit) 35c84d4c authored tarafından Frank Lanitz's avatar Frank Lanitz

Make svn error messages better readable

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1992 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst b0142532
2007-10-31 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* plugins/svndiff.c: Make svn error messages better readable.
2007-10-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2007-10-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* plugins/svndiff.c: * plugins/svndiff.c:
......
...@@ -46,10 +46,10 @@ PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), V ...@@ -46,10 +46,10 @@ PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), V
static void show_output(const gchar *std_output, const gchar *name_prefix, static void show_output(const gchar *std_output, const gchar *name_prefix,
const gchar *force_encoding) const gchar *force_encoding)
{ {
gchar *text, *detect_enc = NULL; gchar *text, *detect_enc = NULL;
gint new_idx; gint new_idx;
gchar *filename; gchar *filename;
filename = g_path_get_basename(name_prefix); filename = g_path_get_basename(name_prefix);
setptr(filename, g_strconcat(filename, ".svn.diff", NULL)); setptr(filename, g_strconcat(filename, ".svn.diff", NULL));
...@@ -107,8 +107,8 @@ static gchar *make_diff(const gchar *svn_file) ...@@ -107,8 +107,8 @@ static gchar *make_diff(const gchar *svn_file)
} }
else else
{ // SVN returns some error { // SVN returns some error
ui->set_statusbar(FALSE, dialogs->show_msgbox(1,
_("SVN exited with an error: %s."), g_strstrip(std_error)); _("SVN exited with an error: \n%s."), g_strstrip(std_error));
} }
} }
else else
...@@ -121,14 +121,14 @@ static gchar *make_diff(const gchar *svn_file) ...@@ -121,14 +121,14 @@ static gchar *make_diff(const gchar *svn_file)
return text; return text;
} }
/* Make a diff from the current directory */ /* Make a diff from the current directory */
static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata) static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata)
{ {
gint idx; gint idx;
gchar *base_name = NULL; gchar *base_name = NULL;
gchar *locale_filename = NULL; gchar *locale_filename = NULL;
gchar *text; gchar *text;
idx = documents->get_cur_idx(); idx = documents->get_cur_idx();
...@@ -151,7 +151,7 @@ static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata) ...@@ -151,7 +151,7 @@ static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata)
g_free(locale_filename); g_free(locale_filename);
} }
/* Callback if menu item for the current project was activated */ /* Callback if menu item for the current project was activated */
static void svnproject_activated(GtkMenuItem *menuitem, gpointer gdata) static void svnproject_activated(GtkMenuItem *menuitem, gpointer gdata)
{ {
...@@ -180,8 +180,8 @@ static void svnproject_activated(GtkMenuItem *menuitem, gpointer gdata) ...@@ -180,8 +180,8 @@ static void svnproject_activated(GtkMenuItem *menuitem, gpointer gdata)
/* Callback if menu item for a single file was activated */ /* Callback if menu item for a single file was activated */
static void svnfile_activated(GtkMenuItem *menuitem, gpointer gdata) static void svnfile_activated(GtkMenuItem *menuitem, gpointer gdata)
{ {
gint idx; gint idx;
gchar *locale_filename, *text; gchar *locale_filename, *text;
idx = documents->get_cur_idx(); idx = documents->get_cur_idx();
...@@ -208,8 +208,8 @@ static GtkWidget *menu_svndiff_project = NULL; ...@@ -208,8 +208,8 @@ static GtkWidget *menu_svndiff_project = NULL;
static void update_menu_items() static void update_menu_items()
{ {
document *doc; document *doc;
gboolean have_file; gboolean have_file;
doc = documents->get_current(); doc = documents->get_current();
have_file = doc && doc->file_name && g_path_is_absolute(doc->file_name); have_file = doc && doc->file_name && g_path_is_absolute(doc->file_name);
...@@ -224,9 +224,9 @@ static void update_menu_items() ...@@ -224,9 +224,9 @@ static void update_menu_items()
/* Called by Geany to initialize the plugin */ /* Called by Geany to initialize the plugin */
void init(GeanyData *data) void init(GeanyData *data)
{ {
GtkWidget *menu_svndiff = NULL; GtkWidget *menu_svndiff = NULL;
GtkWidget *menu_svndiff_menu = NULL; GtkWidget *menu_svndiff_menu = NULL;
GtkTooltips *tooltips = NULL; GtkTooltips *tooltips = NULL;
tooltips = gtk_tooltips_new(); tooltips = gtk_tooltips_new();
......
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