Changeset 2100

Show
Ignore:
Timestamp:
08/09/05 00:01:38
Author:
chipx86
Message:

Several fixups from on the train today.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libgalago/glib-port/ChangeLog

    r2095 r2100  
     1Mon Aug 08 23:59:26 PDT 2005  Christian Hammond <chipx86@chipx86.com> 
     2 
     3    * libgalago/galago-account.c: 
     4    * libgalago/galago-account.h: 
     5    * libgalago/galago-assert.h: 
     6    * libgalago/galago-avatar.c: 
     7    * libgalago/galago-avatar.h: 
     8    * libgalago/galago-context-base.h: 
     9    * libgalago/galago-context.c: 
     10    * libgalago/galago-context.h: 
     11    * libgalago/galago-context-priv.h: 
     12    * libgalago/galago-core.c: 
     13    * libgalago/galago-core.h: 
     14    * libgalago/galago-dbus.c: 
     15    * libgalago/galago-dbus-compat.h: 
     16    * libgalago/galago-dbus.h: 
     17    * libgalago/galago.h: 
     18    * libgalago/galago-image.c: 
     19    * libgalago/galago-image.h: 
     20    * libgalago/galago-log.c: 
     21    * libgalago/galago-log.h: 
     22    * libgalago/galago-object.c: 
     23    * libgalago/galago-object.h: 
     24    * libgalago/galago-person.c: 
     25    * libgalago/galago-person.h: 
     26    * libgalago/galago-photo.c: 
     27    * libgalago/galago-photo.h: 
     28    * libgalago/galago-presence.c: 
     29    * libgalago/galago-presence.h: 
     30    * libgalago/galago-private.h: 
     31    * libgalago/galago-service.c: 
     32    * libgalago/galago-service.h: 
     33    * libgalago/galago-status.c: 
     34    * libgalago/galago-status.h: 
     35    * libgalago/galago-value.c: 
     36    * libgalago/galago-value.h: 
     37      - Several fixups from on the train today. 
     38 
    139Sat Jul 30 16:38:05 PDT 2005  Christian Hammond <chipx86@chipx86.com> 
    240 
  • branches/libgalago/glib-port/libgalago/galago-account.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
     
    6666 * Object initialization 
    6767 **************************************************************************/ 
     68static void galago_account_dispose(GObject *gobject); 
    6869static void galago_account_finalize(GObject *gobject); 
    6970static void galago_account_dbus_message_append(DBusMessageIter *iter, 
     
    8788    object_class->dbus_interface = GALAGO_DBUS_ACCOUNT_INTERFACE; 
    8889 
     90    gobject_class->dispose  = galago_account_dispose; 
    8991    gobject_class->finalize = galago_account_finalize; 
    9092 
     
    171173 
    172174static void 
    173 galago_account_finalize(GObject *object) 
     175galago_account_dispose(GObject *object) 
    174176{ 
    175177    GalagoAccount *account = (GalagoAccount *)object; 
     
    185187 
    186188    if (person != NULL) 
     189    { 
    187190        galago_person_remove_account(person, account); 
     191        account->priv->person = NULL; 
     192    } 
    188193 
    189194    if (account->priv->presence != NULL) 
    190195    { 
     196        g_object_unref(account->priv->presence); 
     197        account->priv->presence = NULL; 
     198    } 
     199 
     200    if (account->priv->avatar != NULL) 
     201    { 
     202        g_object_unref(account->priv->avatar); 
     203        account->priv->avatar = NULL; 
     204    } 
     205 
     206    G_OBJECT_CLASS(parent_class)->dispose(object); 
     207} 
     208 
     209static void 
     210galago_account_finalize(GObject *object) 
     211{ 
     212    GalagoAccount *account = (GalagoAccount *)object; 
     213 
     214    g_return_if_fail(account != NULL); 
     215 
     216#if 0 
     217    service = galago_account_get_service(account); 
     218    person  = galago_account_get_person(account); 
     219 
     220    galago_service_remove_account(service, account); 
     221 
     222    if (person != NULL) 
     223        galago_person_remove_account(person, account); 
     224 
     225    if (account->priv->presence != NULL) 
     226    { 
    191227        GalagoPresence *presence = account->priv->presence; 
    192228 
     
    204240        g_object_unref(avatar); 
    205241    } 
     242#endif 
    206243 
    207244    g_hash_table_destroy(account->priv->contacts_table); 
  • branches/libgalago/glib-port/libgalago/galago-account.h

    r1980 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-assert.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond. 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-avatar.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-avatar.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-context-base.h

    r1956 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-context-priv.h

    r1956 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-context.c

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-context.h

    r1956 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-core.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-core.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-dbus-compat.h

    r2044 r2100  
    44 * @Copyright (C) 2005 Christian Hammond. 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-dbus.c

    r2095 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond. 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-dbus.h

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond. 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-image.c

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-image.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-log.c

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-log.h

    r1956 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-object.c

    r2090 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
     
    2626#include <string.h> 
    2727 
     28struct _GalagoObjectPrivate 
     29{ 
     30    GalagoContext *context; 
     31 
     32    char *dbus_path; 
     33 
     34    gboolean watched : 1; 
     35    gboolean in_destruction : 1; 
     36}; 
     37 
    2838struct _GalagoObjectClassPrivate 
    2939{ 
    3040    char *dbus_iface; 
    31 }; 
    32  
    33 struct _GalagoObjectPrivate 
    34 { 
    35     GalagoContext *context; 
    36  
    37     char *dbus_path; 
    38     gboolean watched; 
    3941}; 
    4042 
     
    4547}; 
    4648 
     49enum 
     50{ 
     51    DESTROY, 
     52    LAST_SIGNAL 
     53}; 
     54 
     55static void galago_object_dispose(GObject *gobject); 
    4756static void galago_object_finalize(GObject *gobject); 
     57static void galago_object_real_destroy(GalagoObject *object); 
    4858static void galago_object_set_property(GObject *gobject, guint prop_id, 
    4959                                       const GValue *value, GParamSpec *pspec); 
     
    5262 
    5363static GObjectClass *parent_class = NULL; 
     64static guint signals[LAST_SIGNAL] = {0}; 
    5465 
    5566G_DEFINE_TYPE(GalagoObject, galago_object, G_TYPE_OBJECT); 
     
    6273    parent_class = g_type_class_peek_parent(klass); 
    6374 
     75    klass->destroy = galago_object_real_destroy; 
     76 
     77    gobject_class->dispose      = galago_object_dispose; 
    6478    gobject_class->finalize     = galago_object_finalize; 
    6579    gobject_class->set_property = galago_object_set_property; 
    6680    gobject_class->get_property = galago_object_get_property; 
     81 
     82    signals[DESTROY] = 
     83        g_signal_new("destroy", 
     84                     G_TYPE_FROM_CLASS(klass), 
     85                     G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | 
     86                     G_SIGNAL_NO_HOOKS, 
     87                     G_STRUCT_OFFSET(GalagoObjectClass, destroy), 
     88                     NULL, NULL, 
     89                     g_cclosure_marshal_VOID__VOID, 
     90                     G_TYPE_NONE, 0); 
    6791 
    6892    g_object_class_install_property(gobject_class, PROP_CONTEXT, 
     
    80104 
    81105static void 
     106galago_object_dispose(GObject *gobject) 
     107{ 
     108    GalagoObject *object = GALAGO_OBJECT(gobject); 
     109 
     110    galago_log_info("object_dispose(%p)\n", gobject); 
     111 
     112    if (!object->priv->in_destruction) 
     113    { 
     114        object->priv->in_destruction = TRUE; 
     115 
     116        g_signal_emit(object, signals[DESTROY], 0); 
     117 
     118        object->priv->in_destruction = FALSE; 
     119    } 
     120 
     121    if (G_OBJECT_CLASS(parent_class)->dispose != NULL) 
     122        G_OBJECT_CLASS(parent_class)->dispose(gobject); 
     123} 
     124 
     125static void 
    82126galago_object_finalize(GObject *gobject) 
    83127{ 
    84     GalagoObject *object = (GalagoObject *)gobject
     128    GalagoObject *object = GALAGO_OBJECT(gobject)
    85129 
    86130    if (object->priv != NULL) 
    87131        g_free(object->priv); 
    88132 
    89     G_OBJECT_CLASS(parent_class)->finalize(gobject); 
     133    if (G_OBJECT_CLASS(parent_class)->finalize != NULL) 
     134        G_OBJECT_CLASS(parent_class)->finalize(gobject); 
     135
     136 
     137static void 
     138galago_object_real_destroy(GalagoObject *object) 
     139
     140    g_signal_handlers_destroy(object); 
    90141} 
    91142 
  • branches/libgalago/glib-port/libgalago/galago-object.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
     
    3535#include <libgalago/galago-context-base.h> 
    3636 
    37  
    38 /** 
    39  * A class. 
    40  */ 
    41 struct _GalagoObjectClass 
    42 { 
    43     GObjectClass parent_class; 
    44  
    45     const char *dbus_interface; 
    46  
    47     GalagoObjectClassPrivate *priv; 
    48  
    49     /* vtable */ 
    50     void (*dbus_message_append)(DBusMessageIter *iter, 
    51                                 const GalagoObject *object); 
    52     void *(*dbus_message_get)(DBusMessageIter *iter); 
    53     void (*dbus_push_full)(GalagoObject *object); 
    54  
    55     void (*reserved_1)(void); 
    56     void (*reserved_2)(void); 
    57     void (*reserved_3)(void); 
    58     void (*reserved_4)(void); 
    59 }; 
    60  
    6137/** 
    6238 * An object. 
     
    7450}; 
    7551 
     52/** 
     53 * A class. 
     54 */ 
     55struct _GalagoObjectClass 
     56{ 
     57    GObjectClass parent_class; 
     58 
     59    const char *dbus_interface; 
     60 
     61    GalagoObjectClassPrivate *priv; 
     62 
     63    /* Virtual functions */ 
     64    void (*dbus_message_append)(DBusMessageIter *iter, 
     65                                const GalagoObject *object); 
     66    void *(*dbus_message_get)(DBusMessageIter *iter); 
     67    void (*dbus_push_full)(GalagoObject *object); 
     68 
     69    /* Signals */ 
     70    void (*destroy)(GalagoObject *object); 
     71 
     72    void (*reserved_1)(void); 
     73    void (*reserved_2)(void); 
     74    void (*reserved_3)(void); 
     75    void (*reserved_4)(void); 
     76}; 
    7677 
    7778#define GALAGO_TYPE_OBJECT (galago_object_get_type()) 
  • branches/libgalago/glib-port/libgalago/galago-person.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
     
    392392        person->priv->photo = NULL; 
    393393 
     394        galago_log_info("Unreffing photo %p\n", old_photo); 
    394395        g_object_unref(old_photo); 
    395396    } 
  • branches/libgalago/glib-port/libgalago/galago-person.h

    r1980 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-photo.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-photo.h

    r1972 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-presence.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
     
    6565 * Object/Class support 
    6666 **************************************************************************/ 
    67 static void galago_presence_finalize(GObject *object); 
     67static void galago_presence_destroy(GalagoObject *object); 
    6868static void galago_presence_dbus_message_append(DBusMessageIter *iter, 
    6969                                             const GalagoObject *object); 
     
    7878galago_presence_class_init(GalagoPresenceClass *klass) 
    7979{ 
    80     GObjectClass      *gobject_class = G_OBJECT_CLASS(klass); 
    81     GalagoObjectClass *object_class = GALAGO_OBJECT_CLASS(klass); 
     80    GObjectClass *gobject_class    = G_OBJECT_CLASS(klass); 
     81    GalagoObjectClass *object_class = GALAGO_OBJECT_CLASS(klass); 
    8282 
    8383    parent_class = g_type_class_peek_parent(klass); 
    8484 
    85     object_class->dbus_interface = GALAGO_DBUS_PHOTO_INTERFACE; 
    86  
     85    gobject_class->dispose  = galago_presence_dispose; 
     86    gobject_class->finalize = galago_presence_finalize; 
     87 
     88    object_class->dbus_interface = GALAGO_DBUS_PRESENCE_INTERFACE; 
     89 
     90    object_class->destroy             = galago_presence_destroy; 
    8791    object_class->dbus_message_append = galago_presence_dbus_message_append; 
    8892    object_class->dbus_message_get    = galago_presence_dbus_message_get; 
    8993 
    90     gobject_class->finalize = galago_presence_finalize; 
    91  
    9294    signals[IDLE_CHANGED] = 
    93         g_signal_new("idle-changed", 
     95        g_signal_new("idle_changed", 
    9496                     G_TYPE_FROM_CLASS(klass), 
    9597                     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 
     
    102104 
    103105    signals[STATUS_ADDED] = 
    104         g_signal_new("status-added", 
     106        g_signal_new("status_added", 
    105107                     G_TYPE_FROM_CLASS(klass), 
    106108                     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 
     
    112114 
    113115    signals[STATUS_REMOVED] = 
    114         g_signal_new("status-removed", 
     116        g_signal_new("status_removed", 
    115117                     G_TYPE_FROM_CLASS(klass), 
    116118                     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 
     
    122124 
    123125    signals[STATUS_UPDATED] = 
    124         g_signal_new("status-updated", 
     126        g_signal_new("status_updated", 
    125127                     G_TYPE_FROM_CLASS(klass), 
    126128                     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 
     
    140142 
    141143static void 
    142 galago_presence_finalize(GObject *object) 
    143 { 
    144     GalagoPresence *presence = (GalagoPresence *)object
     144galago_presence_dispose(GalagoObject *object) 
     145{ 
     146    GalagoPresence *presence = GALAGO_PRESENCE(object)
    145147    GalagoAccount *account; 
    146148 
     149    galago_log_info("presence_dispose(%p)\n", object); 
     150 
    147151    account = galago_presence_get_account(presence); 
    148152 
    149     if (galago_account_get_presence(account, FALSE) == presence) 
     153    if (account != NULL && 
     154        galago_account_get_presence(account, FALSE) == presence) 
     155    { 
    150156        galago_account_set_presence(account, NULL); 
     157    } 
    151158 
    152159    if (presence->priv->statuses != NULL) 
    153160    { 
    154         g_list_foreach(presence->priv->statuses, 
    155                        (GFunc)g_object_unref, NULL); 
     161        g_list_foreach(presence->priv->statuses, (GFunc)g_object_unref, NULL); 
    156162        g_list_free(presence->priv->statuses); 
    157     } 
     163        presence->priv->statuses = NULL; 
     164    } 
     165 
     166    if (G_OBJECT_CLASS(parent_class)->dispose != NULL) 
     167        G_OBJECT_CLASS(parent_class)->dispose(object); 
     168
     169 
     170static void 
     171galago_presence_finalize(GalagoObject *object) 
     172
     173    GalagoPresence *presence = GALAGO_PRESENCE(object); 
     174 
     175    galago_log_info("presence_finalize(%p)\n", object); 
    158176 
    159177    g_free(presence->priv); 
    160178 
    161     G_OBJECT_CLASS(parent_class)->finalize(object); 
     179    if (G_OBJECT_CLASS(parent_class)->finalize != NULL) 
     180        G_OBJECT_CLASS(parent_class)->finalize(object); 
    162181} 
    163182 
  • branches/libgalago/glib-port/libgalago/galago-presence.h

    r1979 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-private.h

    r1956 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-service.c

    r2094 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-service.h

    r1975 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-status.c

    r1977 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-status.h

    r1977 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-value.c

    r1973 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago-value.h

    r1974 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either 
  • branches/libgalago/glib-port/libgalago/galago.h

    r1980 r2100  
    44 * @Copyright (C) 2004-2005 Christian Hammond. 
    55 * 
    6  * This library is g_free software; you can redistribute it and/or 
     6 * This library is free software; you can redistribute it and/or 
    77 * modify it under the terms of the GNU Lesser General Public 
    88 * License as published by the Free Software Foundation; either