2010-10-02 [colin] 3.7.6cvs47

	* src/plugins/trayicon/trayicon.c
		Got burnt by wrong indentation!

diff --git a/ChangeLog b/ChangeLog
index 53144b940f9438add1c6090a5685e90584cd9c06..0eb144367eb7b33ec68a07d62222824691e06e56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-02 [colin]     3.7.6cvs47
+
+       * src/plugins/trayicon/trayicon.c
+               Got burnt by wrong indentation!
+

 2010-10-02 [colin]     3.7.6cvs46
 
        * configure.ac
 2010-10-02 [colin]     3.7.6cvs46
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index d9602f66f6db408492c300ccefed592139356311..a6975b14fe61b4eadb7ccebeff522bc19f294620 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4042,3 +4042,4 @@
 ( cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/action.c;  cvs diff -u -r 1.27.2.47 -r 1.27.2.48 src/addr_compl.c;  cvs diff -u -r 1.60.2.137 -r 1.60.2.138 src/addressbook.c;  cvs diff -u -r 1.5.10.31 -r 1.5.10.32 src/addrgather.c;  cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/alertpanel.c;  cvs diff -u -r 1.14.2.56 -r 1.14.2.57 src/editaddress.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.11.2.24 -r 1.11.2.25 src/editgroup.c;  cvs diff -u -r 1.207.2.216 -r 1.207.2.217 src/folderview.c;  cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/headerview.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/image_viewer.c;  cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/importldif.c;  cvs diff -u -r 1.115.2.229 -r 1.115.2.230 src/main.c;  cvs diff -u -r 1.274.2.317 -r 1.274.2.318 src/mainwindow.c;  cvs diff -u -r 1.3.12.33 -r 1.3.12.34 src/message_search.c;  cvs diff -u -r 1.83.2.163 -r 1.83.2.164 src/mimeview.c;  cvs diff -u -r 1.3.2.64 -r 1.3.2.65 src/prefs_themes.c;  cvs diff -u -r 1.15.2.58 -r 1.15.2.59 src/summary_search.c;  cvs diff -u -r 1.395.2.424 -r 1.395.2.425 src/summaryview.c;  cvs diff -u -r 1.43.2.119 -r 1.43.2.120 src/toolbar.c;  cvs diff -u -r 1.1.4.111 -r 1.1.4.112 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/gtk/authors.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.5.2.90 -r 1.5.2.91 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.7.6cvs44.patchset
 ( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.71 -r 1.14.2.72 src/plugins/trayicon/trayicon.c;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/.cvsignore;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 src/plugins/trayicon/libeggtrayicon/Makefile.am;  cvs diff -u -r -1.1.4.12 -r -1.1.4.13 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h;  cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/xembed.h;  ) > 3.7.6cvs45.patchset
 ( cvs diff -u -r 1.654.2.4114 -r 1.654.2.4115 configure.ac;  ) > 3.7.6cvs46.patchset
 ( cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/action.c;  cvs diff -u -r 1.27.2.47 -r 1.27.2.48 src/addr_compl.c;  cvs diff -u -r 1.60.2.137 -r 1.60.2.138 src/addressbook.c;  cvs diff -u -r 1.5.10.31 -r 1.5.10.32 src/addrgather.c;  cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/alertpanel.c;  cvs diff -u -r 1.14.2.56 -r 1.14.2.57 src/editaddress.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.11.2.24 -r 1.11.2.25 src/editgroup.c;  cvs diff -u -r 1.207.2.216 -r 1.207.2.217 src/folderview.c;  cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/headerview.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/image_viewer.c;  cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/importldif.c;  cvs diff -u -r 1.115.2.229 -r 1.115.2.230 src/main.c;  cvs diff -u -r 1.274.2.317 -r 1.274.2.318 src/mainwindow.c;  cvs diff -u -r 1.3.12.33 -r 1.3.12.34 src/message_search.c;  cvs diff -u -r 1.83.2.163 -r 1.83.2.164 src/mimeview.c;  cvs diff -u -r 1.3.2.64 -r 1.3.2.65 src/prefs_themes.c;  cvs diff -u -r 1.15.2.58 -r 1.15.2.59 src/summary_search.c;  cvs diff -u -r 1.395.2.424 -r 1.395.2.425 src/summaryview.c;  cvs diff -u -r 1.43.2.119 -r 1.43.2.120 src/toolbar.c;  cvs diff -u -r 1.1.4.111 -r 1.1.4.112 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/gtk/authors.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.5.2.90 -r 1.5.2.91 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.7.6cvs44.patchset
 ( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.71 -r 1.14.2.72 src/plugins/trayicon/trayicon.c;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/.cvsignore;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 src/plugins/trayicon/libeggtrayicon/Makefile.am;  cvs diff -u -r -1.1.4.12 -r -1.1.4.13 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h;  cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/libeggtrayicon/xembed.h;  ) > 3.7.6cvs45.patchset
 ( cvs diff -u -r 1.654.2.4114 -r 1.654.2.4115 configure.ac;  ) > 3.7.6cvs46.patchset

+( cvs diff -u -r 1.14.2.72 -r 1.14.2.73 src/plugins/trayicon/trayicon.c;  ) > 3.7.6cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 9cb0ff86b5894fd4e869dc0adaf5435623b7d264..baa59654ed2e852d4bb39447f9e24c2a3a6827c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=46
+EXTRA_VERSION=47

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 263214303aa7933924ddd4f40c0371efa62c6e87..8b815953dc1f0a66f208239b54431a712a729d2f 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -70,8 +70,6 @@ static GtkWidget *focused_widget = NULL;
 static GtkWidget *traymenu_popup;
 static gboolean updating_menu = FALSE;
 
 static GtkWidget *traymenu_popup;
 static gboolean updating_menu = FALSE;
 

-guint destroy_signal_id;
-

 typedef enum
 {
        TRAYICON_NEW,
 typedef enum
 {
        TRAYICON_NEW,


@@ -358,7 +356,6 @@ static void create_trayicon()
 
        gtk_status_icon_set_from_pixbuf(GTK_STATUS_ICON(trayicon), nomail_pixbuf[0]);
 
 
        gtk_status_icon_set_from_pixbuf(GTK_STATUS_ICON(trayicon), nomail_pixbuf[0]);
 

-       destroy_signal_id =

        g_signal_connect(G_OBJECT(trayicon), "button-press-event",
                G_CALLBACK(click_cb), NULL);
 
        g_signal_connect(G_OBJECT(trayicon), "button-press-event",
                G_CALLBACK(click_cb), NULL);
 


@@ -479,8 +476,6 @@ gboolean plugin_done(void)
        if (claws_is_exiting())
                return TRUE;
 
        if (claws_is_exiting())
                return TRUE;
 

-       g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);
-       

        g_object_unref(G_OBJECT(trayicon));
        trayicon = NULL;
 
        g_object_unref(G_OBJECT(trayicon));
        trayicon = NULL;