From 3fe0d788bda97502ed8a2428fbbf9f02cfaa1aa1 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 24 Mar 2013 09:53:22 +0100
Subject: Translations. Fix for Bug #1159349 (Undefined files in
 po/POTFILES.in) by Masato HASHIMOTO." Translations. Fix for Bug #1159347
 (Non-localized strings in PS-export)." Translations. PO template update.

(bzr r12239)
---
 src/extension/internal/cairo-ps-out.cpp           | 8 ++++----
 src/extension/internal/cairo-renderer-pdf-out.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/extension')

diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 8a39f4ea9..983c9dfb5 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -319,8 +319,8 @@ CairoPsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
@@ -359,8 +359,8 @@ CairoEpsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 773109c77..63e46ad17 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -252,8 +252,8 @@ CairoRendererPdfOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
-- 
cgit v1.2.3


From 0cdd007ebf8dcfbd39c1d36ab53f43617eb692df Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 25 Mar 2013 17:42:31 +0000
Subject: Workaround usage of deprecated glib symbols in 3rd party libraries

Fixed bugs:
  - https://launchpad.net/bugs/1122774

(bzr r12243)
---
 src/extension/error-file.cpp   | 5 ++---
 src/extension/extension.cpp    | 2 +-
 src/extension/param/string.cpp | 3 ++-
 src/extension/prefdialog.h     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/extension')

diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 778295f47..5a8bede70 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -12,12 +12,11 @@
 #include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/extensions.h"
 
+#include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "preferences.h"
-#include "ui/dialog/extensions.h"
 #include "extension/extension.h"
 
 #include "error-file.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 28f556e75..f9cf70960 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -19,7 +19,6 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
@@ -30,6 +29,7 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include "inkscape.h"
 #include "extension/implementation/implementation.h"
 #include "extension.h"
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 2020fb24d..4e525ff73 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -10,11 +10,12 @@
 # include "config.h"
 #endif
 
-#include <glibmm/value.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 
+#include <glibmm/value.h>
+
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "string.h"
diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index 943273623..e1999791f 100644
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -10,8 +10,8 @@
 #ifndef INKSCAPE_EXTENSION_DIALOG_H__
 #define INKSCAPE_EXTENSION_DIALOG_H__
 
-#include <glibmm/value.h>
 #include <gtkmm/dialog.h>
+#include <glibmm/value.h>
 #include <glibmm/ustring.h>
 
 
-- 
cgit v1.2.3