rpms/gossip/devel gossip-dbus-crash.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gossip.spec, 1.22, 1.23 sources, 1.10, 1.11
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Thu Aug 3 20:23:01 UTC 2006
- Previous message (by thread): owners owners.list,1.1357,1.1358
- Next message (by thread): rpms/gossip/FC-5 gossip-dbus-crash.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gossip.spec, 1.20, 1.21 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18843
Modified Files:
.cvsignore gossip.spec sources
Added Files:
gossip-dbus-crash.patch
Log Message:
* Thu Aug 3 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-3
- Update to 0.13.
- Add patch to fix dbus crash.
- Minor changes to files section.
gossip-dbus-crash.patch:
--- NEW FILE gossip-dbus-crash.patch ---
diff -ur gossip-0.13.OLD/src/gossip-dbus.c gossip-0.13/src/gossip-dbus.c
--- gossip-0.13.OLD/src/gossip-dbus.c 2006-07-12 04:54:30.000000000 -0400
+++ gossip-0.13/src/gossip-dbus.c 2006-08-03 15:56:49.000000000 -0400
@@ -66,31 +66,33 @@
G_DEFINE_TYPE(GossipDBus, gossip_dbus, G_TYPE_OBJECT)
-gboolean gossip_dbus_set_presence (GossipDBus *obj,
- const char *state,
- const char *status,
- GError **error);
-gboolean gossip_dbus_set_not_away (GossipDBus *obj,
- GError **error);
-gboolean gossip_dbus_set_network_status (GossipDBus *obj,
- gboolean up,
- GError **error);
-gboolean gossip_dbus_set_roster_visible (GossipDBus *obj,
- gboolean visible,
- GError **error);
-gboolean gossip_dbus_get_roster_visible (GossipDBus *obj,
- gboolean *visible,
- GError **error);
-gboolean gossip_dbus_get_open_chats (GossipDBus *obj,
- char ***contacts,
- GError **error);
-gboolean gossip_dbus_send_message (GossipDBus *obj,
- const gchar *contact_id,
- GError **error);
-gboolean gossip_dbus_new_message (GossipDBus *obj,
- GError **error);
-gboolean gossip_dbus_toggle_roster (GossipDBus *obj,
- GError **error);
+static gboolean gossip_dbus_set_presence (GossipDBus *obj,
+ const char *state,
+ const char *status,
+ GError **error);
+static gboolean gossip_dbus_set_not_away (GossipDBus *obj,
+ GError **error);
+static gboolean gossip_dbus_set_network_status (GossipDBus *obj,
+ gboolean up,
+ GError **error);
+static gboolean gossip_dbus_set_roster_visible (GossipDBus *obj,
+ gboolean visible,
+ GError **error);
+static gboolean gossip_dbus_get_roster_visible (GossipDBus *obj,
+ gboolean *visible,
+ GError **error);
+static gboolean gossip_dbus_get_open_chats (GossipDBus *obj,
+ char ***contacts,
+ GError **error);
+static gboolean gossip_dbus_send_message (GossipDBus *obj,
+ const gchar *contact_id,
+ GError **error);
+static gboolean gossip_dbus_new_message (GossipDBus *obj,
+ GError **error);
+static gboolean gossip_dbus_toggle_roster (GossipDBus *obj,
+ GError **error);
+static void nm_proxy_notify_cb (gpointer data,
+ GObject *where_the_object_was);
#include "gossip-dbus-glue.h"
@@ -113,7 +115,7 @@
{
}
-gboolean
+static gboolean
gossip_dbus_set_presence (GossipDBus *obj,
const char *state,
const char *status,
@@ -150,7 +152,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_set_not_away (GossipDBus *obj,
GError **error)
{
@@ -160,7 +162,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_set_network_status (GossipDBus *obj,
gboolean up,
GError **error)
@@ -177,7 +179,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_set_roster_visible (GossipDBus *obj,
gboolean visible,
GError **error)
@@ -190,7 +192,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_get_roster_visible (GossipDBus *obj,
gboolean *visible,
GError **error)
@@ -202,7 +204,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_get_open_chats (GossipDBus *obj,
char ***contacts,
GError **error)
@@ -229,7 +231,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_send_message (GossipDBus *obj,
const gchar *contact_id,
GError **error)
@@ -252,7 +254,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_new_message (GossipDBus *obj,
GError **error)
{
@@ -262,7 +264,7 @@
return TRUE;
}
-gboolean
+static gboolean
gossip_dbus_toggle_roster (GossipDBus *obj,
GError **error)
{
@@ -346,11 +348,22 @@
void
gossip_dbus_finalize_for_session (void)
{
- g_object_unref (bus_proxy);
- g_object_unref (nm_proxy);
+ if (bus_proxy) {
+ g_object_unref (bus_proxy);
+ }
+
+ if (nm_proxy) {
+ g_object_weak_unref (G_OBJECT (nm_proxy), nm_proxy_notify_cb, NULL);
+ g_object_unref (nm_proxy);
+ }
+
+ if (gossip_dbus) {
+ g_object_unref (gossip_dbus);
+ }
- g_object_unref (gossip_dbus);
- g_object_unref (saved_session);
+ if (saved_session) {
+ g_object_unref (saved_session);
+ }
}
/*
@@ -465,11 +478,9 @@
}
static void
-nm_proxy_notify_cb (gpointer conn,
+nm_proxy_notify_cb (gpointer data,
GObject *where_the_object_was)
{
- dbus_connection_unref (conn);
-
nm_proxy = NULL;
nm_proxy_restart_retries = 5;
@@ -514,7 +525,7 @@
return FALSE;
}
- g_object_weak_ref (G_OBJECT (nm_proxy), nm_proxy_notify_cb, conn);
+ g_object_weak_ref (G_OBJECT (nm_proxy), nm_proxy_notify_cb, NULL);
dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, G_TYPE_UINT, G_TYPE_INVALID);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 26 Jul 2006 14:21:16 -0000 1.10
+++ .cvsignore 3 Aug 2006 20:23:01 -0000 1.11
@@ -1 +1 @@
-gossip-0.12.tar.bz2
+gossip-0.13.tar.bz2
Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gossip.spec 26 Jul 2006 14:21:16 -0000 1.22
+++ gossip.spec 3 Aug 2006 20:23:01 -0000 1.23
@@ -1,14 +1,15 @@
%define with_dbus 1
Name: gossip
-Version: 0.12
+Version: 0.13
Release: 3%{?dist}
Summary: Gnome Jabber Client
Group: Applications/Communications
License: GPL
-URL: http://www.imendio.com/projects/gossip/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+URL: http://www.imendio.com/projects/gossip/
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0: %{name}-dbus-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: loudmouth-devel >= 1.0
@@ -43,6 +44,7 @@
%prep
%setup -q
+%patch0 -p1 -b .dbus
%build
@@ -114,23 +116,21 @@
%{_bindir}/%{name}
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_sysconfdir}/sound/events/%{name}.soundlist
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.glade
-%{_datadir}/%{name}/*.png
-%{_datadir}/%{name}/*.dtd
-%{_datadir}/%{name}/%{name}-log.xsl
-%dir %{_datadir}/%{name}/protocols
-%{_datadir}/%{name}/protocols/*
-%dir %{_datadir}/sounds/%{name}
-%{_datadir}/sounds/%{name}/*.wav
+%{_datadir}/%{name}/
+%{_datadir}/sounds/%{name}/
%{_datadir}/omf/%{name}/
%{_datadir}/gnome/help/%{name}/
%changelog
+* Thu Aug 3 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-3
+- Update to 0.13.
+- Add patch to fix dbus crash.
+- Minor changes to files section.
+
* Wed Jul 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12-3
- Update to 0.12.
- Hold off from building peekaboo applet until it's more stable.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 26 Jul 2006 14:21:16 -0000 1.10
+++ sources 3 Aug 2006 20:23:01 -0000 1.11
@@ -1 +1 @@
-8ab6249e719cff70ea61cbe83171f78b gossip-0.12.tar.bz2
+d690a8f78e847ed3bbbb2fd183d17582 gossip-0.13.tar.bz2
- Previous message (by thread): owners owners.list,1.1357,1.1358
- Next message (by thread): rpms/gossip/FC-5 gossip-dbus-crash.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gossip.spec, 1.20, 1.21 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list