File gnome-presence-applet-svn.patch of Package gnome-presence-applet
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/.todo gnome-presence-applet/.todo
--- gnome-presence-applet-0.3.1/.todo 1970-01-01 01:00:00.000000000 +0100
+++ gnome-presence-applet/.todo 2006-09-19 00:49:30.000000000 +0200
@@ -0,0 +1,9 @@
+<!-- Automagically generated by the ToDo program on Sun Jul 11 13:36:24 2004 -->
+<todo version="0.1.17">
+ <note priority="high" time="1089578171">
+ Move from displaying accounts to displaying people.
+ </note>
+ <note priority="medium" time="1089578184">
+ Create an icon
+ </note>
+</todo>
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/ChangeLog gnome-presence-applet/ChangeLog
--- gnome-presence-applet-0.3.1/ChangeLog 2005-05-27 06:36:04.000000000 +0200
+++ gnome-presence-applet/ChangeLog 2006-09-19 00:49:30.000000000 +0200
@@ -1,3 +1,45 @@
+Mon Feb 13 00:26:32 PST 2006 Christian Hammond <chipx86@chipx86.com>
+
+ D debian:
+ D debian/changelog:
+ D debian/compat:
+ D debian/control:
+ D debian/copyright:
+ D debian/docs:
+ D debian/gnome-presence-applet.dirs:
+ D debian/gnome-presence-applet.install:
+ D debian/Makefile.am:
+ D debian/rules:
+ * configure.ac:
+ * Makefile.am:
+ - Remove the debian directory.
+
+Fri Jan 27 01:18:45 PST 2006 Christian Hammond <chipx86@chipx86.com>
+
+ * src/gnome-presence-applet.c:
+ * src/gnome-presence-applet.h:
+ * src/prefs-dialog.c:
+ * src/prefs-dialog.h:
+ * src/utils.c:
+ * src/utils.h:
+ - Add GPL license headers to the top of each file.
+
+Mon Nov 07 01:46:26 PST 2005 Christian Hammond <chipx86@chipx86.com>
+
+ * src/gnome-presence-applet.c:
+ * src/prefs-dialog.c:
+ * src/utils.c:
+ * configure.ac:
+ - Updated for all the various API changes.
+
+Sat Oct 08 14:33:25 EDT 2005 Christian Hammond <chipx86@chipx86.com>
+
+ * src/prefs-dialog.c:
+ - Display an error when we can't load a person in the prefs dialog,
+ instead of populating the entry with garbage and then crashing.
+
+==================== 0.3.1 ====================
+
Thu May 26 21:35:55 PDT 2005 Christian Hammond <chipx86@chipx86.com>
* debian/changelog:
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/Makefile.am gnome-presence-applet/Makefile.am
--- gnome-presence-applet-0.3.1/Makefile.am 2005-04-03 11:56:16.000000000 +0200
+++ gnome-presence-applet/Makefile.am 2006-09-19 00:49:30.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = autopackage data debian po src
+SUBDIRS = autopackage data po src
EXTRA_DIST = \
AUTHORS NEWS INSTALL COPYING \
Only in gnome-presence-applet-0.3.1: Makefile.in
Only in gnome-presence-applet-0.3.1: aclocal.m4
Only in gnome-presence-applet-0.3.1/autopackage: Makefile.in
Only in gnome-presence-applet-0.3.1: config.guess
Only in gnome-presence-applet-0.3.1: config.h.in
Only in gnome-presence-applet-0.3.1: config.sub
Only in gnome-presence-applet-0.3.1: configure
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/configure.ac gnome-presence-applet/configure.ac
--- gnome-presence-applet-0.3.1/configure.ac 2005-05-27 06:34:10.000000000 +0200
+++ gnome-presence-applet/configure.ac 2006-09-19 00:49:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl ################################################################
dnl # Initialize autoconf
dnl ################################################################
-AC_INIT(gnome-presence-applet, 0.3.1, chipx86@gnupdate.org)
+AC_INIT(gnome-presence-applet, 0.3.1.90, chipx86@gnupdate.org)
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(config.h.in)
AC_COPYRIGHT([Copyright 2004-2005 Christian Hammond])
@@ -14,7 +14,7 @@
GNOME_PRESENCE_APPLET_MAJOR_VERSION=0
GNOME_PRESENCE_APPLET_MINOR_VERSION=3
GNOME_PRESENCE_APPLET_MICRO_VERSION=1
-GNOME_PRESENCE_APPLET_DEVEL_VERSION=0
+GNOME_PRESENCE_APPLET_DEVEL_VERSION=90
GNOME_PRESENCE_APPLET_VERSION=$GNOME_PRESENCE_APPLET_MAJOR_VERSION.$GNOME_PRESENCE_APPLET_MINOR_VERSION.$GNOME_PRESENCE_APPLET_MICRO_VERSION
@@ -100,7 +100,6 @@
autopackage/Makefile
autopackage/default.apspec
data/Makefile
-debian/Makefile
po/Makefile.in
src/Makefile
])
Only in gnome-presence-applet-0.3.1/data: Makefile.in
Only in gnome-presence-applet-0.3.1: debian
Only in gnome-presence-applet-0.3.1: gnome-presence-applet.spec
Only in gnome-presence-applet-0.3.1: install-sh
Only in gnome-presence-applet-0.3.1: intltool-extract.in
Only in gnome-presence-applet-0.3.1: intltool-merge.in
Only in gnome-presence-applet-0.3.1: intltool-update.in
Only in gnome-presence-applet-0.3.1: missing
Only in gnome-presence-applet-0.3.1/po: Makefile.in.in
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/po/POTFILES.skip gnome-presence-applet/po/POTFILES.skip
--- gnome-presence-applet-0.3.1/po/POTFILES.skip 1970-01-01 01:00:00.000000000 +0100
+++ gnome-presence-applet/po/POTFILES.skip 2006-09-19 00:49:30.000000000 +0200
@@ -0,0 +1 @@
+data/GNOME_PresenceApplet.server.in
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/po/da.po gnome-presence-applet/po/da.po
--- gnome-presence-applet-0.3.1/po/da.po 1970-01-01 01:00:00.000000000 +0100
+++ gnome-presence-applet/po/da.po 2006-09-19 00:49:30.000000000 +0200
@@ -0,0 +1,103 @@
+# Danish translation of gnome-presence-applet.
+# Copyright (C) 2005 Christian Hammond
+# This file is distributed under the same license as the gnome-presence-applet package.
+# Mark Rosenstand <mark@borkware.net>, 2005.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-presence-applet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-03-07 21:48-0800\n"
+"PO-Revision-Date: 2005-09-26 01:33+0200\n"
+"Last-Translator: Mark Rosenstand <mark@borkware.net>\n"
+"Language-Team: Danish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:1
+msgid "Accessories"
+msgstr "Tilbehør"
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:2
+msgid "Keep watch on the presence of other people"
+msgstr "Hold øje med andres tilstedeværelse"
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:3
+msgid "Presence Applet Factory"
+msgstr "Tilstedeværelsesapplet-fabrik"
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:4
+msgid "Presence Monitor"
+msgstr "Tilstedeværelsesmonitor"
+
+#: ../data/GNOME_PresenceApplet.xml.h:1
+msgid "_About..."
+msgstr "_Omkring..."
+
+#: ../data/GNOME_PresenceApplet.xml.h:2
+msgid "_Preferences..."
+msgstr "_Indstillinger..."
+
+#: ../data/gnome-presence-applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../data/gnome-presence-applet.glade.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Display</b>"
+
+#: ../data/gnome-presence-applet.glade.h:3
+msgid "General"
+msgstr "Generelt"
+
+#: ../data/gnome-presence-applet.glade.h:4
+msgid "People"
+msgstr "Folk"
+
+#: ../data/gnome-presence-applet.glade.h:5
+msgid "Presence Monitor Preferences"
+msgstr "Indstillinger for statusovervågning"
+
+#: ../data/gnome-presence-applet.glade.h:6
+msgid "Show _idle times"
+msgstr "Vis tider for _inaktivitet"
+
+#: ../data/gnome-presence-applet.glade.h:7
+msgid "_All people:"
+msgstr "_Alle folk:"
+
+#: ../data/gnome-presence-applet.glade.h:8
+msgid "_Dim idle people"
+msgstr "_Dæmp inaktive folk"
+
+#: ../data/gnome-presence-applet.glade.h:9
+msgid "_Monitored people:"
+msgstr "_Overvågede folk:"
+
+#: ../data/gnome-presence-applet.schemas.in.h:1
+msgid "Actively displayed account"
+msgstr "Aktivt vist konto"
+
+#: ../data/gnome-presence-applet.schemas.in.h:2
+msgid "Dim idle accounts"
+msgstr "Dæmp inaktive konti"
+
+#: ../data/gnome-presence-applet.schemas.in.h:3
+msgid "Monitored accounts"
+msgstr "Overvågede konti"
+
+#: ../data/gnome-presence-applet.schemas.in.h:4
+msgid "Show idle time"
+msgstr "Vis tider for inaktivtet"
+
+#: ../src/gnome-presence-applet.c:242
+msgid "Presence Monitor Applet"
+msgstr "Statusovervågnings-applet"
+
+#: ../src/gnome-presence-applet.c:244
+msgid "An applet to help keep watch on the presence of other people."
+msgstr "En applet til at hjælpe med at overvåge andres tilstedeværelse."
+
Only in gnome-presence-applet-0.3.1/po: fr.gmo
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/po/gnome-presence-applet.pot gnome-presence-applet/po/gnome-presence-applet.pot
--- gnome-presence-applet-0.3.1/po/gnome-presence-applet.pot 1970-01-01 01:00:00.000000000 +0100
+++ gnome-presence-applet/po/gnome-presence-applet.pot 2006-09-19 00:49:30.000000000 +0200
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-03-07 21:48-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:1
+msgid "Accessories"
+msgstr ""
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:2
+msgid "Keep watch on the presence of other people"
+msgstr ""
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:3
+msgid "Presence Applet Factory"
+msgstr ""
+
+#: ../data/GNOME_PresenceApplet.server.in.in.h:4
+msgid "Presence Monitor"
+msgstr ""
+
+#: ../data/GNOME_PresenceApplet.xml.h:1
+msgid "_About..."
+msgstr ""
+
+#: ../data/GNOME_PresenceApplet.xml.h:2
+msgid "_Preferences..."
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:2
+msgid "<b>Display</b>"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:3
+msgid "General"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:4
+msgid "People"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:5
+msgid "Presence Monitor Preferences"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:6
+msgid "Show _idle times"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:7
+msgid "_All people:"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:8
+msgid "_Dim idle people"
+msgstr ""
+
+#: ../data/gnome-presence-applet.glade.h:9
+msgid "_Monitored people:"
+msgstr ""
+
+#: ../data/gnome-presence-applet.schemas.in.h:1
+msgid "Actively displayed account"
+msgstr ""
+
+#: ../data/gnome-presence-applet.schemas.in.h:2
+msgid "Dim idle accounts"
+msgstr ""
+
+#: ../data/gnome-presence-applet.schemas.in.h:3
+msgid "Monitored accounts"
+msgstr ""
+
+#: ../data/gnome-presence-applet.schemas.in.h:4
+msgid "Show idle time"
+msgstr ""
+
+#: ../src/gnome-presence-applet.c:242
+msgid "Presence Monitor Applet"
+msgstr ""
+
+#: ../src/gnome-presence-applet.c:244
+msgid "An applet to help keep watch on the presence of other people."
+msgstr ""
Only in gnome-presence-applet-0.3.1/po: pt_BR.gmo
Only in gnome-presence-applet-0.3.1/src: Makefile.in
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/gnome-presence-applet.c gnome-presence-applet/src/gnome-presence-applet.c
--- gnome-presence-applet-0.3.1/src/gnome-presence-applet.c 2005-05-22 20:30:34.000000000 +0200
+++ gnome-presence-applet/src/gnome-presence-applet.c 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -65,7 +83,7 @@
char *uid = (char *)sl->data;
GtkWidget *menu_item;
- person = galago_core_get_person(uid, FALSE, TRUE);
+ person = galago_get_person(uid, FALSE, TRUE);
g_free(uid);
@@ -199,7 +217,7 @@
if (uid == NULL)
return;
- person = galago_core_get_person(uid, FALSE, TRUE);
+ person = galago_get_person(uid, FALSE, TRUE);
g_free(uid);
@@ -258,8 +276,10 @@
gconf_client_notify_remove(applet->gconf_client,
applet->people_monitored_id);
- galago_signals_disconnect_by_id(applet->galago_registered_id);
- galago_signals_disconnect_by_id(applet->person_added_id);
+ g_signal_handler_disconnect(galago_get_core(),
+ applet->galago_registered_id);
+ g_signal_handler_disconnect(galago_get_core(),
+ applet->person_added_id);
if (applet->people_table != NULL)
{
@@ -322,10 +342,9 @@
rebuild_menu(applet);
}
-/* I hate all of this. PPOs will make this better, if they happen. */
static void
-person_added_cb(GalagoService *service, const char *signal,
- GalagoPerson *person, PresenceApplet *applet)
+person_added_cb(GalagoObject *core, GalagoPerson *person,
+ PresenceApplet *applet)
{
if (applet->people_table == NULL)
return;
@@ -338,7 +357,7 @@
}
static void
-galago_registered_cb(void *ptr, const char *signal, PresenceApplet *applet)
+galago_registered_cb(GalagoObject *core, PresenceApplet *applet)
{
rebuild_menu(applet);
set_default_person(applet);
@@ -351,7 +370,7 @@
GtkWidget *hbox;
char *key;
- if (!galago_glib_init("gnome-presence-applet", FALSE, NULL))
+ if (!galago_init("gnome-presence-applet", FALSE))
{
GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(panel_applet));
GtkWidget *dialog = gtk_message_dialog_new(
@@ -404,7 +423,7 @@
galago_gtk_presence_icon_set_size(GALAGO_GTK_PRESENCE_ICON(applet->icon),
GTK_ICON_SIZE_MENU);
galago_gtk_presence_icon_set_precedence(
- GALAGO_GTK_PRESENCE_ICON(applet->icon), GALAGO_GTK_ICON_PHOTO);
+ GALAGO_GTK_PRESENCE_ICON(applet->icon), GALAGO_GTK_ICON_PROTOCOL);
gtk_box_pack_start(GTK_BOX(hbox), applet->icon, FALSE, FALSE, 0);
gtk_widget_show(applet->icon);
@@ -473,13 +492,13 @@
/* Listen for register signals. */
applet->galago_registered_id =
- galago_signal_connect(galago_get_core(), "registered",
- GALAGO_CALLBACK(galago_registered_cb), applet);
+ g_signal_connect(G_OBJECT(galago_get_core()), "registered",
+ G_CALLBACK(galago_registered_cb), applet);
/* Listen for person-added signals. */
applet->person_added_id =
- galago_signal_connect(galago_get_core(), "person-added",
- GALAGO_CALLBACK(person_added_cb), applet);
+ g_signal_connect(G_OBJECT(galago_get_core()), "person-added",
+ G_CALLBACK(person_added_cb), applet);
return TRUE;
}
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/gnome-presence-applet.h gnome-presence-applet/src/gnome-presence-applet.h
--- gnome-presence-applet-0.3.1/src/gnome-presence-applet.h 2005-05-16 01:14:59.000000000 +0200
+++ gnome-presence-applet/src/gnome-presence-applet.h 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#ifndef _GNOME_PRESENCE_APPLET_H_
#define _GNOME_PRESENCE_APPLET_H_
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/prefs-dialog.c gnome-presence-applet/src/prefs-dialog.c
--- gnome-presence-applet-0.3.1/src/prefs-dialog.c 2005-05-16 01:15:00.000000000 +0200
+++ gnome-presence-applet/src/prefs-dialog.c 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#include "prefs-dialog.h"
#include <panel-applet-gconf.h>
@@ -112,6 +130,10 @@
const char *display_name;
GdkPixbuf *pixbuf = NULL;
+ g_return_if_fail(store != NULL);
+ g_return_if_fail(iter != NULL);
+ g_return_if_fail(person != NULL);
+
account = galago_person_get_priority_account(person);
if (account != NULL)
@@ -279,7 +301,7 @@
static void
destroy_cb(GtkWidget *window, PrefsDialog *dialog)
{
- const GalagoList *l, *l2, *l2_next;
+ GList *l, *l2, *l2_next;
GalagoService *service;
GalagoAccount *account;
@@ -288,7 +310,7 @@
gconf_client_notify_remove(dialog->applet->gconf_client,
dialog->dim_idle_id);
- for (l = galago_core_get_services(FALSE, FALSE); l != NULL; l = l->next)
+ for (l = galago_get_services(FALSE, FALSE); l != NULL; l = l->next)
{
service = (GalagoService *)l->data;
@@ -300,7 +322,7 @@
l2_next = l2->next;
- galago_object_unref(account);
+ g_object_unref(account);
}
}
@@ -422,7 +444,7 @@
set_values(PrefsDialog *dialog)
{
GSList *slist, *sl;
- const GalagoList *l;
+ GList *l;
GtkTreeIter iter;
GtkWidget *checkbox;
char *key;
@@ -473,17 +495,24 @@
const char *display_name;
char *account_name = NULL, *service_id = NULL;
- person = galago_core_get_person(str, FALSE, TRUE);
+ person = galago_get_person(str, FALSE, TRUE);
+
+ if (person == NULL)
+ {
+ galago_log_error("Unable to retrieve information for "
+ "person with ID '%s'\n",
+ str);
+ continue;
+ }
- if (person != NULL)
- account = galago_person_get_priority_account(person);
+ account = galago_person_get_priority_account(person);
if (account != NULL)
{
pixbuf = galago_gdk_pixbuf_new_from_account_with_size(account,
GTK_ICON_SIZE_MENU);
- galago_object_ref(account);
+ g_object_unref(account);
}
display_name = galago_person_get_display_name(person);
@@ -512,7 +541,7 @@
/* Set our list of all known people. */
- for (l = galago_core_get_people(FALSE, TRUE); l != NULL; l = l->next)
+ for (l = galago_get_people(FALSE, TRUE); l != NULL; l = l->next)
{
const char *display_name = NULL;
GalagoPerson *person = (GalagoPerson *)l->data;
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/prefs-dialog.h gnome-presence-applet/src/prefs-dialog.h
--- gnome-presence-applet-0.3.1/src/prefs-dialog.h 2005-05-16 01:14:59.000000000 +0200
+++ gnome-presence-applet/src/prefs-dialog.h 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#ifndef _PREFS_DIALOG_H_
#define _PREFS_DIALOG_H_
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/utils.c gnome-presence-applet/src/utils.c
--- gnome-presence-applet-0.3.1/src/utils.c 2005-05-16 01:14:59.000000000 +0200
+++ gnome-presence-applet/src/utils.c 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#include "utils.h"
#include <glib.h>
#include <string.h>
@@ -41,7 +59,7 @@
account_name = c + 1;
- service = galago_core_get_service(service_id, FALSE, TRUE);
+ service = galago_get_service(service_id, FALSE, TRUE);
if (service == NULL)
{
diff -ur --unidirectional-new-file gnome-presence-applet-0.3.1/src/utils.h gnome-presence-applet/src/utils.h
--- gnome-presence-applet-0.3.1/src/utils.h 2005-05-16 01:14:59.000000000 +0200
+++ gnome-presence-applet/src/utils.h 2006-09-19 00:49:29.000000000 +0200
@@ -1,3 +1,21 @@
+/**
+ * Copyright (C) 2004-2006 Christian Hammond
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
#ifndef _UTILS_H_
#define _UTILS_H_
