meanwhile/broken-status.patch

   1 --- cipher.c    2005-12-24 19:32:50.000000000 +0000
   2 +++ ../../../cipher.c   2010-10-26 16:30:51.234362617 +0100
   3 @@ -1,4 +1,3 @@
   4 -
   5  /*
   6    Meanwhile - Unofficial Lotus Sametime Community Client Library
   7    Copyright (C) 2004  Christopher (siege) O'Brien
   8 @@ -718,7 +717,7 @@
   9  static void accepted_RC2_128(struct mwCipherInstance *ci,
  10                              struct mwEncryptItem *item) {
  11
  12 -  return offered_RC2_128(ci, item);
  13 +  offered_RC2_128(ci, item);
  14  }
  15
  16
  17 @@ -965,4 +964,3 @@
  18
  19    g_free(ci);
  20  }
  21 -
  22 --- common.c    2005-12-08 19:48:36.000000000 +0000
  23 +++ ../../../common.c   2010-10-26 16:32:48.220662572 +0100
  24 @@ -1,4 +1,3 @@
  25 -
  26  /*
  27    Meanwhile - Unofficial Lotus Sametime Community Client Library
  28    Copyright (C) 2004  Christopher (siege) O'Brien
  29 @@ -878,24 +877,25 @@
  30  /* 8.4.2.4 Snapshot */
  31
  32  void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
  33 -  guint32 junk;
  34 -  char *empty = NULL;
  35 +  guint32 end_of_block;
  36
  37    g_return_if_fail(b != NULL);
  38    g_return_if_fail(idb != NULL);
  39
  40 -  guint32_get(b, &junk);
  41 +  guint32_get(b, &end_of_block);
  42    mwAwareIdBlock_get(b, &idb->id);
  43    mwString_get(b, &idb->group);
  44    gboolean_get(b, &idb->online);
  45
  46 -  g_free(empty);
  47 -
  48    if(idb->online) {
  49      mwString_get(b, &idb->alt_id);
  50      mwUserStatus_get(b, &idb->status);
  51      mwString_get(b, &idb->name);
  52    }
  53 +
  54 +  if(b->ptr < b->buf + end_of_block) {
  55 +    mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
  56 +  }
  57  }
  58
  59
  60 @@ -924,4 +924,3 @@
  61    g_free(idb->group);
  62    memset(idb, 0x00, sizeof(struct mwAwareSnapshot));
  63  }
  64 -
  65 --- mw_cipher.h 2005-12-15 00:30:28.000000000 +0000
  66 +++ ../../../mw_cipher.h        2010-10-26 16:31:39.030127293 +0100
  67 @@ -1,4 +1,3 @@
  68 -
  69  /*
  70    Meanwhile - Unofficial Lotus Sametime Community Client Library
  71    Copyright (C) 2004  Christopher (siege) O'Brien
  72 @@ -74,8 +73,8 @@
  73    struct mwSession *session;
  74
  75    guint16 type;               /**< @see mwCipher_getType */
  76 -  const char *(*get_name)();  /**< @see mwCipher_getName */
  77 -  const char *(*get_desc)();  /**< @see mwCipher_getDesc */
  78 +  const char *(*get_name)(void);  /**< @see mwCipher_getName */
  79 +  const char *(*get_desc)(void);  /**< @see mwCipher_getDesc */
  80
  81    /** Generate a new Cipher Instance for use on a channel
  82        @see mwCipher_newInstance */
  83 @@ -252,7 +251,7 @@
  84
  85
  86  /** prepare a new mpi value */
  87 -struct mwMpi *mwMpi_new();
  88 +struct mwMpi *mwMpi_new(void);
  89
  90
  91  /** destroy an mpi value */
  92 --- mw_common.h 2005-12-15 00:30:28.000000000 +0000
  93 +++ ../../../mw_common.h        2010-10-26 16:33:17.914697797 +0100
  94 @@ -1,4 +1,3 @@
  95 -
  96  /*
  97    Meanwhile - Unofficial Lotus Sametime Community Client Library
  98    Copyright (C) 2004  Christopher (siege) O'Brien
  99 @@ -153,10 +152,14 @@
 100  /* 8.3.5 User Status Types */
 101
 102  enum mwStatusType {
 103 +  mwStatus_OFFLINE = 0x0000,
 104 +
 105    mwStatus_ACTIVE  = 0x0020,
 106    mwStatus_IDLE    = 0x0040,
 107    mwStatus_AWAY    = 0x0060,
 108    mwStatus_BUSY    = 0x0080,
 109 +
 110 +  mwStatus_MASK_MOBILE = 0x0200,
 111  };
 112
 113
 114 @@ -224,7 +227,7 @@
 115
 116
 117  /** allocate a new empty buffer */
 118 -struct mwPutBuffer *mwPutBuffer_new();
 119 +struct mwPutBuffer *mwPutBuffer_new(void);
 120
 121
 122  /** write raw data to the put buffer */
 123 --- mw_st_list.h        2005-12-15 00:30:28.000000000 +0000
 124 +++ ../../../mw_st_list.h       2010-10-26 16:32:16.350153506 +0100
 125 @@ -1,4 +1,3 @@
 126 -
 127  /*
 128    Meanwhile - Unofficial Lotus Sametime Community Client Library
 129    Copyright (C) 2004  Christopher (siege) O'Brien
 130 @@ -77,7 +76,7 @@
 131
 132
 133  /** Create a new list */
 134 -struct mwSametimeList *mwSametimeList_new();
 135 +struct mwSametimeList *mwSametimeList_new(void);
 136
 137
 138  /** Free the list, all of its groups, and all of the groups' members */
 139 --- srvc_conf.c 2005-12-28 02:46:54.000000000 +0000
 140 +++ ../../../srvc_conf.c        2010-10-26 16:33:57.337870772 +0100
 141 @@ -1,4 +1,3 @@
 142 -
 143  /*
 144    Meanwhile - Unofficial Lotus Sametime Community Client Library
 145    Copyright (C) 2004  Christopher (siege) O'Brien
 146 @@ -156,7 +155,7 @@
 147    if(conf->members)
 148      g_hash_table_destroy(conf->members);
 149
 150 -  g_list_remove_all(srvc->confs, conf);
 151 +  srvc->confs = g_list_remove_all(srvc->confs, conf);
 152
 153    mw_datum_clear(&conf->client_data);
 154
 155 @@ -864,4 +863,3 @@
 156    g_return_val_if_fail(srvc != NULL, NULL);
 157    return g_list_copy(srvc->confs);
 158  }
 159 -