← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gtkhtml3.14/trusty-proposed

« back to all changes in this revision

Viewing changes to components/editor/gtkhtml-color-swatch.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2010-11-02 14:34:48 UTC
  • mfrom: (1.6.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102143448-3cxzy1h4oh5v7igz
Tags: 1:3.32.0-0ubuntu1
https://launchpad.net/bugs/178959
https://launchpad.net/bugs/284060
https://launchpad.net/bugs/562633
* New upstream release 3.32.0
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
* debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
* debian/rules: append API_VER for libgtkhtml-editor chrpath as well
* debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
  file name.
* debian/*.shlibs: update shlibs files for new version with same soname, also
  rename libgtkhtml-editor to libgtkhtml-editor-3.14
* debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
* debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
* debian/rules: disable deprecation warnings so the build completes

Show diffs side-by-side

added added

removed removed

Lines of Context:
components/editor/gtkhtml-color-swatch.c
152
152
 
153
153
        priv = GTKHTML_COLOR_SWATCH_GET_PRIVATE (widget);
154
154
 
155
 
        widget->allocation = *allocation;
 
155
        gtk_widget_set_allocation (widget, allocation);
156
156
        gtk_widget_size_allocate (priv->frame, allocation);
157
157
}
158
158
 
179
179
                PROP_COLOR,
180
180
                g_param_spec_boxed (
181
181
                        "color",
182
 
                        _("Color"),
183
 
                        _("The current color"),
 
182
                        "Color",
 
183
                        "The current color",
184
184
                        GDK_TYPE_COLOR,
185
185
                        G_PARAM_READWRITE));
186
186
 
189
189
                PROP_SHADOW_TYPE,
190
190
                g_param_spec_enum (
191
191
                        "shadow-type",
192
 
                        _("Frame Shadow"),
193
 
                        _("Appearance of the frame border"),
 
192
                        "Frame Shadow",
 
193
                        "Appearance of the frame border",
194
194
                        GTK_TYPE_SHADOW_TYPE,
195
195
                        GTK_SHADOW_ETCHED_IN,
196
196
                        G_PARAM_READWRITE));