AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix reference handling in GtkScaleButton

Browse Source 
We were leaking the adjustment, since we confuse ourselves
with a property whose initial value comes out of a template.
Stop doing that.

https://bugzilla.gnome.org/show_bug.cgi?id=775212
This commit is contained in:
Matthias Clasen 2016-11-28 15:00:10 -05:00
parent 3efbb75619
commit 316b24e0a0
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkscalebutton.c
View File

@ -334,7 +334,6 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GtkScaleButton, box);
gtk_widget_class_bind_template_child_private (widget_class, GtkScaleButton, scale);
gtk_widget_class_bind_template_child_private (widget_class, GtkScaleButton, image);
gtk_widget_class_bind_template_child_private (widget_class, GtkScaleButton, adjustment);
gtk_widget_class_bind_template_callback (widget_class, cb_button_press);
gtk_widget_class_bind_template_callback (widget_class, cb_button_release);
@ -362,7 +361,9 @@ gtk_scale_button_init (GtkScaleButton *button)
gtk_popover_set_relative_to (GTK_POPOVER (priv->dock), GTK_WIDGET (button));
/* Need a local reference to the adjustment */
g_object_ref (priv->adjustment);
priv->adjustment = gtk_adjustment_new (0, 0, 100, 2, 20, 0);
g_object_ref_sink (priv->adjustment);
gtk_range_set_adjustment (GTK_RANGE (priv->scale), priv->adjustment);
gtk_widget_add_events (GTK_WIDGET (button), GDK_SMOOTH_SCROLL_MASK);

6
gtk/ui/gtkscalebutton.ui
View File

@ -15,11 +15,6 @@
</object>
</child>
</template>
<object class="GtkAdjustment" id="adjustment">
<property name="upper">100</property>
<property name="step-increment">2</property>
<property name="page-increment">20</property>
</object>
<object class="GtkPopover" id="dock">
<signal name="map" handler="cb_popup_mapped" swapped="no"/>
<style>
@ -63,7 +58,6 @@
<property name="visible">1</property>
<property name="can-focus">1</property>
<property name="orientation">vertical</property>
<property name="adjustment">adjustment</property>
<property name="inverted">1</property>
<property name="round-digits">1</property>
<property name="draw-value">0</property>