[Xfce4-commits] <xfce4-session:master> Drop the gnome-kde icon.

[Nick Schermer]

Updating branch refs/heads/master
         to 238e1783d797651b827ee750023fc7b7f683177d (commit)
       from 365a90ef6a54dedb1c686b8a9eb0b21191a05ccd (commit)

commit 238e1783d797651b827ee750023fc7b7f683177d
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Mar 24 22:48:55 2012 +0100

    Drop the gnome-kde icon.

 configure.in.in                       |    1 -
 icons/64x64/Makefile.am               |    5 ---
 icons/64x64/xfsm-gnome-kde-logo.png   |  Bin 6921 -> 0 bytes
 icons/Makefile.am                     |    1 -
 settings/xfce4-session-settings.glade |   57 ++++++++++----------------------
 5 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 345f053..8278100 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -205,7 +205,6 @@ engines/mice/Makefile
 engines/simple/Makefile
 icons/Makefile
 icons/48x48/Makefile
-icons/64x64/Makefile
 icons/72x72/Makefile
 icons/128x128/Makefile
 icons/scalable/Makefile
diff --git a/icons/64x64/Makefile.am b/icons/64x64/Makefile.am
deleted file mode 100644
index ec81706..0000000
--- a/icons/64x64/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/64x64/apps
-icons_DATA = 								\
-	xfsm-gnome-kde-logo.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/icons/64x64/xfsm-gnome-kde-logo.png b/icons/64x64/xfsm-gnome-kde-logo.png
deleted file mode 100644
index 552c09a..0000000
Binary files a/icons/64x64/xfsm-gnome-kde-logo.png and /dev/null differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 279c1b2..0eda4e5 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -2,7 +2,6 @@
 
 SUBDIRS =								\
 	48x48								\
-	64x64								\
 	72x72								\
 	128x128								\
 	scalable
diff --git a/settings/xfce4-session-settings.glade b/settings/xfce4-session-settings.glade
index ba106b1..0d0a798 100644
--- a/settings/xfce4-session-settings.glade
+++ b/settings/xfce4-session-settings.glade
@@ -648,55 +648,34 @@
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
-                            <property name="spacing">12</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkVBox" id="vbox4">
+                              <object class="GtkCheckButton" id="chk_compat_gnome">
+                                <property name="label" translatable="yes">Launch GN_OME services on startup</property>
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="chk_compat_gnome">
-                                    <property name="label" translatable="yes">Launch GN_OME services on startup</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Start GNOME services, such as gnome-keyring and the GNOME accessibility framework</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="chk_compat_kde">
-                                    <property name="label" translatable="yes">Launch _KDE services on startup</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Start KDE services, such as "kdeinit," DCOP, and ARTS</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Start GNOME services, such as gnome-keyring and the GNOME accessibility framework</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkImage" id="image1">
+                              <object class="GtkCheckButton" id="chk_compat_kde">
+                                <property name="label" translatable="yes">Launch _KDE services on startup</property>
                                 <property name="visible">True</property>
-                                <property name="yalign">0</property>
-                                <property name="pixel_size">64</property>
-                                <property name="icon_name">xfsm-gnome-kde-logo</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Start KDE services, such as "kdeinit," DCOP, and ARTS</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>