[44297] trunk/dports/net/pidgin

[toby at macports.org]

Revision: 44297
          http://trac.macports.org/changeset/44297
Author:   toby at macports.org
Date:     2008-12-24 19:28:29 -0800 (Wed, 24 Dec 2008)
Log Message:
-----------
rollback based on comments in #17052

Modified Paths:
--------------
    trunk/dports/net/pidgin/Portfile

Removed Paths:
-------------
    trunk/dports/net/pidgin/files/trac-17052.diff

Modified: trunk/dports/net/pidgin/Portfile
===================================================================
--- trunk/dports/net/pidgin/Portfile	2008-12-25 02:56:03 UTC (rev 44296)
+++ trunk/dports/net/pidgin/Portfile	2008-12-25 03:28:29 UTC (rev 44297)
@@ -38,8 +38,7 @@
                     port:intltool
 
 patchfiles          patch-configure.diff \
-                    patch-configure.ac.diff \
-                    trac-17052.diff
+                    patch-configure.ac.diff
 
 configure.args      --disable-avahi \
                     --disable-consoleui \

Deleted: trunk/dports/net/pidgin/files/trac-17052.diff
===================================================================
--- trunk/dports/net/pidgin/files/trac-17052.diff	2008-12-25 02:56:03 UTC (rev 44296)
+++ trunk/dports/net/pidgin/files/trac-17052.diff	2008-12-25 03:28:29 UTC (rev 44297)
@@ -1,34 +0,0 @@
---- pidgin/gtkdocklet-x11.c	2008-08-31 06:36:31.000000000 +0200
-+++ pidgin/gtkdocklet-x11.c	2008-10-18 22:18:05.000000000 +0200
-@@ -30,14 +30,20 @@
- 
- #include "gtkdialogs.h"
- 
-+#ifdef GDK_WINDOWING_X11
- #include "eggtrayicon.h"
-+#endif
- #include "gtkdocklet.h"
- 
- #define SHORT_EMBED_TIMEOUT 5000
- #define LONG_EMBED_TIMEOUT 15000
- 
- /* globals */
-+#ifdef GDK_WINDOWING_X11
- static EggTrayIcon *docklet = NULL;
-+#else
-+static void* docklet = NULL;
-+#endif
- static GtkWidget *image = NULL;
- static GtkTooltips *tooltips = NULL;
- static GdkPixbuf *blank_icon = NULL;
-@@ -256,7 +262,8 @@
- 		docklet_x11_destroy();
- 	}
- 
--	docklet = egg_tray_icon_new(PIDGIN_NAME);
-+	// removed because uses X11 calls
-+	docklet = NULL; // egg_tray_icon_new(PIDGIN_NAME);
- 	box = gtk_event_box_new();
- 	image = gtk_image_new();
- 
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081224/0e958a82/attachment.html>