From 27341c7d3e8a2d76a6e2ae0dbaf4af929ed2becd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 3 Oct 2008 04:16:27 +0000
Subject: [PATCH] some upstream patches

---
 gnome-session.spec |   4 ++
 hig-problems.patch | 170 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 hig-problems.patch

diff --git a/gnome-session.spec b/gnome-session.spec
index d824ebc..489e225 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -70,6 +70,8 @@ Patch5: xml-leak.patch
 Patch6: startup_id-leak.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=554775 
 Patch7: missing-translations.patch
+# fixed upstream
+Patch8: hig-problems.patch
 
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up the other core
@@ -88,6 +90,7 @@ Desktop file to add GNOME to display manager session menu.
 %patch5 -p1 -b .xml-leak
 %patch6 -p1 -b .startup_id-leak.patch
 %patch7 -p1 -b .missing-translations
+%patch8 -p1 -b .hig-problems
 
 %build
 
@@ -191,6 +194,7 @@ fi
 %changelog
 * Fri Oct  3 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-6
 - Fix missing translations in the capplet
+- Fix small UI issues in the capplet
 
 * Sun Sep 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-5
 - BR xorg-x11-xtrans-devel (#464316)
diff --git a/hig-problems.patch b/hig-problems.patch
new file mode 100644
index 0000000..f02e978
--- /dev/null
+++ b/hig-problems.patch
@@ -0,0 +1,170 @@
+diff -up gnome-session-2.24.0/capplet/gsm-properties-dialog.c.hig-problems gnome-session-2.24.0/capplet/gsm-properties-dialog.c
+--- gnome-session-2.24.0/capplet/gsm-properties-dialog.c.hig-problems	2008-10-03 00:09:54.000000000 -0400
++++ gnome-session-2.24.0/capplet/gsm-properties-dialog.c	2008-10-03 00:12:51.000000000 -0400
+@@ -998,7 +998,7 @@ edit_app_dialog (GsmPropertiesDialog *di
+                                                          GTK_DIALOG_MODAL,
+                                                          GTK_MESSAGE_ERROR,
+                                                          GTK_BUTTONS_OK,
+-                                                         error_msg);
++                                                         "%s", error_msg);
+ 
+                         if (error != NULL) {
+                                 g_error_free (error);
+@@ -1457,15 +1457,12 @@ gsm_properties_dialog_init (GsmPropertie
+         widget = glade_xml_get_widget (dialog->priv->xml, "main-notebook");
+         gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), widget);
+ 
+-        gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
+-        gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
++        gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
++        gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
++        gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
+         gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+         gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties");
+         gtk_window_set_title (GTK_WINDOW (dialog), _("Sessions Preferences"));
+-        g_object_set (dialog,
+-                      "allow-shrink", FALSE,
+-                      "allow-grow", FALSE,
+-                      NULL);
+ }
+ 
+ static void
+diff -up gnome-session-2.24.0/data/session-properties.glade.hig-problems gnome-session-2.24.0/data/session-properties.glade
+--- gnome-session-2.24.0/data/session-properties.glade.hig-problems	2008-09-22 17:21:08.000000000 -0400
++++ gnome-session-2.24.0/data/session-properties.glade	2008-10-03 00:09:54.000000000 -0400
+@@ -1,6 +1,4 @@
+-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+-<!--Generated with glade3 3.4.4 on Mon Aug 11 15:28:59 2008 -->
++<?xml version="1.0"?>
+ <glade-interface>
+   <widget class="GtkDialog" id="session_properties_edit_dialog">
+     <property name="border_width">5</property>
+@@ -36,7 +34,6 @@
+                     <property name="can_focus">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="label" translatable="yes">Browse...</property>
+-                    <property name="response_id">0</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -163,7 +160,7 @@
+     </child>
+   </widget>
+   <widget class="GtkDialog" id="session_properties_capplet">
+-    <property name="border_width">10</property>
++    <property name="border_width">5</property>
+     <property name="title" translatable="yes">Sessions Preferences</property>
+     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+     <property name="icon_name">session-properties</property>
+@@ -177,6 +174,7 @@
+           <widget class="GtkNotebook" id="main-notebook">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
++            <property name="border_width">5</property>
+             <child>
+               <widget class="GtkVBox" id="vbox1">
+                 <property name="visible">True</property>
+@@ -217,9 +215,10 @@
+                       </widget>
+                     </child>
+                     <child>
+-                      <widget class="GtkVBox" id="vbox2">
++                      <widget class="GtkVButtonBox" id="vbuttonbox1">
+                         <property name="visible">True</property>
+-                        <property name="spacing">5</property>
++                        <property name="spacing">6</property>
++                        <property name="layout_style">GTK_BUTTONBOX_START</property>
+                         <child>
+                           <widget class="GtkButton" id="session_properties_add_button">
+                             <property name="visible">True</property>
+@@ -227,7 +226,6 @@
+                             <property name="receives_default">True</property>
+                             <property name="label">gtk-add</property>
+                             <property name="use_stock">True</property>
+-                            <property name="response_id">0</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+@@ -241,7 +239,6 @@
+                             <property name="receives_default">True</property>
+                             <property name="label">gtk-remove</property>
+                             <property name="use_stock">True</property>
+-                            <property name="response_id">0</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+@@ -256,19 +253,16 @@
+                             <property name="receives_default">True</property>
+                             <property name="label">gtk-edit</property>
+                             <property name="use_stock">True</property>
+-                            <property name="response_id">0</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+                             <property name="position">2</property>
+                           </packing>
+                         </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+                       </widget>
+                       <packing>
+                         <property name="expand">False</property>
++                        <property name="fill">False</property>
+                         <property name="position">1</property>
+                       </packing>
+                     </child>
+@@ -285,22 +279,21 @@
+                 <property name="label" translatable="yes">Startup Programs</property>
+               </widget>
+               <packing>
+-                <property name="type">tab</property>
+                 <property name="tab_fill">False</property>
++                <property name="type">tab</property>
+               </packing>
+             </child>
+             <child>
+               <widget class="GtkVBox" id="vbox3">
+                 <property name="visible">True</property>
+                 <property name="border_width">12</property>
+-                <property name="spacing">4</property>
++                <property name="spacing">6</property>
+                 <child>
+                   <widget class="GtkCheckButton" id="session_properties_remember_toggle">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">_Automatically remember running applications when logging out</property>
+                     <property name="use_underline">True</property>
+-                    <property name="response_id">0</property>
+                     <property name="draw_indicator">True</property>
+                   </widget>
+                   <packing>
+@@ -309,15 +302,13 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkHBox" id="hbox2">
++                  <widget class="GtkHButtonBox" id="hbuttonbox1">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">True</property>
+                     <child>
+                       <widget class="GtkButton" id="session_properties_save_button">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">True</property>
+-                        <property name="response_id">0</property>
+                         <child>
+                           <widget class="GtkHBox" id="hbox2">
+                             <property name="visible">True</property>
+@@ -368,9 +359,9 @@
+                 <property name="label" translatable="yes">Options</property>
+               </widget>
+               <packing>
+-                <property name="type">tab</property>
+                 <property name="position">1</property>
+                 <property name="tab_fill">False</property>
++                <property name="type">tab</property>
+               </packing>
+             </child>
+           </widget>