Author: kitone
Date: Fri Feb 5 19:16:44 2016
New Revision: 960
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=960&view=rev
Log:
Fix bug #23714 : include memory and build string using compose.
Modified:
trunk/ChangeLog
trunk/plugins/actions/dialoguize/dialoguize.cc
trunk/plugins/actions/documentmanagement/documentmanagement.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=960&r1=959&r2=960&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Fri Feb 5 19:16:44 2016
@@ -1,3 +1,9 @@
+2016-02-05 kitone <[email protected]>
+
+ * plugins/actions/dialoguize/dialoguize.cc:
+ * plugins/actions/documentmanagement/documentmanagement.cc:
+ Fix bug #23714 : include memory and build string using compose.
+
2016-02-05 kitone <[email protected]>
* src/subtitleview.cc:
Modified: trunk/plugins/actions/dialoguize/dialoguize.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/dialoguize/dialoguize.cc?rev=960&r1=959&r2=960&view=diff
==============================================================================
--- trunk/plugins/actions/dialoguize/dialoguize.cc (original)
+++ trunk/plugins/actions/dialoguize/dialoguize.cc Fri Feb 5 19:16:44 2016
@@ -23,7 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <auto_ptr.h>
+#include <memory.h>
#include "extension/action.h"
#include "i18n.h"
#include "debug.h"
Modified: trunk/plugins/actions/documentmanagement/documentmanagement.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/documentmanagement/documentmanagement.cc?rev=960&r1=959&r2=960&view=diff
==============================================================================
--- trunk/plugins/actions/documentmanagement/documentmanagement.cc
(original)
+++ trunk/plugins/actions/documentmanagement/documentmanagement.cc Fri Feb
5 19:16:44 2016
@@ -178,9 +178,9 @@
ui_id = ui->new_merge_id();
- #define ADD_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/"name, name, name);
- #define ADD_OPEN_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-open/"name, name, name);
- #define ADD_SAVE_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-save/"name, name, name);
+ #define ADD_UI(name) ui->add_ui(ui_id,
Glib::ustring::compose("%1/%2","/menubar/menu-file", name), name, name);
+ #define ADD_OPEN_UI(name) ui->add_ui(ui_id,
Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-open", name), name,
name);
+ #define ADD_SAVE_UI(name) ui->add_ui(ui_id,
Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-save", name), name,
name);
ADD_UI("new-document");
ADD_OPEN_UI("open-document");
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
