[Ayttm-commits] CVS: ayttm/modules/importers Makefile.am,1.2,1.3 importicq.c,1.2,1.3 importlicq.c,1.2,1.3 importicq.h,1.1.1.1,NONE

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/importers
In directory subversions:/tmp/cvs-serv15316/modules/importers

Modified Files:
        Makefile.am importicq.c importlicq.c 
Removed Files:
        importicq.h 
Log Message:
changed code almost everywhere.  removed gtk dependencies in some places, 
changed gdk_input_* to eb_input_*, etc... see the ChangeLog.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/importers/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 13 Jan 2003 15:25:28 -0000      1.2
+++ Makefile.am 16 Jan 2003 09:51:03 -0000      1.3
@@ -2,7 +2,7 @@
 
 CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)/src
 
-EXTRA_DIST = importicq.h
+EXTRA_DIST = 
 
 lib_LTLIBRARIES = import_gaim.la import_gnomeicu.la importlicq.la importicq.la 
smileysc.la giles_smiles.la 
 # msn_smileys.la yahoo_smileys.la

Index: importicq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/importers/importicq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- importicq.c 27 Dec 2002 16:46:52 -0000      1.2
+++ importicq.c 16 Jan 2003 09:51:03 -0000      1.3
@@ -20,23 +20,20 @@
  */
 #include <fcntl.h>                             
 #include <gtk/gtk.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <string.h>
 #ifdef __MINGW32__
 #define __IN_PLUGIN__ 1
 #endif
 #include "plugin_api.h"
-#include "importicq.h"         
 #include "account.h"
-#include "contact.h"
-#include "status.h"
-#include "src/util.h"
+#include "util.h"
+#include "service.h"
 #include "globals.h"
+#include "status.h"
 
-/*************************************************************************************
+/*******************************************************************************
  *                             Begin Module Code
- 
************************************************************************************/
+ 
******************************************************************************/
 
 /*  Module defines */
 #define plugin_info importicq_LTX_plugin_info
@@ -60,8 +57,52 @@
        plugin_init,
        plugin_finish
 };
+
 /* End Module Exports */
 
+/* the .IDX linked list entry */
+
+struct idxEntry {
+       guint32 status;
+       guint32 dat_number;
+       guint32 next;
+       guint32 prev;
+       guint32 dat_offset;
+};
+
+struct groups {
+       guint32 number;
+       gchar name[30];
+};
+
+/*DAT entry numbers */
+
+#define MY_DETAILS      1005
+#define CHAT_EVENT      1006
+#define MSG_EVENT1      1015
+#define MSG_EVENT2      1025
+#define PLUGINS         1101
+#define OBJ_WORDS       1102
+#define SERVER_LIST     1110
+#define USERS_DATA      2000
+
+#define LAST_FOLDER     998
+#define IGNORE_FOLDER   999     /*own definition */
+#define FIRST_IDX       0
+#define NEXT_IDX        1
+
+struct my_details {
+       gchar user_name[20];
+       gchar nick_name[20];
+       gchar first_name[20];
+       gchar last_name[20];
+       gchar group[30];
+       guint32 folder;
+       guint32 uin;
+};
+
+static void import_icq99_contacts(ebmCallbackData * data);
+
 static void *buddy_list_tag=NULL;
 
 int plugin_init()
@@ -85,9 +126,9 @@
        return(0);
 }
 
-/*************************************************************************************
+/*******************************************************************************
  *                             End Module Code
- 
************************************************************************************/
+ 
******************************************************************************/
 
 int wrong_type(struct idxEntry *entry, long type)
 {
@@ -210,7 +251,7 @@
        pass_strings(dat,1,0,42);               /*interest keyword 4*/
 
 }
-static gint get_groups(int idx, int dat,struct groups group_array[], struct 
my_details * my_details)
+static gint icq_get_groups(int idx, int dat,struct groups group_array[], 
struct my_details * my_details)
 {
        struct idxEntry entry={0,0,0,0,0};
        guint32 length=0;
@@ -329,7 +370,7 @@
        if( !(dat = open(selected, O_RDONLY)) )
         return;
        groups_ptr=g_malloc(sizeof(groups)*50);
-       get_groups(idx, dat, groups_ptr, &contact);
+       icq_get_groups(idx, dat, groups_ptr, &contact);
        contact.uin=0;
        while(get_contact(idx, dat, groups_ptr, &contact, &entry)!=-1)
        {

Index: importlicq.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/importers/importlicq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- importlicq.c        27 Dec 2002 16:46:52 -0000      1.2
+++ importlicq.c        16 Jan 2003 09:51:03 -0000      1.3
@@ -19,21 +19,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include <gtk/gtk.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
 #ifdef __MINGW32__
 #define __IN_PLUGIN__ 1
 #endif
 #include "account.h"
 #include "contact.h"
-#include "src/util.h"
-#include "dialog.h"
+#include "util.h"
+#include "prefs.h"
 #include "plugin_api.h"
+#include "service.h"
+#include "dialog.h"
 
-/*************************************************************************************
+/*******************************************************************************
  *                             Begin Module Code
- 
************************************************************************************/
+ 
******************************************************************************/
 
 /*  Module defines */
 #define plugin_info importlicq_LTX_plugin_info
@@ -83,9 +86,9 @@
        return(0);
 }
 
-/*************************************************************************************
+/*******************************************************************************
  *                             End Module Code
- 
************************************************************************************/
+ 
******************************************************************************/
 
 /* Removes the spaces surrounding a token */
 char* remove_spaces(char* token)
@@ -104,7 +107,7 @@
     char *token, *nick;
 
     g_snprintf(buff, 1024, "%s/.licq/%s/%s.uin", getenv("HOME"), 
-               licq_version < 7 ? "conf" : "users", uin);
+               (licq_version < 7 ? "conf" : "users"), uin);
     if (!(fp = fopen(buff, "r")))
         return NULL;
 

--- importicq.h DELETED ---