← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gimp/saucy

« back to all changes in this revision

Viewing changes to app/widgets/gimptoolbox.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-08 13:26:03 UTC
  • mfrom: (1.1.28) (0.4.19 sid)
  • Revision ID: package-import@ubuntu.com-20130308132603-h14fmrgazi3roobr
Tags: 2.8.4-1ubuntu1
https://launchpad.net/bugs/1132767
* Synchronize with Debian (LP: #1132767). Remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates
* Dropped changes:
  - CVE-2012-5576.patch: Applied in new version
  - fix-python-multiarch-includes.patch: No longer needed
* debian/patches/link-against-lm.patch:
  - Link against lm to fix underlinking build failure
* debian/control, debian/rules:
  - Run autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/widgets/gimptoolbox.c
98
98
                                                         GParamSpec     *pspec);
99
99
static void        gimp_toolbox_size_allocate           (GtkWidget      *widget,
100
100
                                                         GtkAllocation  *allocation);
101
 
static void        gimp_toolbox_style_set               (GtkWidget      *widget,
102
 
                                                         GtkStyle       *previous_style);
103
101
static gboolean    gimp_toolbox_button_press_event      (GtkWidget      *widget,
104
102
                                                         GdkEventButton *event);
105
103
static void        gimp_toolbox_drag_leave              (GtkWidget      *widget,
166
164
  object_class->get_property          = gimp_toolbox_get_property;
167
165
 
168
166
  widget_class->size_allocate         = gimp_toolbox_size_allocate;
169
 
  widget_class->style_set             = gimp_toolbox_style_set;
170
167
  widget_class->button_press_event    = gimp_toolbox_button_press_event;
171
168
 
172
169
  dock_class->get_description         = gimp_toolbox_get_description;
329
326
                           toolbox->p->image_area, 0);
330
327
 
331
328
  gimp_toolbox_dnd_init (GIMP_TOOLBOX (toolbox), toolbox->p->vbox);
332
 
 
333
 
  gimp_toolbox_style_set (GTK_WIDGET (toolbox),
334
 
                          gtk_widget_get_style (GTK_WIDGET (toolbox)));
335
329
}
336
330
 
337
331
static void
443
437
    }
444
438
}
445
439
 
446
 
static void
447
 
gimp_toolbox_style_set (GtkWidget *widget,
448
 
                        GtkStyle  *previous_style)
449
 
{
450
 
  GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
451
 
 
452
 
  gimp_dock_invalidate_geometry (GIMP_DOCK (widget));
453
 
}
454
 
 
455
440
static gboolean
456
441
gimp_toolbox_button_press_event (GtkWidget      *widget,
457
442
                                 GdkEventButton *event)