[gnome-applets/wip/segeiger/window-picker/task-title: 3/3] windowpicker: always set EXPAND_MAJOR flag

[Sebastian Geiger <segeiger src gnome org>]

commit fb29e751b770ba228bc734b0c6e995e63af54ad3
Author: Sebastian Geiger <sbastig gmx net>
Date:   Tue Feb 16 21:44:48 2016 +0100

    windowpicker: always set EXPAND_MAJOR flag

 windowpicker/src/wp-applet.c              |   44 +---------------------------
 windowpicker/src/wp-preferences-dialog.c  |    7 ----
 windowpicker/src/wp-preferences-dialog.ui |   15 ----------
 3 files changed, 2 insertions(+), 64 deletions(-)
---
diff --git a/windowpicker/src/wp-applet.c b/windowpicker/src/wp-applet.c
index d1cf89f..01ac28c 100644
--- a/windowpicker/src/wp-applet.c
+++ b/windowpicker/src/wp-applet.c
@@ -54,7 +54,6 @@ struct _WpApplet
 
   gboolean          show_all_windows;
   gboolean          icons_greyscale;
-  gboolean          expand_task_list;
 
   GtkWidget        *container;
   GtkWidget        *tasks;
@@ -66,7 +65,6 @@ enum
   PROP_0,
   PROP_SHOW_ALL_WINDOWS,
   PROP_ICONS_GREYSCALE,
-  PROP_EXPAND_TASK_LIST,
   LAST_PROP
 };
 
@@ -275,9 +273,6 @@ wp_applet_load (PanelApplet *panel_applet)
   g_settings_bind (applet->settings, KEY_ICONS_GREYSCALE,
                    applet, KEY_ICONS_GREYSCALE, G_SETTINGS_BIND_GET);
 
-  g_settings_bind (applet->settings, KEY_EXPAND_TASK_LIST,
-                   applet, KEY_EXPAND_TASK_LIST, G_SETTINGS_BIND_GET);
-
   gtk_settings = gtk_settings_get_default ();
   g_signal_connect (gtk_settings, "notify::gtk-theme-name",
                     G_CALLBACK (theme_changed), applet);
@@ -381,7 +376,6 @@ wp_applet_set_property (GObject      *object,
                         GParamSpec   *pspec)
 {
   WpApplet *applet;
-  gboolean expand_task_list;
 
   applet = WP_APPLET (object);
 
@@ -395,30 +389,6 @@ wp_applet_set_property (GObject      *object,
         applet->icons_greyscale = g_value_get_boolean (value);
         break;
 
-      case PROP_EXPAND_TASK_LIST:
-        expand_task_list = g_value_get_boolean (value);
-
-        if (applet->expand_task_list != expand_task_list)
-          {
-            PanelApplet *panel_applet;
-            PanelAppletFlags flags;
-
-            panel_applet = PANEL_APPLET (applet);
-            flags = panel_applet_get_flags (panel_applet);
-
-            if (expand_task_list == TRUE)
-              flags |= PANEL_APPLET_EXPAND_MAJOR;
-            else
-              flags &= ~PANEL_APPLET_EXPAND_MAJOR;
-
-            panel_applet_set_flags (panel_applet, flags);
-
-            applet->expand_task_list = expand_task_list;
-
-            gtk_widget_queue_resize (GTK_WIDGET (applet));
-          }
-        break;
-
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -445,10 +415,6 @@ wp_applet_get_property (GObject    *object,
         g_value_set_boolean (value, applet->icons_greyscale);
         break;
 
-      case PROP_EXPAND_TASK_LIST:
-        g_value_set_boolean (value, applet->expand_task_list);
-        break;
-
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -515,13 +481,6 @@ wp_applet_class_init (WpAppletClass *applet_class)
                           FALSE,
                           G_PARAM_READWRITE);
 
-  properties[PROP_EXPAND_TASK_LIST] =
-    g_param_spec_boolean ("expand-task-list",
-                          "Expand Task List",
-                          "Whether the task list will expand automatically and use all available space",
-                          FALSE,
-                          G_PARAM_READWRITE);
-
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
@@ -534,7 +493,8 @@ wp_applet_init (WpApplet *applet)
 
   panel_applet = PANEL_APPLET (applet);
 
-  flags = PANEL_APPLET_EXPAND_MINOR | PANEL_APPLET_HAS_HANDLE;
+  flags = PANEL_APPLET_EXPAND_MINOR | PANEL_APPLET_HAS_HANDLE |
+          PANEL_APPLET_EXPAND_MAJOR;
   orientation = panel_applet_get_gtk_orientation (panel_applet);
 
   panel_applet_set_flags (panel_applet, flags);
diff --git a/windowpicker/src/wp-preferences-dialog.c b/windowpicker/src/wp-preferences-dialog.c
index 2883bde..7cb2a4d 100644
--- a/windowpicker/src/wp-preferences-dialog.c
+++ b/windowpicker/src/wp-preferences-dialog.c
@@ -37,7 +37,6 @@ struct _WpPreferencesDialog
   GtkWidget *check_show_application_title;
   GtkWidget *check_show_home_title;
   GtkWidget *check_icons_greyscale;
-  GtkWidget *check_expand_task_list;
 };
 
 enum
@@ -75,10 +74,6 @@ wp_preferences_dialog_constructed (GObject *object)
   g_settings_bind (dialog->settings, KEY_ICONS_GREYSCALE,
                    dialog->check_icons_greyscale, "active",
                    G_SETTINGS_BIND_DEFAULT);
-
-  g_settings_bind (dialog->settings, KEY_EXPAND_TASK_LIST,
-                   dialog->check_expand_task_list, "active",
-                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
@@ -149,8 +144,6 @@ wp_preferences_dialog_class_init (WpPreferencesDialogClass *dialog_class)
                                         check_show_home_title);
   gtk_widget_class_bind_template_child (widget_class, WpPreferencesDialog,
                                         check_icons_greyscale);
-  gtk_widget_class_bind_template_child (widget_class, WpPreferencesDialog,
-                                        check_expand_task_list);
 }
 
 static void
diff --git a/windowpicker/src/wp-preferences-dialog.ui b/windowpicker/src/wp-preferences-dialog.ui
index af30660..6a518ab 100644
--- a/windowpicker/src/wp-preferences-dialog.ui
+++ b/windowpicker/src/wp-preferences-dialog.ui
@@ -114,21 +114,6 @@ for maximized windows</property>
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkCheckButton" id="check_expand_task_list">
-                <property name="label" translatable="yes">Automatically expand task list to use full 
space</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>