Merge pull request #67 from Hjdskes/fix/wayland-crash

Fix GNOME Shell Wayland session crashing when trying to pick a color
Hjdskes · Nov 2, 2017 · 8015c0e · 8015c0e
2 parents fdac2e4 + 27d4714
commit 8015c0e
Show file tree

Hide file tree

Showing 5 changed files with 3,224 additions and 36 deletions.
diff --git a/data/window.ui b/data/window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.1 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkImage" id="button_startup">
@@ -29,20 +29,6 @@
         <property name="can_focus">False</property>
         <property name="transition_type">slide-left-right</property>
         <signal name="notify::visible-child" handler="gcolor3_window_stack_changed" object="Gcolor3Window" swapped="no"/>
-        <child>
-          <object class="GtkColorSelection" id="picker">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="orientation">vertical</property>
-            <signal name="color-changed" handler="gcolor3_window_picker_changed" object="Gcolor3Window" swapped="no"/>
-          </object>
-          <packing>
-            <property name="name">picker</property>
-            <property name="title" translatable="yes">Picker</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkScrolledWindow" id="scroll">
             <property name="visible">True</property>
@@ -67,7 +53,6 @@
           <packing>
             <property name="name">saved-colors</property>
             <property name="title" translatable="yes">Saved colors</property>
-            <property name="position">1</property>
           </packing>
         </child>
       </object>

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,6 +10,7 @@ gcolor3_SOURCES = \
 	../data/gcolor3-marshalers.c \
 	main.c \
 	gcolor3-application.c \
+	gcolor3-color-selection.c \
 	gcolor3-color-store.c \
 	gcolor3-window.c \
 	$(gcolor3_NOINST_H_FILES)
@@ -18,6 +19,7 @@ gcolor3_SOURCES = \
 gcolor3_NOINST_H_FILES = \
 	../data/gcolor3-marshalers.h \
 	gcolor3-application.h \
+	gcolor3-color-selection.h \
 	gcolor3-color-store.h \
 	gcolor3-window.h