2005-07-05 [colin] 1.9.12cvs21

	* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
		Fix crash on plugin reloading (with a hack)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index cf9e68a1ca9783436722a96a2d677fd54d1c6396..188151af09b682faffe486db55b253b5094c01e3 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-05 [colin]     1.9.12cvs21
+
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+               Fix crash on plugin reloading (with a hack)
+

 2005-07-05 [colin]     1.9.12cvs20
 
        * src/prefs_account.c
 2005-07-05 [colin]     1.9.12cvs20
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 987a96b3da51b60636ec073b9f0c70fa190fbe5c..fdb9a694a7a94be2fc0b62d014ca7e0518e4edd0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -615,3 +615,4 @@
 ( cvs diff -u -r 1.395.2.90 -r 1.395.2.91 src/summaryview.c;  ) > 1.9.12cvs18.patchset
 ( cvs diff -u -r 1.179.2.45 -r 1.179.2.46 src/imap.c;  ) > 1.9.12cvs19.patchset
 ( cvs diff -u -r 1.8 -r 1.9 .cvsignore;  cvs diff -u -r 1.105.2.26 -r 1.105.2.27 src/prefs_account.c;  cvs diff -u -r 1.49.2.12 -r 1.49.2.13 src/prefs_account.h;  diff -u /dev/null src/etpan/.cvsignore;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/filesel.h;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/prefs_gpg.c;  cvs diff -u -r 1.1 -r 1.2 src/plugins/spamassassin/.cvsignore;  ) > 1.9.12cvs20.patchset
 ( cvs diff -u -r 1.395.2.90 -r 1.395.2.91 src/summaryview.c;  ) > 1.9.12cvs18.patchset
 ( cvs diff -u -r 1.179.2.45 -r 1.179.2.46 src/imap.c;  ) > 1.9.12cvs19.patchset
 ( cvs diff -u -r 1.8 -r 1.9 .cvsignore;  cvs diff -u -r 1.105.2.26 -r 1.105.2.27 src/prefs_account.c;  cvs diff -u -r 1.49.2.12 -r 1.49.2.13 src/prefs_account.h;  diff -u /dev/null src/etpan/.cvsignore;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/filesel.h;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/prefs_gpg.c;  cvs diff -u -r 1.1 -r 1.2 src/plugins/spamassassin/.cvsignore;  ) > 1.9.12cvs20.patchset

+( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 1.9.12cvs21.patchset

diff --git a/configure.ac b/configure.ac
index a8fa28b8805590ca56fe0335eafd61057e16df4c..11417f567cb40fc02e97531b920bb607587ae34e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=20
+EXTRA_VERSION=21

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
index cacbfe155a07d092cf57536d8b855b792db0c9b9..a3e3baa16f312f083c123b8e989b72c98d6082eb 100644 (file)
--- a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+++ b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
@@ -22,6 +22,7 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

+#include <time.h>

 #include <glib.h>
 #include <glib/gi18n.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
 


@@ -64,6 +65,7 @@ egg_tray_icon_get_type (void)
 
   if (our_type == 0)
     {
 
   if (our_type == 0)
     {

+      gchar *type_name = g_strdup_printf("EggTrayIcon%d", (int)time(NULL));

       static const GTypeInfo our_info =
       {
        sizeof (EggTrayIconClass),
       static const GTypeInfo our_info =
       {
        sizeof (EggTrayIconClass),


@@ -77,7 +79,9 @@ egg_tray_icon_get_type (void)
        (GInstanceInitFunc) egg_tray_icon_init
       };
 
        (GInstanceInitFunc) egg_tray_icon_init
       };
 

-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+      our_type = g_type_register_static (GTK_TYPE_PLUG, type_name, 
+                                         &our_info, 0);
+      g_free(type_name);

     }
 
   return our_type;
     }
 
   return our_type;