Indicator Display Objects

Merge lp:~ken-vandine/ido/lp_866039 into lp:ido/0.3

  1. lp_866039
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Ted Gould
Approved revision: 97
Merged at revision: 96
Proposed branch: lp:~ken-vandine/ido/lp_866039
Merge into: lp:ido/0.3
Diff against target: 47 lines (+4/-4)
3 files modified
src/idorange.c (+1/-1)
src/idorange.h (+1/-1)
src/idoscalemenuitem.c (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/ido/lp_866039
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+78409@code.launchpad.net

Description of the change

Fixed FTBFS on armel (LP: #866039)

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/idorange.c'
2--- src/idorange.c 2011-10-03 14:49:54 +0000
3+++ src/idorange.c 2011-10-06 13:33:25 +0000
4@@ -203,7 +203,7 @@
5 * Creates a new #IdoRange widget.
6 **/
7 GtkWidget *
8-ido_range_new (GtkAdjustment *adj,
9+ido_range_new (GObject *adj,
10 IdoRangeStyle style)
11 {
12 g_return_val_if_fail (GTK_IS_ADJUSTMENT (adj), NULL);
13
14=== modified file 'src/idorange.h'
15--- src/idorange.h 2011-06-01 19:53:29 +0000
16+++ src/idorange.h 2011-10-06 13:33:25 +0000
17@@ -64,7 +64,7 @@
18
19 GType ido_range_get_type (void) G_GNUC_CONST;
20
21-GtkWidget* ido_range_new (GtkAdjustment *adj,
22+GtkWidget* ido_range_new (GObject *adj,
23 IdoRangeStyle style);
24
25 G_END_DECLS
26
27=== modified file 'src/idoscalemenuitem.c'
28--- src/idoscalemenuitem.c 2011-09-13 15:32:27 +0000
29+++ src/idoscalemenuitem.c 2011-10-06 13:33:25 +0000
30@@ -225,7 +225,7 @@
31 {
32 IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object);
33 IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
34- GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0));
35+ GObject *adj = G_OBJECT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0));
36 IdoRangeStyle range_style;
37 GtkWidget *hbox;
38
39@@ -745,7 +745,7 @@
40 gdouble max,
41 gdouble step)
42 {
43- GtkAdjustment *adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (value, min, max, step, 10 * step, 0));
44+ GObject *adjustment = G_OBJECT (gtk_adjustment_new (value, min, max, step, 10 * step, 0));
45
46 return GTK_WIDGET (g_object_new (IDO_TYPE_SCALE_MENU_ITEM,
47 "label", label,

Subscribers

People subscribed via source and target branches