summaryrefslogtreecommitdiffstats
path: root/src/inkview.cpp
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2006-05-28 19:51:13 +0000
committermental <mental@users.sourceforge.net>2006-05-28 19:51:13 +0000
commit2d08a9d98d19a0581eeae687bb0322dc98806d40 (patch)
tree3adec19e80f170b623e41454aae370cb7c75dade /src/inkview.cpp
parentokay, that looked better in the icon preview than it did in practice; putting... (diff)
downloadinkscape-2d08a9d98d19a0581eeae687bb0322dc98806d40.tar.gz
inkscape-2d08a9d98d19a0581eeae687bb0322dc98806d40.zip
replace nr_new() with g_new(), and try to converge on using the glib allocator a little more instead of the others (aside from libgc)
(bzr r1044)
Diffstat (limited to 'src/inkview.cpp')
-rw-r--r--src/inkview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 8be261dcd..0e2179283 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,6 +35,7 @@
#include <sys/stat.h>
#include <locale.h>
+#include <glib/gmem.h>
#include <libnr/nr-macros.h>
#include <libxml/tree.h>
@@ -191,7 +192,7 @@ main (int argc, const char **argv)
ss.size = 32;
ss.length = 0;
ss.current = 0;
- ss.slides = nr_new (char *, ss.size);
+ ss.slides = g_new (char *, ss.size);
ss.current = 0;
ss.doc = NULL;
ss.view = NULL;
@@ -230,7 +231,7 @@ main (int argc, const char **argv)
if (ss.length >= ss.size) {
/* Expand */
ss.size <<= 1;
- ss.slides = nr_renew (ss.slides, char *, ss.size);
+ ss.slides = g_renew (char *, ss.slides, ss.size);
}
ss.doc = sp_document_new_from_mem ((const gchar *)gba->data,
@@ -252,7 +253,7 @@ main (int argc, const char **argv)
if (ss.length >= ss.size) {
/* Expand */
ss.size <<= 1;
- ss.slides = nr_renew (ss.slides, char *, ss.size);
+ ss.slides = g_renew (char *, ss.slides, ss.size);
}