BellePoule

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

  1. fedora
  2. Merge into trunk
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

this is the patch to fix bug https://bugs.launchpad.net/bellepoule/trunk/+bug/771345

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
1=== modified file 'sources/pool.cpp'
2--- sources/pool.cpp 2011-04-11 10:44:18 +0000
3+++ sources/pool.cpp 2011-04-29 19:24:52 +0000
4@@ -835,7 +835,7 @@
5 GooCanvas *canvas = CreateCanvas ();
6
7 Draw (canvas,
8- (gboolean) g_object_get_data (G_OBJECT (operation), "print_for_referees"));
9+ (gboolean) GPOINTER_TO_INT(g_object_get_data (G_OBJECT (operation), "print_for_referees")));
10
11 g_object_set_data (G_OBJECT (operation), "operation_canvas", (void *) canvas);
12 CanvasModule::OnDrawPage (operation,
13
14=== modified file 'sources/sensitivity_trigger.cpp'
15--- sources/sensitivity_trigger.cpp 2010-04-18 21:11:47 +0000
16+++ sources/sensitivity_trigger.cpp 2011-04-29 19:24:52 +0000
17@@ -59,8 +59,7 @@
18
19 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));
20
21- lock = (guint) g_object_get_data (G_OBJECT (w),
22- _data_key);
23+ lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
24 if (lock)
25 {
26 lock--;
27@@ -87,8 +86,7 @@
28
29 w = GTK_WIDGET (g_slist_nth_data (_widget_list, i));
30
31- lock = (guint) g_object_get_data (G_OBJECT (w),
32- _data_key);
33+ lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
34 lock++;
35 g_object_set_data (G_OBJECT (w),
36 _data_key,
37@@ -105,8 +103,7 @@
38 // --------------------------------------------------------------------------------
39 void SensitivityTrigger::SetSensitivity (GtkWidget *w)
40 {
41- guint lock = (guint) g_object_get_data (G_OBJECT (w),
42- _data_key);
43+ guint lock = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT (w), _data_key));
44 if (lock > 0)
45 {
46 gtk_widget_set_sensitive (w,

Subscribers

People subscribed via source and target branches

to all changes: