im.pidgin.pidgin.vv: b3d7acc18ee83cbe110e729c61fe0e15e3d9ac9e

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b3d7acc18ee83cbe110e729c61fe0e15e3d9ac9e
Ancestor: 92035e851730d5fc98823a9f35d0fef81adfddb0
Author: sadrul at pidgin.im
Date: 2008-02-08T20:18:49
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/b3d7acc18ee83cbe110e729c61fe0e15e3d9ac9e

Modified files:
        finch/gntlog.c finch/libgnt/gntkeys.h

ChangeLog: 

Fix a compile error due to set_clock being defined in term.h conflicting with gstreamer.

-------------- next part --------------
============================================================
--- finch/gntlog.c	208a96bb627b879fcec3779c15e15862c4352e3c
+++ finch/gntlog.c	4c58c5514ffda13e7f04b4facb240f4010ddf606
@@ -23,8 +23,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
+#include "finch.h"
 
+#include "account.h"
+#include "debug.h"
+#include "log.h"
+#include "notify.h"
+#include "request.h"
+#include "util.h"
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -34,13 +41,6 @@
 #include <gnttree.h>
 #include <gntwindow.h>
 
-#include "account.h"
-#include "debug.h"
-#include "log.h"
-#include "notify.h"
-#include "request.h"
-#include "util.h"
-
 #include "gntlog.h"
 
 static GHashTable *log_viewers = NULL;
============================================================
--- finch/libgnt/gntkeys.h	ef5720a7efca56f6436265845fe9eb9ec6d79c59
+++ finch/libgnt/gntkeys.h	8ea40a82b00a1359f424be856cc31ee2f29ad17a
@@ -165,5 +165,6 @@ int gnt_keys_find_combination(const char
 #undef lines
 #undef buttons
 #undef newline
+#undef set_clock
 
 #endif