[Commits] trayicon.c 1.14.2.77.2.1 1.14.2.77.2.2 trayicon_prefs.c 1.1.2.9 1.1.2.9.2.1
miras at claws-mail.org
miras at claws-mail.org
Tue Nov 29 01:15:29 CET 2011
Update of /home/claws-mail/claws/src/plugins/trayicon
In directory claws-mail:/tmp/cvs-serv12914/src/plugins/trayicon
Modified Files:
Tag: new-contacts
trayicon.c trayicon_prefs.c
Log Message:
2011-11-29 [mir] 3.7.10cvs16.4-new-contacts
* AUTHORS
* configure.ac
* doc/man/claws-mail.1
* manual/advanced.xml
* manual/es/advanced.xml
* po/bg.po
* po/ca.po
* po/cs.po
* po/de.po
* po/en_GB.po
* po/es.po
* po/fi.po
* po/fr.po
* po/hu.po
* po/id.po
* po/it.po
* po/ja.po
* po/lt.po
* po/nl.po
* po/pl.po
* po/pt_BR.po
* po/pt_PT.po
* po/ru.po
* po/sk.po
* po/sv.po
* po/uk.po
* po/zh_CN.po
* src/account.c
* src/action.c
* src/addr_compl.c
* src/addrbook.c
* src/addrbook.h
* src/addrcustomattr.c
* src/addrduplicates.c
* src/addressadd.c
* src/addressbook.c
* src/addressbook_foldersel.c
* src/addrgather.c
* src/alertpanel.c
* src/browseldap.c
* src/codeconv.c
* src/compose.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/editbook.c
* src/editgroup.c
* src/editjpilot.c
* src/editldap.c
* src/editldap_basedn.c
* src/edittags.c
* src/editvcard.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/export.c
* src/exportldif.c
* src/filtering.c
* src/filtering.h
* src/folder.c
* src/folder.h
* src/folder_item_prefs.c
* src/foldersel.c
* src/folderview.c
* src/grouplistdialog.c
* src/headerview.c
* src/image_viewer.c
* src/imap_gtk.c
* src/import.c
* src/importldif.c
* src/importmutt.c
* src/importpine.c
* src/jpilot.c
* src/ldif.c
* src/main.c
* src/mainwindow.c
* src/mainwindow.h
* src/message_search.c
* src/messageview.c
* src/mh_gtk.c
* src/mimeview.c
* src/mimeview.h
* src/mutt.c
* src/news.c
* src/noticeview.c
* src/pine.c
* src/prefs_account.c
* src/prefs_actions.c
* src/prefs_actions.h
* src/prefs_common.c
* src/prefs_common.h
* src/prefs_compose_writing.c
* src/prefs_customheader.c
* src/prefs_display_header.c
* src/prefs_ext_prog.c
* src/prefs_filtering.c
* src/prefs_filtering_action.c
* src/prefs_folder_column.c
* src/prefs_folder_item.c
* src/prefs_image_viewer.c
* src/prefs_logging.c
* src/prefs_matcher.c
* src/prefs_message.c
* src/prefs_msg_colors.c
* src/prefs_other.c
* src/prefs_receive.c
* src/prefs_send.c
* src/prefs_spelling.c
* src/prefs_summaries.c
* src/prefs_summary_column.c
* src/prefs_summary_open.c
* src/prefs_template.c
* src/prefs_toolbar.c
* src/prefs_wrapping.c
* src/printing.c
* src/procheader.c
* src/procheader.h
* src/procmsg.c
* src/procmsg.h
* src/quote_fmt.c
* src/send_message.c
* src/sourcewindow.c
* src/ssl_manager.c
* src/statusbar.c
* src/stock_pixmap.c
* src/summary_search.c
* src/summaryview.c
* src/summaryview.h
* src/textview.c
* src/textview.h
* src/undo.c
* src/uri_opener.c
* src/vcard.c
* src/wizard.c
* src/common/defs.h
* src/common/ssl.c
* src/gtk/Makefile.am
* src/gtk/about.c
* src/gtk/authors.h
* src/gtk/colorlabel.c
* src/gtk/colorsel.c
* src/gtk/combobox.c
* src/gtk/description_window.c
* src/gtk/foldersort.c
* src/gtk/gtkaspell.c
* src/gtk/gtkaspell.h
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmctree.h
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkshruler.c
* src/gtk/gtkshruler.h
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/icon_legend.c
* src/gtk/inputdialog.c
* src/gtk/logwindow.c
* src/gtk/menu.c
* src/gtk/menu.h
* src/gtk/pluginwindow.c
* src/gtk/prefswindow.c
* src/gtk/progressdialog.c
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_prefs.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/passphrase.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/pgpcore/select-keys.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
* src/plugins/trayicon/trayicon_prefs.c
Applied patch 3.7.10cvs17 to 3.7.10cvs106 from the
gtk2 branch making new-addressbook branch in sync
with head.
Index: trayicon.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.77.2.1
retrieving revision 1.14.2.77.2.2
diff -u -d -r1.14.2.77.2.1 -r1.14.2.77.2.2
--- trayicon.c 7 Sep 2011 15:52:28 -0000 1.14.2.77.2.1
+++ trayicon.c 29 Nov 2011 00:15:26 -0000 1.14.2.77.2.2
@@ -241,7 +241,7 @@
*close_allowed = FALSE;
focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_hide(mainwin);
}
}
@@ -253,7 +253,7 @@
MainWindow *mainwin = mainwindow_get_mainwindow();
if (trayicon_prefs.hide_when_iconified
- && gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))
+ && gtk_widget_get_visible(GTK_WIDGET(mainwin->window))
&& !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {
focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
@@ -286,8 +286,9 @@
switch (event->button) {
case 1:
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))) {
- if ((gdk_window_get_state(GTK_WIDGET(mainwin->window)->window)&GDK_WINDOW_STATE_ICONIFIED)
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window))) {
+ if ((gdk_window_get_state(gtk_widget_get_window(
+ GTK_WIDGET(mainwin->window)))&GDK_WINDOW_STATE_ICONIFIED)
|| mainwindow_is_obscured()) {
gtk_window_deiconify(GTK_WINDOW(mainwin->window));
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
@@ -350,9 +351,7 @@
{
GtkActionGroup *action_group;
trayicon = gtk_status_icon_new();
-#if GTK_CHECK_VERSION(2,18,0)
gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
-#endif
g_signal_connect(G_OBJECT(trayicon), "button-press-event",
G_CALLBACK(click_cb), NULL);
@@ -435,7 +434,7 @@
if (trayicon_prefs.hide_at_startup && claws_is_starting()) {
MainWindow *mainwin = mainwindow_get_mainwindow();
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_hide(mainwin);
main_set_show_at_startup(FALSE);
}
Index: trayicon_prefs.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/trayicon/Attic/trayicon_prefs.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.9.2.1
diff -u -d -r1.1.2.9 -r1.1.2.9.2.1
--- trayicon_prefs.c 16 Feb 2011 07:16:25 -0000 1.1.2.9
+++ trayicon_prefs.c 29 Nov 2011 00:15:26 -0000 1.1.2.9.2.1
@@ -97,7 +97,6 @@
GtkWidget *hide_at_startup_checkbox;
GtkWidget *close_to_tray_checkbox;
GtkWidget *hide_when_iconified_checkbox;
- CLAWS_TIP_DECL();
vbox = gtk_vbox_new(FALSE, 3);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
More information about the Commits
mailing list