xchat-gnome r2703 - in trunk: . plugins/notification src/common src/fe-gnome src/libcontrast

[chpe svn gnome org]

Author: chpe
Date: Fri Jan 16 13:20:22 2009
New Revision: 2703
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2703&view=rev

Log:

	* plugins/notification/notification.c: (got_focus_cb):
	* src/common/servlist.c:
	* src/common/text.c:
	* src/common/xchat.h:
	* src/fe-gnome/conversation-panel.h:
	* src/fe-gnome/dcc-window.c: (dcc_window_update):
	* src/fe-gnome/find-bar.h:
	* src/fe-gnome/gui.h:
	* src/fe-gnome/irc-network-editor.h:
	* src/fe-gnome/palette.h:
	* src/fe-gnome/pixmaps.c:
	* src/fe-gnome/status-bar.h:
	* src/fe-gnome/topic-label.h:
	* src/fe-gnome/userlist.h:
	* src/fe-gnome/xtext.c:
	* src/fe-gnome/xtext.h:
	* src/libcontrast/contrast.h: Fix includes. Bug #563636, patch by
	PrzemysÅaw Grzegorczyk.

2009-01-12  Christian Persch  <chpe gnome org>

Modified:
   trunk/ChangeLog
   trunk/plugins/notification/notification.c
   trunk/src/common/servlist.c
   trunk/src/common/text.c
   trunk/src/common/xchat.h
   trunk/src/fe-gnome/conversation-panel.h
   trunk/src/fe-gnome/dcc-window.c
   trunk/src/fe-gnome/find-bar.h
   trunk/src/fe-gnome/gui.h
   trunk/src/fe-gnome/irc-network-editor.h
   trunk/src/fe-gnome/palette.h
   trunk/src/fe-gnome/pixmaps.c
   trunk/src/fe-gnome/status-bar.h
   trunk/src/fe-gnome/topic-label.h
   trunk/src/fe-gnome/userlist.h
   trunk/src/fe-gnome/xtext.c
   trunk/src/fe-gnome/xtext.h
   trunk/src/libcontrast/contrast.h

Modified: trunk/plugins/notification/notification.c
==============================================================================
--- trunk/plugins/notification/notification.c	(original)
+++ trunk/plugins/notification/notification.c	Fri Jan 16 13:20:22 2009
@@ -90,8 +90,11 @@
 
 	update_tray ();
 
+#if GTK_CHECK_VERSION (2, 15, 0)
+	gtk_status_icon_set_tooltip_text (status_icon, NULL);
+#else
 	gtk_status_icon_set_tooltip (status_icon, NULL);
-
+#endif
 	return FALSE;
 }
 

Modified: trunk/src/common/servlist.c
==============================================================================
--- trunk/src/common/servlist.c	(original)
+++ trunk/src/common/servlist.c	Fri Jan 16 13:20:22 2009
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "cfgfiles.h"
 #include "fe.h"

Modified: trunk/src/common/text.c
==============================================================================
--- trunk/src/common/text.c	(original)
+++ trunk/src/common/text.c	Fri Jan 16 13:20:22 2009
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 #include "cfgfiles.h"
 #include "plugin.h"
 #include "fe.h"

Modified: trunk/src/common/xchat.h
==============================================================================
--- trunk/src/common/xchat.h	(original)
+++ trunk/src/common/xchat.h	Fri Jan 16 13:20:22 2009
@@ -1,10 +1,6 @@
 #include "../../config.h"
 
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <time.h>			/* need time_t */
 
 #ifndef XCHAT_H

Modified: trunk/src/fe-gnome/conversation-panel.h
==============================================================================
--- trunk/src/fe-gnome/conversation-panel.h	(original)
+++ trunk/src/fe-gnome/conversation-panel.h	Fri Jan 16 13:20:22 2009
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_CONVERSATION_PANEL_H
 #define XCHAT_GNOME_CONVERSATION_PANEL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/fe-gnome/dcc-window.c
==============================================================================
--- trunk/src/fe-gnome/dcc-window.c	(original)
+++ trunk/src/fe-gnome/dcc-window.c	Fri Jan 16 13:20:22 2009
@@ -370,8 +370,10 @@
 					g_object_unref (info);
 				}
 
+				/// don't leak icon
 				return;
 			}
+			// dont' leak icon
 		} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (window->transfer_store), &iter));
 	}
 

Modified: trunk/src/fe-gnome/find-bar.h
==============================================================================
--- trunk/src/fe-gnome/find-bar.h	(original)
+++ trunk/src/fe-gnome/find-bar.h	Fri Jan 16 13:20:22 2009
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_FIND_BAR_H
 #define XCHAT_GNOME_FIND_BAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/fe-gnome/gui.h
==============================================================================
--- trunk/src/fe-gnome/gui.h	(original)
+++ trunk/src/fe-gnome/gui.h	Fri Jan 16 13:20:22 2009
@@ -23,8 +23,7 @@
 #define XCHAT_GNOME_GUI_H
 
 #include <glade/glade.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-program.h>
 #include "userlist.h"
 #include "navigation-tree.h"

Modified: trunk/src/fe-gnome/irc-network-editor.h
==============================================================================
--- trunk/src/fe-gnome/irc-network-editor.h	(original)
+++ trunk/src/fe-gnome/irc-network-editor.h	Fri Jan 16 13:20:22 2009
@@ -19,10 +19,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include "irc-network.h"

Modified: trunk/src/fe-gnome/palette.h
==============================================================================
--- trunk/src/fe-gnome/palette.h	(original)
+++ trunk/src/fe-gnome/palette.h	Fri Jan 16 13:20:22 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 extern GdkColor colors[];
 extern const GdkColor *color_schemes[];

Modified: trunk/src/fe-gnome/pixmaps.c
==============================================================================
--- trunk/src/fe-gnome/pixmaps.c	(original)
+++ trunk/src/fe-gnome/pixmaps.c	Fri Jan 16 13:20:22 2009
@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include "pixmaps.h"
 
 void

Modified: trunk/src/fe-gnome/status-bar.h
==============================================================================
--- trunk/src/fe-gnome/status-bar.h	(original)
+++ trunk/src/fe-gnome/status-bar.h	Fri Jan 16 13:20:22 2009
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_STATUS_BAR_H
 #define XCHAT_GNOME_STATUS_BAR_H
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/fe-gnome/topic-label.h
==============================================================================
--- trunk/src/fe-gnome/topic-label.h	(original)
+++ trunk/src/fe-gnome/topic-label.h	Fri Jan 16 13:20:22 2009
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_TOPIC_LABEL_H
 #define XCHAT_GNOME_TOPIC_LABEL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/fe-gnome/userlist.h
==============================================================================
--- trunk/src/fe-gnome/userlist.h	(original)
+++ trunk/src/fe-gnome/userlist.h	Fri Jan 16 13:20:22 2009
@@ -20,7 +20,7 @@
  */
 
 #include <glib-object.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 #include "../common/userlist.h"
 

Modified: trunk/src/fe-gnome/xtext.c
==============================================================================
--- trunk/src/fe-gnome/xtext.c	(original)
+++ trunk/src/fe-gnome/xtext.c	Fri Jan 16 13:20:22 2009
@@ -43,12 +43,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef XCHAT
 #include "../../config.h"			/* can define USE_XLIB here */

Modified: trunk/src/fe-gnome/xtext.h
==============================================================================
--- trunk/src/fe-gnome/xtext.h	(original)
+++ trunk/src/fe-gnome/xtext.h	Fri Jan 16 13:20:22 2009
@@ -1,7 +1,7 @@
 #ifndef __XTEXT_H__
 #define __XTEXT_H__
 
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 #ifdef USE_XFT
 #include <X11/Xft/Xft.h>
 #endif

Modified: trunk/src/libcontrast/contrast.h
==============================================================================
--- trunk/src/libcontrast/contrast.h	(original)
+++ trunk/src/libcontrast/contrast.h	Fri Jan 16 13:20:22 2009
@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 /*
  * Defined colors.  Keep this list alphabetized if you add new ones, but set the