bea5542513
Copy from GNOME:Factory/anjuta based on submit request 22550 from user dimstar OBS-URL: https://build.opensuse.org/request/show/22550 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=36
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001
|
|
From: Sébastien Granjoux <seb.sfo@free.fr>
|
|
Date: Fri, 09 Oct 2009 19:51:38 +0000
|
|
Subject: bgo#597318 - Anjuta terminal crashes X
|
|
|
|
---
|
|
diff --git a/launcher/anjuta-launcher.c b/launcher/anjuta-launcher.c
|
|
index f84ad2c..64e4b2f 100644
|
|
--- a/launcher/anjuta-launcher.c
|
|
+++ b/launcher/anjuta-launcher.c
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- anjuta_launcher.c
|
|
+ anjuta-launcher.c
|
|
Copyright (C) 2000 Kh. Naba Kumar Singh
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
@@ -49,7 +49,7 @@ main (int argc, char **argv)
|
|
|
|
if (strcmp (argv[1], "--version") == 0)
|
|
{
|
|
- printf ("anjuta_launcher version 0.1.2\n");
|
|
+ printf ("anjuta-launcher version 0.1.2\n");
|
|
exit (0);
|
|
}
|
|
if (strcmp (argv[1], "--__debug_terminal") == 0)
|
|
diff --git a/plugins/build-basic-autotools/executer.c b/plugins/build-basic-autotools/executer.c
|
|
index ec14228..45284ff 100644
|
|
--- a/plugins/build-basic-autotools/executer.c
|
|
+++ b/plugins/build-basic-autotools/executer.c
|
|
@@ -410,14 +410,14 @@ execute_program (BasicAutotoolsPlugin* plugin, const gchar *pre_select_uri)
|
|
{
|
|
gchar* oldcmd = cmd;
|
|
|
|
- cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
|
|
+ cmd = g_strconcat ("anjuta-launcher ", oldcmd, NULL);
|
|
|
|
g_free (oldcmd);
|
|
g_free (launcher_path);
|
|
}
|
|
else
|
|
{
|
|
- DEBUG_PRINT("%s", "Missing anjuta_launcher");
|
|
+ DEBUG_PRINT("%s", "Missing anjuta-launcher");
|
|
}
|
|
|
|
}
|
|
diff --git a/plugins/gdb/plugin.c b/plugins/gdb/plugin.c
|
|
index 159305b..370d9be 100644
|
|
--- a/plugins/gdb/plugin.c
|
|
+++ b/plugins/gdb/plugin.c
|
|
@@ -116,7 +116,7 @@ gdb_plugin_start_terminal (GdbPlugin* plugin)
|
|
}
|
|
|
|
/* Launch terminal */
|
|
- cmd = g_strconcat ("anjuta_launcher --__debug_terminal ", file, NULL);
|
|
+ cmd = g_strconcat ("anjuta-launcher --__debug_terminal ", file, NULL);
|
|
|
|
/* Get terminal plugin */
|
|
term = anjuta_shell_get_interface (ANJUTA_PLUGIN (plugin)->shell, IAnjutaTerminal, NULL);
|
|
diff --git a/plugins/run-program/execute.c b/plugins/run-program/execute.c
|
|
index d1db4b4..3d04501 100644
|
|
--- a/plugins/run-program/execute.c
|
|
+++ b/plugins/run-program/execute.c
|
|
@@ -243,12 +243,12 @@ execute_with_terminal (RunProgramPlugin *plugin,
|
|
|
|
if (launcher_path != NULL)
|
|
{
|
|
- new_cmd = g_strconcat ("anjuta_launcher ", cmd, NULL);
|
|
+ new_cmd = g_strconcat ("anjuta-launcher ", cmd, NULL);
|
|
g_free (launcher_path);
|
|
}
|
|
else
|
|
{
|
|
- DEBUG_PRINT("%s", "Missing anjuta_launcher");
|
|
+ DEBUG_PRINT("%s", "Missing anjuta-launcher");
|
|
new_cmd = g_strdup (cmd);
|
|
}
|
|
|
|
--
|
|
cgit v0.8.2
|
|
|