[patch] Patch to clean compile with newest gtk version created by Gerrit Hannaert

ircp-tray-gtk2.12.diff (text/plain), 2.16 KB, created by achaw on 2008-05-19 03:44:20 UTC

--- ircp-tray-0.7.2.1/src/app.c	2007-05-30 13:58:35.000000000 +0200
+++ ircp-tray-0.7.2.1.gtk2.12/src/app.c	2007-10-25 01:09:18.000000000 +0200
@@ -135,7 +135,12 @@
 EggTrayIcon* TrayIcon;
 static GtkImage* TrayIconImage;
 static GtkWidget* IconPopMenuItem;
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+#else
 static GtkTooltips* TrayToolTips;
+#endif
+
 static int TrayIconAnimationRefCount=0;
 static int TrayIconTimerId = 0;
 static char* TrayIconFileName = ICON_TRAY_INACTIVE;
@@ -238,8 +243,19 @@
 		);
 
 	//tooltips
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+#else
 	TrayToolTips = gtk_tooltips_new               ();
+#endif
+
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+	gtk_widget_set_tooltip_text (GTK_WIDGET(TrayIcon),  _("Infrared File Transfer"));
+#else
 	gtk_tooltips_set_tip(TrayToolTips, GTK_WIDGET(TrayIcon), _("Infrared File Transfer"), "ircp-tray");
+#endif
+
 	g_signal_connect(G_OBJECT(TrayIcon), "drag_data_received",
 				G_CALLBACK(sendfile_ondragdrop), NULL);
 	
@@ -455,7 +471,15 @@
 			discoverer_hints[0] = list->dev[0].hints[0];
 			discoverer_hints[1] = list->dev[0].hints[1];
 			sprintf(tooltips, _("Infrared File Transfer: %s"), discoverer_name);
-			gtk_tooltips_set_tip(TrayToolTips, GTK_WIDGET(TrayIcon), tooltips, "ircp-tray");
+
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+        gtk_widget_set_tooltip_text (GTK_WIDGET(TrayIcon),  tooltips);
+#else
+	gtk_tooltips_set_tip(TrayToolTips, GTK_WIDGET(TrayIcon), tooltips, "ircp-tray");
+#endif
+
+
 		        gtk_widget_set_sensitive(IconPopMenuItem, TRUE);
 		}
 	} else
@@ -468,8 +492,14 @@
 			trayicon_set_text(byemsg);
 			discoverer_name[0] = '\0';
 			trayicon_set_icon(ICON_TRAY_INACTIVE);
-			gtk_tooltips_set_tip(TrayToolTips, GTK_WIDGET(TrayIcon),
-				_("Infrared File Transfer"), "ircp-tray");
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+        gtk_widget_set_tooltip_text (GTK_WIDGET(TrayIcon),  _("Infrared File Transfer"));
+#else
+        gtk_tooltips_set_tip(TrayToolTips, GTK_WIDGET(TrayIcon), _("Infrared File Transfer"), "ircp-tray");
+#endif
+
+
                         gtk_widget_set_sensitive(IconPopMenuItem, FALSE);
 		}
 	}