From 104e8be17a7a25a7bc482d6bf6c720064d712f99 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 20 Jun 2009 00:34:49 +0300
Subject: [PATCH] Rename pn_oim

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Makefile                |  2 +-
 adium/Makefile.am       |  2 +-
 notification.c          |  6 +++---
 pecan_oim.c => pn_oim.c | 16 ++++++++--------
 pecan_oim.h => pn_oim.h | 16 ++++++++--------
 session.c               |  4 ++--
 session_private.h       |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)
 rename pecan_oim.c => pn_oim.c (96%)
 rename pecan_oim.h => pn_oim.h (70%)

diff --git a/Makefile b/Makefile
index 03e1a65..19e061c 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ objects := msn.o \
 	   pn_util.o \
 	   pn_error.o \
 	   pecan_status.o \
-	   pecan_oim.o \
+	   pn_oim.o \
 	   pecan_dp_manager.o \
 	   cmd/cmdproc.o \
 	   cmd/command.o \
diff --git a/adium/Makefile.am b/adium/Makefile.am
index cf49581..cd9fd8e 100755
--- a/adium/Makefile.am
+++ b/adium/Makefile.am
@@ -15,7 +15,7 @@ MSNSOURCES = msn.c \
 	     pn_util.c \
 	     pn_error.c \
 	     pecan_status.c \
-	     pecan_oim.c \
+	     pn_oim.c \
 	     pecan_dp_manager.c \
 	     pecan_siren7.c \
 	     cmd/cmdproc.c \
diff --git a/notification.c b/notification.c
index 2b91462..881719d 100644
--- a/notification.c
+++ b/notification.c
@@ -1451,9 +1451,9 @@ initial_mdata_msg (MsnCmdProc *cmdproc,
 
                             message_id = pn_get_xml_field ("I", start, end);
 
-                            pecan_oim_session_request (session->oim_session,
-                                                       passport,
-                                                       message_id);
+                            pn_oim_session_request (session->oim_session,
+                                                    passport,
+                                                    message_id);
 
                             g_free (passport);
                             g_free (message_id);
diff --git a/pecan_oim.c b/pn_oim.c
similarity index 96%
rename from pecan_oim.c
rename to pn_oim.c
index 4ed5084..9f8b853 100644
--- a/pecan_oim.c
+++ b/pn_oim.c
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2006-2009 Felipe Contreras.
+/**
+ * Copyright (C) 2008-2009 Felipe Contreras
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 
 #include <time.h> /* for strptime */
 
-#include "pecan_oim.h"
+#include "pn_oim.h"
 #include "io/pecan_ssl_conn.h"
 #include "io/pecan_parser.h"
 
@@ -87,7 +87,7 @@ oim_request_free (OimRequest *oim_request)
 }
 
 PecanOimSession *
-pecan_oim_session_new (MsnSession *session)
+pn_oim_session_new (MsnSession *session)
 {
     PecanOimSession *oim_session;
 
@@ -99,7 +99,7 @@ pecan_oim_session_new (MsnSession *session)
 }
 
 void
-pecan_oim_session_free (PecanOimSession *oim_session)
+pn_oim_session_free (PecanOimSession *oim_session)
 {
     if (!oim_session)
         return;
@@ -325,9 +325,9 @@ oim_process_requests (PecanOimSession *oim_session)
 }
 
 void
-pecan_oim_session_request (PecanOimSession *oim_session,
-                           const gchar *passport,
-                           const gchar *message_id)
+pn_oim_session_request (PecanOimSession *oim_session,
+                        const gchar *passport,
+                        const gchar *message_id)
 {
     gboolean initial;
 
diff --git a/pecan_oim.h b/pn_oim.h
similarity index 70%
rename from pecan_oim.h
rename to pn_oim.h
index 01140bd..1b87884 100644
--- a/pecan_oim.h
+++ b/pn_oim.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PECAN_OIM_H
-#define PECAN_OIM_H
+#ifndef PN_OIM_H
+#define PN_OIM_H
 
 typedef struct PecanOimSession PecanOimSession;
 
@@ -25,10 +25,10 @@ typedef struct PecanOimSession PecanOimSession;
 
 struct MsnSession;
 
-PecanOimSession *pecan_oim_session_new (MsnSession *session);
-void pecan_oim_session_free (PecanOimSession *oim_session);
-void pecan_oim_session_request (PecanOimSession *oim_session,
-                                const gchar *passport,
-                                const gchar *message_id);
+PecanOimSession *pn_oim_session_new (MsnSession *session);
+void pn_oim_session_free (PecanOimSession *oim_session);
+void pn_oim_session_request (PecanOimSession *oim_session,
+                             const gchar *passport,
+                             const gchar *message_id);
 
-#endif /* PECAN_OIM_H */
+#endif /* PN_OIM_H */
diff --git a/session.c b/session.c
index cfd3f5d..df5fd7d 100644
--- a/session.c
+++ b/session.c
@@ -104,7 +104,7 @@ msn_session_new (const gchar *username,
 
     session->conv_seq = 1;
 
-    session->oim_session = pecan_oim_session_new (session);
+    session->oim_session = pn_oim_session_new (session);
 
     session->conversations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) msn_switchboard_unref);
     session->chats = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, (GDestroyNotify) msn_switchboard_unref);
@@ -121,7 +121,7 @@ msn_session_destroy (MsnSession *session)
     if (!session)
         return;
 
-    pecan_oim_session_free (session->oim_session);
+    pn_oim_session_free (session->oim_session);
 
     purple_signal_disconnect (purple_conversations_get_handle(), "conversation-created",
                               session, PURPLE_CALLBACK (conversation_created_cb));
diff --git a/session_private.h b/session_private.h
index c2488db..1198701 100644
--- a/session_private.h
+++ b/session_private.h
@@ -28,7 +28,7 @@
 
 #include "io/pecan_node.h"
 
-#include "pecan_oim.h"
+#include "pn_oim.h"
 #include "pecan_dp_manager.h"
 
 struct MsnNotification;