Merge lp:~attente/unity-control-center/fix-ftbfs-inline-zoom-options into lp:unity-control-center

Proposed by William Hua on 2015-11-25
Status: Merged
Approved by: Sebastien Bacher on 2015-12-14
Approved revision: 12840
Merged at revision: 12842
Proposed branch: lp:~attente/unity-control-center/fix-ftbfs-inline-zoom-options
Merge into: lp:unity-control-center
Diff against target: 39 lines (+6/-6)
1 file modified
panels/universal-access/zoom-options.c (+6/-6)
To merge this branch: bzr merge lp:~attente/unity-control-center/fix-ftbfs-inline-zoom-options
Reviewer Review Type Date Requested Status
Didier Roche 2015-11-25 Approve on 2015-11-27
Review via email: mp+278655@code.launchpad.net

Commit message

Fix FTBFS due to non-deterministic compilation of non-static inline functions.

Description of the change

Fix FTBFS due to non-deterministic compilation of non-static inline functions.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

I can't reproduce the FTBFS with the latest version from the archive on my xenial sbuild. How do you see it? I wonder if we shouldn't rather bundle that with another landing (I didn't see any silo shipping those, and so, no FTBFS there either).

review: Needs Information
William Hua (attente) wrote :

Just for reference, this is the comment from upstream that explains its irreproducibility: https://bugzilla.gnome.org/show_bug.cgi?id=723994#c0

Didier Roche (didrocks) wrote :

As discussed, we will bundle this with next u-c-c upload

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'panels/universal-access/zoom-options.c'
--- panels/universal-access/zoom-options.c 2012-08-15 18:07:56 +0000
+++ panels/universal-access/zoom-options.c 2015-11-25 22:11:01 +0000
@@ -63,9 +63,9 @@
63 NULL63 NULL
64};64};
6565
66inline void set_active (GtkWidget* toggle, gboolean sense);66static void set_active (GtkWidget* toggle, gboolean sense);
67inline gboolean get_active (GtkWidget* toggle);67static gboolean get_active (GtkWidget* toggle);
68inline void set_sensitive (GtkWidget *widget, gboolean sense);68static void set_sensitive (GtkWidget *widget, gboolean sense);
6969
70static void set_enable_screen_part_ui (GtkWidget *widget, ZoomOptionsPrivate *priv);70static void set_enable_screen_part_ui (GtkWidget *widget, ZoomOptionsPrivate *priv);
71static void mouse_tracking_notify_cb (GSettings *settings, const gchar *key, ZoomOptionsPrivate *priv);71static void mouse_tracking_notify_cb (GSettings *settings, const gchar *key, ZoomOptionsPrivate *priv);
@@ -79,19 +79,19 @@
7979
80/* Utilties to save on line length */80/* Utilties to save on line length */
8181
82inline void82static void
83set_active (GtkWidget* toggle, gboolean sense)83set_active (GtkWidget* toggle, gboolean sense)
84{84{
85 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), sense);85 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), sense);
86}86}
8787
88inline gboolean88static gboolean
89get_active (GtkWidget* toggle)89get_active (GtkWidget* toggle)
90{90{
91 return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));91 return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
92}92}
9393
94inline void94static void
95set_sensitive (GtkWidget *widget, gboolean sense)95set_sensitive (GtkWidget *widget, gboolean sense)
96{96{
97 gtk_widget_set_sensitive (widget, sense);97 gtk_widget_set_sensitive (widget, sense);

Subscribers

People subscribed via source and target branches