1 files changed, 8 insertions, 530 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index be6b0e9e..b4f1f203 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -22,9 +22,6 @@
  * @file src/identity/gnunet-identity-gtk.h
  * @author Christian Grothoff
  */
-#include <gnunet/gnunet_util_lib.h>
-#include <stdbool.h>
-
 #ifndef GNUNET_CONVERSATION_GTK_H
 #define GNUNET_CONVERSATION_GTK_H
 
@@ -32,538 +29,19 @@
  * macro's
  */
 
-#define UPDATE_STATUS(format, ...) update_status(g_strdup_printf (format, ## __VA_ARGS__))
-
-#define UPDATE_INFOBAR(format, ...) set_infobar_text(g_strdup_printf (format, ## __VA_ARGS__))
-
-#define LOG(format, ...) log_message(g_strdup_printf (format, ## __VA_ARGS__))
-
-
-
-/**
-  * List of active calls
-  */
- static GtkListStore *active_liststore;
- 
- /**
-  * List of active calls
-  */
- static GtkTreeView *active_treeview;
-
-
-/*
- * active calls treevieuw columns
- */
-
-enum {
-  AL_caller_id, //*gchar
-  AL_caller,  //*
-  AL_caller_num, //gint
-  AL_caller_type, //gint
-  AL_caller_state //gint
-};
-/**
- * callerstate (state of incoming call)
- */
-
-enum {
-  CT_active,
-  CT_suspended,
-  CT_ringing,
-  CT_dead,
-  CT_hangup,
-  CT_rejected
-};
-
-/**
- * type of call
- */
-enum {
-    CALL_IN,
-    CALL_OUT
-};
-
-
-/**
- * Get our configuration.
- *
- * @return configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration ();
-
-
-/**
- * Handle to our main loop.
- */
-static struct GNUNET_GTK_MainLoop *ml;
-
-/**
- * Should gnunet-identity-gtk start in tray mode?
- */
-static int tray_only;
-
-/**
- * Head of operations.
- */
-//static struct OperationContext *oc_head;
-
-/**
- * Tail of operations.
- */
-//static struct OperationContext *oc_tail;
-
-/**
- * Possible states of the phone.
- */
-enum PhoneState
-{
-  /**
-   * We're waiting for our own idenitty.
-   */
-  PS_LOOKUP_EGO,
-
-  /**
-   * We're listening for calls
-   */
-  PS_LISTEN,
-
-  /**
-   * We accepted an incoming phone call.
-   */
-  PS_ACCEPTED,
-
-  /**
-   * Internal error
-   */
-  PS_ERROR
-};
-
-/**
- * States for current outgoing call.
- */
-enum CallState
-{
-  /**
-   * We are looking up some other participant.
-   */
-  CS_RESOLVING,
-
-  /**
-   * We are now ringing the other participant.
-   */
-  CS_RINGING,
-
-  /**
-   * The other party accepted our call and we are now connected.
-   */
-  CS_CONNECTED,
-
-  /**
-   * The call is currently suspended (by us).
-   */
-  CS_SUSPENDED
-};
-
-enum CallHistoryType
-{
-  CH_ACCEPTED,
-  CH_REJECTED,
-  CH_OUTGOING,
-  CH_HANGUP,
-  CH_MISSED
-};
-
-
-
-/**
- * List of incoming calls
- */
-struct CallList
-{
-
-  /**
-   * A DLL.
-   */
-  struct CallList *prev;
-
-  /**
-   * A DLL.
-   */
-  struct CallList *next;
-
-  /**
-   * Handle to hang up or activate.
-   */
-  struct GNUNET_CONVERSATION_Caller *caller;
-
-  /**
-   * Handle to call currently selected in list
-   */
-  struct GNUNET_CONVERSATION_Caller *caller_selected;
-
-  /**
-   * String identifying the caller.
-   */
-  char *caller_id;
-
-  /**
-   * Unique number of the call.
-   */
-  unsigned int caller_num;
-
-};
-
-
-
-/**
- * Phone handle
- */
-static struct GNUNET_CONVERSATION_Phone *phone;
-
-/**
- * Call handle (for active outgoing call).
- */
-static struct GNUNET_CONVERSATION_Call *call;
-//static struct GtkTreeIter gcall;
-
-/**
- * Caller handle (for active incoming call).
- */
-static struct CallList *cl_active;
-//static GtkTreeIter     gcl_active;
-
-/**
- * Head of calls waiting to be accepted.
- */
-static struct CallList *cl_head;
-//gtk
-//static GtkTreeIter     gcl_head;
-
-/**
- * currently selected call
- */
-//static GtkTreeIter gcl_selected;
-
-/**
- * Tail of calls waiting to be accepted.
- */
-static struct CallList *cl_tail;
-//static GtkTreeIter     gcl_tail;
-
-/**
- * Desired phone line.
- */
-static unsigned int line;
-
-//static unsigned int line1;
-/**
- * debug box enabled
- */
-
-static unsigned int debug_box_enabled;
-
-
-
-/**
- * Our speaker.
- */
-static struct GNUNET_SPEAKER_Handle *speaker;
-
-/**
- * Our microphone.
- */
-static struct GNUNET_MICROPHONE_Handle *mic;
-
-/**
- * Our configurations.
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+extern GObject *
+GNUNET_CONVERSATION_GTK_get_main_window_object (const char *);
 
-//static struct GNUNET_CONFIGURATION_Handle *cfg1;
-//static struct GNUNET_CONFIGURATION_Handle *cfg2;
-
-
-/**
- * Our ego.
- */
-static struct GNUNET_IDENTITY_Ego *caller_id;
-
-/**
- * Handle to identity service.
- */
-static struct GNUNET_IDENTITY_Handle *id;
 
 /**
- * Name of our ego.
+ * log a message to gtk log textbuffer
+ * @param Message to be logged
  */
-static char *ego_name;
-
-/**
- * Name of conversation partner (if any).
- */
-static char *peer_name;
-
-/**
- * Our phone's current state.
- */
-static enum PhoneState phone_state;
-
-/**
- * Our call's current state.
- */
-static enum CallState call_state;
-
-/**
- * Counts the number of incoming calls we have had so far.
- */
-static unsigned int caller_num_gen;
-
-/**
- * GNS address for this phone.
- */
-static char *address;
-
-/**
- * Be verbose.
- */
-static int verbose = 1;
-
-/**
- * Handle to the namestore.
- */
-static struct GNUNET_NAMESTORE_Handle *ns;
-
-/**
- * Private key for the our zone.
- */
-struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
-
-/**
-  * Public key of the zone we are currently editing.
-  */
-struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
-
-
-
-/*
- * List iterator for the 'list' operation.
- */
-static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
-
-
-/**
- * Name of the records to add/list/remove.
- */
-static char *name;
-
-static void
-identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
-             const char *name);
-
-
-/**
- * List of contacts (records).
- */
-static GtkListStore *contacts_liststore;
-
-
-/**
- * List of contacts.
- */
-static GtkTreeStore *contacts_treestore;
-
-/**
- * The main tree view for 'gns' that shows the records.
- */
-static GtkTreeView *contacts_treeview;
-
-/**
- * Tree model (same object as 'contacts_treestore', just different type).
- */
-static GtkTreeModel *contacts_treemodel;
-
-
-/**
- * call history liststore
- */
-static GtkListStore *history_liststore;
-
-/**
- * call history treestore
- */
-static GtkTreeStore *history_treestore;
-
-/**
- * call histore treeview
- */
-static GtkTreeView *history_treeview;
-
-/**
- * call history tree model
- */
-static GtkTreeModel *history_treemodel;
-
-
-/**
- * list of zones
- */
-static GtkListStore *zone_liststore;
-
-/**
- * zone treestore
- */
-static GtkTreeStore *zone_treestore;
-
-/**
- * zone treeview
- */
-static GtkTreeView *zone_treeview;
-
-/**
- * zone tree model
- */
-static GtkTreeModel *zone_treemodel;
-
-/**                      
- * Current state of iterating elements for the client.
- * NULL if we are not currently iterating.
- */
-struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
-
-/**
- *name of the incomming caller pkey or record name if known
-*/
-char *callerName;
-
-/**
-* peer id of a contact
-*/
-char *peer_id;
-
-/**
- * Queue entry for the 'add' operation.
- */
-static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
-
-/**
- * Queue entry for the 'del' operation.
- */
-static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
-
-/**
- * Global return value
- */
-static int ret;
-
-/**
-* incoming call popup window, global because must be destroyed when other end hangs up
-*/
-GtkDialog *dialog;
-
-/**
- * Context for edit operations and environment for plugins.
- * Typical plugins will only use the @e check_validity callback.
- */
-struct GNUNET_GTK_NAMESTORE_PluginEnvironment
-{
-
-  /**
-   * Function that should be called by the plugin whenever values in
-   * the dialog were edited.  It will check the validity of the dialog
-   * and update the "save" button accordingly.
-   */
-  void (*check_validity)(struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc);
-
-  /**
-   * Builder for the dialog.
-   */
-  GtkBuilder *builder;
-
-  /**
-   * Main dialog window.
-   */
-  GtkDialog *dialog;
-
-  /**
-   * Where in the tree view are we editing?
-   */
-  struct RecordInfo *ri;
-
-  /**
-   * Name of the record.
-   */
-  gchar *name;
-
-  /**
-   * Value of the record in string format.
-   */
-  gchar *n_value;
-
-  /**
-   * Name of the zone into which the record should be placed.
-   */
-  gchar *new_zone_option;
-
-  /**
-   * Ego of the zone into which the record should be placed.
-   */
-  struct GNUNET_IDENTITY_Ego *ego;
-
-  /**
-   * List of all zones.
-   */
-  GtkListStore *zone_liststore;
-
-  /**
-   * The plugin we used to edit the value.
-   */
-  struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
-
-  /**
-   * Name of the plugin library.
-   */
-  char *liblow;
-
-  /**
-   * Expiration time value (absolute or relative).
-   */
-  guint64 n_exp_time;
-
-  /**
-   * Offset of the record we are editing in the 'rd' list of 'ri'.
-   */
-  unsigned int off;
-
-  /**
-   * Flag indicating if the old record was in the namestore.
-   */
-  int old_record_in_namestore;
-
-  /**
-   * Type of the record.
-   */
-  uint32_t record_type;
-
-  /**
-   * Is this record 'public'?
-   */
-  gboolean n_public;
-
-  /**
-   * Is the expiration time relative?
-   */
-  gboolean n_is_relative;
-
-  /**
-   * Is this record a shadow record?
-   */
-  gboolean n_is_shadow;
-
-};
 
-static struct GNUNET_IDENTITY_Ego *currentAddressBookEgo;
+extern void
+GNUNET_CONVERSATION_GTK_log_message (const char *);
 
-char *currentlySelectedCallAddress;
+extern void
+do_call(const char*);
 
 #endif