anjuta r3768 - in trunk: . plugins/build-basic-autotools plugins/sourceview plugins/subversion
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r3768 - in trunk: . plugins/build-basic-autotools plugins/sourceview plugins/subversion
- Date: Tue, 11 Mar 2008 14:09:00 +0000 (GMT)
Author: jhs
Date: Tue Mar 11 14:09:00 2008
New Revision: 3768
URL: http://svn.gnome.org/viewvc/anjuta?rev=3768&view=rev
Log:
2008-03-11 Johannes Schmid <jhs gnome org>
Patch from Rob Bradford:
* plugins/build-basic-autotools/executer.c (execute_program):
520324 â Execute command is not overridable
* plugins/sourceview/sourceview.c (on_insert_text):
Removed Debug print
2008-03-11 Johannes Schmid <jhs gnome org>
Patch from James Liggett:
* plugins/subversion/plugin.c (activate_plugin):
521691 â Crash when click \"Resolve Conflicts\" without opened project
Modified:
trunk/ChangeLog
trunk/plugins/build-basic-autotools/executer.c
trunk/plugins/sourceview/sourceview.c
trunk/plugins/subversion/plugin.c
Modified: trunk/plugins/build-basic-autotools/executer.c
==============================================================================
--- trunk/plugins/build-basic-autotools/executer.c (original)
+++ trunk/plugins/build-basic-autotools/executer.c Tue Mar 11 14:09:00 2008
@@ -393,21 +393,35 @@
IAnjutaTerminal, NULL);
if (term)
{
- gchar* prog_path = g_find_program_in_path("anjuta_launcher");
- if (prog_path != NULL)
+
+ if (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE])
{
- gchar* oldcmd = cmd;
-
- cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+ gchar *oldcmd = cmd;
+
+ cmd = g_strdup_printf (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE],
+ oldcmd);
+
g_free (oldcmd);
- g_free (prog_path);
- }
- else
- {
- DEBUG_PRINT("Missing anjuta_launcher");
- }
+ } else {
+ gchar* launcher_path = g_find_program_in_path("anjuta_launcher");
+
+ if (launcher_path != NULL)
+ {
+ gchar* oldcmd = cmd;
+
+ cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+
+ g_free (oldcmd);
+ g_free (launcher_path);
+ }
+ else
+ {
+ DEBUG_PRINT("Missing anjuta_launcher");
+ }
+ }
+
ianjuta_terminal_execute_command (term, dir, cmd, NULL);
}
else
Modified: trunk/plugins/sourceview/sourceview.c
==============================================================================
--- trunk/plugins/sourceview/sourceview.c (original)
+++ trunk/plugins/sourceview/sourceview.c Tue Mar 11 14:09:00 2008
@@ -130,7 +130,6 @@
return;
else
{
- DEBUG_PRINT ("insert_text");
int offset = gtk_text_iter_get_offset (location);
SourceviewCell* cell = sourceview_cell_new (location,
GTK_TEXT_VIEW(sv->priv->view));
Modified: trunk/plugins/subversion/plugin.c
==============================================================================
--- trunk/plugins/subversion/plugin.c (original)
+++ trunk/plugins/subversion/plugin.c Tue Mar 11 14:09:00 2008
@@ -427,6 +427,7 @@
Subversion *subversion;
GtkAction *commit_action;
GtkAction *revert_action;
+ GtkAction *resolve_action;
DEBUG_PRINT ("Subversion: Activating Subversion plugin ...");
subversion = ANJUTA_PLUGIN_SUBVERSION (plugin);
@@ -485,11 +486,16 @@
NULL),
"ActionGroupSubversion",
"ActionSubversionRevert");
+ resolve_action = anjuta_ui_get_action (anjuta_shell_get_ui (plugin->shell,
+ NULL),
+ "ActionGroupSubversion",
+ "ActionSubversionResolve");
if (!subversion->project_root_dir)
{
gtk_action_set_sensitive (commit_action, FALSE);
gtk_action_set_sensitive (revert_action, FALSE);
+ gtk_action_set_sensitive (resolve_action, FALSE);
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]