[Commits] trayicon.c 1.14.2.78 1.14.2.79 trayicon_prefs.c 1.1.2.9 1.1.2.10

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/trayicon
In directory claws-mail:/tmp/cvs-serv32605/src/plugins/trayicon

Modified Files:
      Tag: gtk2
	trayicon.c trayicon_prefs.c 
Log Message:
2011-10-22 [colin]	3.7.10cvs41

	* src/account.c
	* src/addr_compl.c
	* src/addrgather.c
	* src/compose.c
	* src/editldap.c
	* src/expldifdlg.c
	* src/folderview.c
	* src/grouplistdialog.c
	* src/headerview.c
	* src/importldif.c
	* src/main.c
	* src/mainwindow.c
	* src/mimeview.c
	* src/noticeview.c
	* src/prefs_account.c
	* src/prefs_actions.c
	* src/prefs_ext_prog.c
	* src/prefs_filtering.c
	* src/prefs_folder_item.c
	* src/prefs_image_viewer.c
	* src/prefs_logging.c
	* src/prefs_msg_colors.c
	* src/prefs_other.c
	* src/prefs_send.c
	* src/prefs_spelling.c
	* src/prefs_summaries.c
	* src/prefs_template.c
	* src/printing.c
	* src/quote_fmt.c
	* src/send_message.c
	* src/statusbar.c
	* src/summary_search.c
	* src/summaryview.c
	* src/wizard.c
	* src/gtk/gtkcmclist.c
	* src/gtk/gtkcmctree.c
	* src/gtk/gtkcmoptionmenu.c
	* src/gtk/gtksctree.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/inputdialog.c
	* src/gtk/pluginwindow.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/pgpcore/prefs_gpg.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
	* src/plugins/trayicon/trayicon_prefs.c
		Remove all possible #if GTK_CHECK_VERSION() checks,
		and make Claws build with GTK+2.16 (untested right
		now), as the Gpg4Win project uses GTK+2.16 currently.

Index: trayicon.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.78
retrieving revision 1.14.2.79
diff -u -d -r1.14.2.78 -r1.14.2.79
--- trayicon.c	7 Oct 2011 09:08:57 -0000	1.14.2.78
+++ trayicon.c	22 Oct 2011 17:09:05 -0000	1.14.2.79
@@ -238,7 +238,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);
 		}
 	}
@@ -250,7 +250,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);
@@ -283,7 +283,7 @@
 
 	switch (event->button) {
 	case 1:
-		if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))) {
+		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()) {
@@ -348,9 +348,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);
 
@@ -433,7 +431,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.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- trayicon_prefs.c	16 Feb 2011 07:16:25 -0000	1.1.2.9
+++ trayicon_prefs.c	22 Oct 2011 17:09:05 -0000	1.1.2.10
@@ -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);