rpms/openoffice.org/F-12 workspace.qstartfix2.patch,1.1,1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31045

Modified Files:
	workspace.qstartfix2.patch 
Log Message:
defuzz patch

workspace.qstartfix2.patch:
 libegg/source/eggtrayicon.c       |   46 ++++++++++++++++++++++----------------
 sfx2/source/appl/shutdownicon.cxx |   31 ++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 25 deletions(-)

Index: workspace.qstartfix2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.qstartfix2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.qstartfix2.patch	2 Feb 2010 14:31:22 -0000	1.1
+++ workspace.qstartfix2.patch	2 Feb 2010 15:39:18 -0000	1.2
@@ -9,7 +9,7 @@
  #include "sfxresid.hxx"
  
 @@ -186,6 +187,23 @@
-     return true;
+ 	return true;
  }
  
 +class IdleUnloader : Timer
@@ -31,50 +31,41 @@
 +
  void ShutdownIcon::initSystray()
  {
-     if (m_bInitialized)
-@@ -201,15 +221,15 @@
- {
-     if (!m_bInitialized)
-         return;
-+
-     if (m_pDeInitSystray)
-         m_pDeInitSystray();
- 
-     m_bVeto = false;
-     m_pInitSystray = 0;
-     m_pDeInitSystray = 0;
--    if (m_pPlugin)
--        delete m_pPlugin;
--    m_pPlugin = 0;
-+    new IdleUnloader (&m_pPlugin);
-+
+ 	if (m_bInitialized)
+@@ -207,9 +225,7 @@
+ 	m_bVeto = false;
+ 	m_pInitSystray = 0;
+ 	m_pDeInitSystray = 0;
+-	if (m_pPlugin)
+-		delete m_pPlugin;
+-	m_pPlugin = 0;
++	new IdleUnloader (&m_pPlugin);
      delete m_pFileDlg;
-     m_pFileDlg = NULL;
-     m_bInitialized = false;
-@@ -228,6 +249,7 @@
+ 	m_pFileDlg = NULL;
+ 	m_bInitialized = false;
+@@ -233,6 +249,7 @@
  ShutdownIcon::~ShutdownIcon()
  {
-     deInitSystray();
-+    new IdleUnloader (&m_pPlugin);
+ 	deInitSystray();
++	new IdleUnloader (&m_pPlugin);
  }
  
  // ---------------------------------------------------------------------------
-@@ -853,9 +884,11 @@
+@@ -849,9 +866,11 @@
          ::osl::File::getFileURLFromSystemPath( aShortcut, aShortcutUrl );
          ::osl::File::remove( aShortcutUrl );
  #ifdef UNX
--        ShutdownIcon *pIcon = getInstance();
--        if( pIcon )
--            pIcon->deInitSystray();
-+		if (pShutdownIcon)
-+		{
-+		    ShutdownIcon *pIcon = getInstance();
-+			pIcon->deInitSystray();
-+		}
+-		ShutdownIcon *pIcon = getInstance();
+-		if( pIcon )
+-			pIcon->deInitSystray();
++        if (pShutdownIcon)
++        {
++            ShutdownIcon *pIcon = getInstance();
++                pIcon->deInitSystray();
++        }
  #endif
      }
  #elif defined OS2
-
 --- libegg/source/eggtrayicon.c
 +++ libegg/source/eggtrayicon.c
 @@ -76,6 +76,14 @@
@@ -93,24 +84,24 @@
  egg_tray_icon_get_type (void)
  {
 @@ -88,18 +96,23 @@
-     sizeof (EggTrayIconClass),
-     (GBaseInitFunc) NULL,
-     (GBaseFinalizeFunc) NULL,
--    (GClassInitFunc) egg_tray_icon_class_init,
-+    (GClassInitFunc) NULL, /* class_init */
-     NULL, /* class_finalize */
-     NULL, /* class_data */
-     sizeof (EggTrayIcon),
-     0,    /* n_preallocs */
--    (GInstanceInitFunc) egg_tray_icon_init,
-+    (GInstanceInitFunc) NULL, /* instance_init */
-     NULL
+ 	sizeof (EggTrayIconClass),
+ 	(GBaseInitFunc) NULL,
+ 	(GBaseFinalizeFunc) NULL,
+-	(GClassInitFunc) egg_tray_icon_class_init,
++	(GClassInitFunc) NULL, /* class_init */
+ 	NULL, /* class_finalize */
+ 	NULL, /* class_data */
+ 	sizeof (EggTrayIcon),
+ 	0,    /* n_preallocs */
+-	(GInstanceInitFunc) egg_tray_icon_init,
++	(GInstanceInitFunc) NULL, /* instance_init */
+ 	NULL
        };
  
 -      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
 +      our_type = g_type_from_name ("EggTrayIcon");
 +      if (!our_type)
-+	 our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
++        our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
      }
  
 +  /* always overwrite the function pointers */
@@ -123,14 +114,15 @@
  
    container_class->add = egg_tray_icon_add;
  
--  g_object_class_install_property (gobject_class,
--                   PROP_ORIENTATION,
--                   g_param_spec_enum ("orientation",
--                              _("Orientation"),
--                              _("The orientation of the tray."),
--                              GTK_TYPE_ORIENTATION,
--                              GTK_ORIENTATION_HORIZONTAL,
--                              G_PARAM_READABLE));
++if (!g_object_class_find_property (gobject_class, "orientation"))
+   g_object_class_install_property (gobject_class,
+-				   PROP_ORIENTATION,
+-				   g_param_spec_enum ("orientation",
+-						      _("Orientation"),
+-						      _("The orientation of the tray."),
+-						      GTK_TYPE_ORIENTATION,
+-						      GTK_ORIENTATION_HORIZONTAL,
+-						      G_PARAM_READABLE));
 -
 -#if defined (GDK_WINDOWING_X11)
 -  /* Nothing */
@@ -139,15 +131,13 @@
 -#else
 -  g_warning ("Port eggtrayicon to this GTK+ backend");
 -#endif
-+  if (!g_object_class_find_property (gobject_class, "orientation"))
-+    g_object_class_install_property (gobject_class,
-+				     PROP_ORIENTATION,
-+				     g_param_spec_enum ("orientation",
-+							"Orientation",
-+							"The orientation of the tray.",
-+							GTK_TYPE_ORIENTATION,
-+							GTK_ORIENTATION_HORIZONTAL,
-+							G_PARAM_READABLE));
++                                  PROP_ORIENTATION,
++                                  g_param_spec_enum ("orientation",
++                                                     "Orientation",
++                                                     "The orientation of the tray.",
++                                                     GTK_TYPE_ORIENTATION,
++                                                     GTK_ORIENTATION_HORIZONTAL,
++                                                     G_PARAM_READABLE));
  }
  
  static void