Merge lp:~ajs-newmexico/bellepoule/fedora into lp:bellepoule

Proposed by ajs
Status: Merged
Approved by: betonniere
Approved revision: no longer in the source branch.
Merged at revision: 266
Proposed branch: lp:~ajs-newmexico/bellepoule/fedora
Merge into: lp:bellepoule
Diff against target: 46 lines (+4/-7)
2 files modified
sources/pool.cpp (+1/-1)
sources/sensitivity_trigger.cpp (+3/-6)
To merge this branch: bzr merge lp:~ajs-newmexico/bellepoule/fedora
Reviewer Review Type Date Requested Status
betonniere Pending
Review via email: mp+59544@code.launchpad.net

Description of the change

To post a comment you must log in.
lp:~ajs-newmexico/bellepoule/fedora updated
266. By betonniere <>

Correction 772625

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sources/pool.cpp'
--- sources/pool.cpp 2011-04-11 10:44:18 +0000
+++ sources/pool.cpp 2011-04-29 19:24:52 +0000
@@ -835,7 +835,7 @@
835 GooCanvas *canvas = CreateCanvas ();835 GooCanvas *canvas = CreateCanvas ();
836836
837 Draw (canvas,837 Draw (canvas,
838 (gboolean) g_object_get_data (G_OBJECT (operation), "print_for_referees"));838 (gboolean) GPOINTER_TO_INT(g_object_get_data (G_OBJECT (operation), "print_for_referees")));
839839
840 g_object_set_data (G_OBJECT (operation), "operation_canvas", (void *) canvas);840 g_object_set_data (G_OBJECT (operation), "operation_canvas", (void *) canvas);
841 CanvasModule::OnDrawPage (operation,841 CanvasModule::OnDrawPage (operation,
842842
=== modified file 'sources/sensitivity_trigger.cpp'
--- sources/sensitivity_trigger.cpp 2010-04-18 21:11:47 +0000
+++ sources/sensitivity_trigger.cpp 2011-04-29 19:24:52 +0000
@@ -59,8 +59,7 @@
5959
60 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));60 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));
6161
62 lock = (guint) g_object_get_data (G_OBJECT (w),62 lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
63 _data_key);
64 if (lock)63 if (lock)
65 {64 {
66 lock--;65 lock--;
@@ -87,8 +86,7 @@
8786
88 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));87 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));
8988
90 lock = (guint) g_object_get_data (G_OBJECT (w),89 lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
91 _data_key);
92 lock++;90 lock++;
93 g_object_set_data (G_OBJECT (w),91 g_object_set_data (G_OBJECT (w),
94 _data_key,92 _data_key,
@@ -105,8 +103,7 @@
105// --------------------------------------------------------------------------------103// --------------------------------------------------------------------------------
106void SensitivityTrigger::SetSensitivity (GtkWidget *w)104void SensitivityTrigger::SetSensitivity (GtkWidget *w)
107{105{
108 guint lock = (guint) g_object_get_data (G_OBJECT (w),106 guint lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
109 _data_key);
110 if (lock > 0)107 if (lock > 0)
111 {108 {
112 gtk_widget_set_sensitive (w,109 gtk_widget_set_sensitive (w,

Subscribers

People subscribed via source and target branches

to all changes: