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

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
=== modified file 'src/idorange.c'
--- src/idorange.c 2011-10-03 14:49:54 +0000
+++ src/idorange.c 2011-10-06 13:33:25 +0000
@@ -203,7 +203,7 @@
203 * Creates a new #IdoRange widget.203 * Creates a new #IdoRange widget.
204 **/204 **/
205GtkWidget *205GtkWidget *
206ido_range_new (GtkAdjustment *adj,206ido_range_new (GObject *adj,
207 IdoRangeStyle style)207 IdoRangeStyle style)
208{208{
209 g_return_val_if_fail (GTK_IS_ADJUSTMENT (adj), NULL);209 g_return_val_if_fail (GTK_IS_ADJUSTMENT (adj), NULL);
210210
=== modified file 'src/idorange.h'
--- src/idorange.h 2011-06-01 19:53:29 +0000
+++ src/idorange.h 2011-10-06 13:33:25 +0000
@@ -64,7 +64,7 @@
6464
65GType ido_range_get_type (void) G_GNUC_CONST;65GType ido_range_get_type (void) G_GNUC_CONST;
6666
67GtkWidget* ido_range_new (GtkAdjustment *adj,67GtkWidget* ido_range_new (GObject *adj,
68 IdoRangeStyle style);68 IdoRangeStyle style);
6969
70G_END_DECLS70G_END_DECLS
7171
=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c 2011-09-13 15:32:27 +0000
+++ src/idoscalemenuitem.c 2011-10-06 13:33:25 +0000
@@ -225,7 +225,7 @@
225{225{
226 IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object);226 IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object);
227 IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);227 IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
228 GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0));228 GObject *adj = G_OBJECT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0));
229 IdoRangeStyle range_style;229 IdoRangeStyle range_style;
230 GtkWidget *hbox;230 GtkWidget *hbox;
231231
@@ -745,7 +745,7 @@
745 gdouble max,745 gdouble max,
746 gdouble step)746 gdouble step)
747{747{
748 GtkAdjustment *adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (value, min, max, step, 10 * step, 0));748 GObject *adjustment = G_OBJECT (gtk_adjustment_new (value, min, max, step, 10 * step, 0));
749749
750 return GTK_WIDGET (g_object_new (IDO_TYPE_SCALE_MENU_ITEM,750 return GTK_WIDGET (g_object_new (IDO_TYPE_SCALE_MENU_ITEM,
751 "label", label,751 "label", label,

Subscribers

People subscribed via source and target branches