← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/helper/unit-menu.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/helper/unit-menu.cpp
23
23
#include <gtk/gtkmenuitem.h>
24
24
#include "helper/sp-marshal.h"
25
25
#include "helper/units.h"
26
 
#include "unit-menu.h"
 
26
#include "helper/unit-menu.h"
27
27
#include "widgets/spw-utilities.h"
28
28
 
29
29
struct SPUnitSelector {
58
58
static GtkHBoxClass *unit_selector_parent_class;
59
59
static guint signals[LAST_SIGNAL] = {0};
60
60
 
61
 
GtkType
62
 
sp_unit_selector_get_type(void)
 
61
GType sp_unit_selector_get_type(void)
63
62
{
64
 
    static GtkType type = 0;
 
63
    static GType type = 0;
65
64
    if (!type) {
66
 
        static GtkTypeInfo const info = {
67
 
            "SPUnitSelector",
 
65
        GTypeInfo info = {
 
66
            sizeof(SPUnitSelectorClass),
 
67
            0, // base_init
 
68
            0, // base_finalize
 
69
            (GClassInitFunc)sp_unit_selector_class_init,
 
70
            0, // class_finalize
 
71
            0, // class_data
68
72
            sizeof(SPUnitSelector),
69
 
            sizeof(SPUnitSelectorClass),
70
 
            (GtkClassInitFunc) sp_unit_selector_class_init,
71
 
            (GtkObjectInitFunc) sp_unit_selector_init,
72
 
            NULL, NULL, NULL
 
73
            0, // n_preallocs
 
74
            (GInstanceInitFunc)sp_unit_selector_init,
 
75
            0 // value_table
73
76
        };
74
 
        type = gtk_type_unique(GTK_TYPE_HBOX, &info);
 
77
        type = g_type_register_static(GTK_TYPE_HBOX, "SPUnitSelector", &info, static_cast<GTypeFlags>(0));
75
78
    }
76
79
    return type;
77
80
}