← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/gtkhtml-embedded.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:
gtkhtml/gtkhtml-embedded.c
45
45
        LAST_SIGNAL
46
46
};
47
47
 
48
 
static guint signals [LAST_SIGNAL] = { 0 };
 
48
static guint signals[LAST_SIGNAL] = { 0 };
49
49
 
50
50
GType
51
51
gtk_html_embedded_get_type (void)
171
171
 
172
172
        parent_class = g_type_class_peek_parent (class);
173
173
 
174
 
        signals [CHANGED] =
 
174
        signals[CHANGED] =
175
175
                g_signal_new ("changed",
176
176
                              G_TYPE_FROM_CLASS (object_class),
177
177
                              G_SIGNAL_RUN_FIRST,
179
179
                              NULL, NULL,
180
180
                              g_cclosure_marshal_VOID__VOID,
181
181
                              G_TYPE_NONE, 0);
182
 
        signals [DRAW_GDK] =
 
182
        signals[DRAW_GDK] =
183
183
                g_signal_new ("draw_gdk",
184
184
                              G_TYPE_FROM_CLASS (object_class),
185
185
                              G_SIGNAL_RUN_FIRST,
189
189
                              G_TYPE_POINTER, G_TYPE_POINTER,
190
190
                              G_TYPE_INT, G_TYPE_INT);
191
191
 
192
 
        signals [DRAW_PRINT] =
 
192
        signals[DRAW_PRINT] =
193
193
                g_signal_new ("draw_print",
194
194
                              G_TYPE_FROM_CLASS (object_class),
195
195
                              G_SIGNAL_RUN_FIRST,
223
223
        if (child) {
224
224
                gtk_widget_size_request (child, requisition);
225
225
        } else {
226
 
                requisition->width = widget->requisition.width;
227
 
                requisition->height = widget->requisition.height;
 
226
                GtkRequisition self_requisition;
 
227
 
 
228
                gtk_widget_get_requisition (widget, &self_requisition);
 
229
                requisition->width = self_requisition.width;
 
230
                requisition->height = self_requisition.height;
228
231
        }
229
232
}
230
233
 
241
244
        if (child && gtk_widget_get_visible (child)) {
242
245
                gtk_widget_size_allocate (child, allocation);
243
246
        }
244
 
        widget->allocation = *allocation;
 
247
        gtk_widget_set_allocation (widget, allocation);
245
248
}
246
249
 
247
250
static void