rpms/gaim-meanwhile/devel gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, NONE, 1.1 gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, NONE, 1.1 gaim-2.0.0beta5-debian-04_blist-memleak.patch, NONE, 1.1 gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, NONE, 1.1 gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, NONE, 1.1 gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch, NONE, 1.1 gaim-2.0.0beta5-silc-edit-account-crash.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gaim-meanwhile.spec, 1.16, 1.17 sources, 1.10, 1.11
Joshua W. Boyer (jwboyer)
fedora-extras-commits at redhat.com
Sun Nov 26 19:54:05 UTC 2006
Author: jwboyer
Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8128
Modified Files:
.cvsignore gaim-meanwhile.spec sources
Added Files:
gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
gaim-2.0.0beta5-debian-04_blist-memleak.patch
gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
gaim-2.0.0beta5-silc-edit-account-crash.patch
Log Message:
Update to latest beta code
gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch:
--- NEW FILE gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch ---
--- console/plugins/gnthistory.orig 2006-10-18 20:54:41.000000000 -0400
+++ console/plugins/gnthistory.c 2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
GAIM_MAJOR_VERSION,
GAIM_MINOR_VERSION,
GAIM_PLUGIN_STANDARD,
- NULL,
+ GAIM_GNT_PLUGIN_TYPE,
0,
NULL,
GAIM_PRIORITY_DEFAULT,
gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch:
--- NEW FILE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch ---
diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
--- gaim-2.0.0+beta5/gtk/gtksound.c 2006-11-10 02:23:00.000000000 -0500
+++ gaim-2.0.0+beta5.new/gtk/gtksound.c 2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
return;
volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
if (!strcmp(method, "automatic")) {
- if (gaim_running_gnome()) {
- sink = gst_element_factory_make("gconfaudiosink", "sink");
- }
+ sink = gst_element_factory_make("gconfaudiosink", "sink");
if (!sink)
sink = gst_element_factory_make("autoaudiosink", "sink");
} else if (!strcmp(method, "esd")) {
gaim-2.0.0beta5-debian-04_blist-memleak.patch:
--- NEW FILE gaim-2.0.0beta5-debian-04_blist-memleak.patch ---
--- trunk/gtk/gtkblist.c (revision 17621)
+++ trunk/gtk/gtkblist.c (revision 17774)
@@ -560,7 +560,7 @@
rebuild_joinchat_entries(GaimGtkJoinChatData *data)
{
GaimConnection *gc;
- GList *list = NULL, *tmp = NULL;
+ GList *list = NULL, *tmp;
GHashTable *defaults = NULL;
struct proto_chat_entry *pce;
gboolean focus = TRUE;
@@ -569,11 +569,8 @@
gc = gaim_account_get_connection(data->account);
- while (GTK_BOX(data->entries_box)->children)
- {
- gtk_container_remove(GTK_CONTAINER(data->entries_box),
- ((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
- }
+ while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+ gtk_widget_destroy(tmp->data);
g_list_free(data->entries);
data->entries = NULL;
@@ -5111,7 +5108,7 @@
rebuild_addchat_entries(GaimGtkAddChatData *data)
{
GaimConnection *gc;
- GList *list = NULL, *tmp = NULL;
+ GList *list = NULL, *tmp;
GHashTable *defaults = NULL;
struct proto_chat_entry *pce;
gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
gc = gaim_account_get_connection(data->account);
- while (GTK_BOX(data->entries_box)->children)
- {
- gtk_container_remove(GTK_CONTAINER(data->entries_box),
- ((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
- }
+ while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+ gtk_widget_destroy(tmp->data);
g_list_free(data->entries);
@@ -5965,8 +5959,7 @@
menuitem = l->data;
if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
- gtk_container_remove(GTK_CONTAINER(accountmenu),
- menuitem);
+ gtk_widget_destroy(menuitem);
}
for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
@@ -6122,23 +6115,7 @@
/* Remove old plugin action submenus from the Tools menu */
for (l = plugin_submenus; l; l = l->next)
- {
- GList *menuitems;
-
- submenu = l->data;
-
- menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
- while (menuitems != NULL)
- {
- GaimPluginAction *action;
- menuitem = menuitems->data;
- action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
- g_free(action);
- menuitems = g_list_delete_link(menuitems, menuitems);
- }
-
- gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
- }
+ gtk_widget_destroy(GTK_WIDGET(l->data));
g_list_free(plugin_submenus);
plugin_submenus = NULL;
gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch:
--- NEW FILE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch ---
--- trunk/libgaim/gaim-url-handler 2006/09/12 09:04:04 17260
+++ trunk/libgaim/gaim-url-handler 2006/11/18 05:25:31 17773
@@ -189,15 +189,26 @@
def xmpp(uri):
protocol = "prpl-jabber"
- match = re.match(r"^xmpp:(//([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
+ match = re.match(r"^xmpp:((//)?([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
if not match:
print "Invalid xmpp URI: %s" % uri
return
- accountname = urllib.unquote_plus(match.group(2)) or ""
- screenname = urllib.unquote_plus(match.group(4))
- command = urllib.unquote_plus(match.group(6))
- paramstring = match.group(8)
+ tmp = match.group(3)
+ if (tmp):
+ accountname = urllib.unquote_plus(tmp)
+ else:
+ accountname = ""
+
+ screenname = urllib.unquote_plus(match.group(5))
+
+ tmp = match.group(7)
+ if (tmp):
+ command = urllib.unquote_plus(tmp)
+ else:
+ command = ""
+
+ paramstring = match.group(9)
params = {}
if paramstring:
for param in paramstring.split(";"):
gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch:
--- NEW FILE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch ---
Index: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c (revision 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c (revision 17788)
@@ -926,10 +926,17 @@
}
if(!js->gsc) {
- if (gaim_proxy_connect(gc, account, server,
- gaim_account_get_int(account, "port", 5222),
- jabber_login_callback, gc) == NULL)
- gaim_connection_error(gc, _("Unable to create socket"));
+ if (connect_server[0]) {
+ jabber_login_connect(js, server,
+ gaim_account_get_int(account,
+ "port", 5222));
+ } else {
+ js->srv_query_data = gaim_srv_resolve("xmpp-client",
+ "tcp",
+ js->user->domain,
+ srv_resolved_cb,
+ js);
+ }
}
}
gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch:
--- NEW FILE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch ---
Index: trunk/libgaim/protocols/msn/object.c
===================================================================
--- trunk/libgaim/protocols/msn/object.c (revision 17765)
+++ trunk/libgaim/protocols/msn/object.c (revision 17766)
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "object.h"
+#include "debug.h"
#define GET_STRING_TAG(field, id) \
if ((tag = strstr(str, id "=\"")) != NULL) \
@@ -94,6 +95,7 @@
if (obj->creator == NULL || obj->size == 0 || obj->type == 0
|| obj->location == NULL || obj->friendly == NULL
|| obj->sha1d == NULL || obj->sha1c == NULL) {
+ gaim_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
msn_object_destroy(obj);
obj = NULL;
}
@@ -106,24 +108,13 @@
{
g_return_if_fail(obj != NULL);
- if (obj->creator != NULL)
- g_free(obj->creator);
+ g_free(obj->creator);
+ g_free(obj->location);
+ g_free(obj->real_location);
+ g_free(obj->friendly);
+ g_free(obj->sha1d);
+ g_free(obj->sha1c);
- if (obj->location != NULL)
- g_free(obj->location);
-
- if (obj->real_location != NULL)
- g_free(obj->real_location);
-
- if (obj->friendly != NULL)
- g_free(obj->friendly);
-
- if (obj->sha1d != NULL)
- g_free(obj->sha1d);
-
- if (obj->sha1c != NULL)
- g_free(obj->sha1c);
-
if (obj->local)
local_objs = g_list_remove(local_objs, obj);
Index: trunk/libgaim/protocols/msn/slplink.c
===================================================================
--- trunk/libgaim/protocols/msn/slplink.c (revision 17765)
+++ trunk/libgaim/protocols/msn/slplink.c (revision 17766)
@@ -147,6 +147,9 @@
{
MsnSlpLink *slplink;
+ g_return_val_if_fail(session != NULL, NULL);
+ g_return_val_if_fail(username != NULL, NULL);
+
slplink = msn_session_find_slplink(session, username);
if (slplink == NULL)
Index: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c (revision 17765)
+++ trunk/libgaim/protocols/msn/slp.c (revision 17766)
@@ -819,6 +819,9 @@
smile = tokens[tok];
obj = msn_object_new_from_string(gaim_url_decode(tokens[tok + 1]));
+ if (obj == NULL)
+ break;
+
who = msn_object_get_creator(obj);
sha1c = msn_object_get_sha1c(obj);
gaim-2.0.0beta5-silc-edit-account-crash.patch:
--- NEW FILE gaim-2.0.0beta5-silc-edit-account-crash.patch ---
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkaccount.c?r1=17800&r2=17799&view=patch&pathrev=17800
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).
--- trunk/gtk/gtkaccount.c 2006/11/21 04:34:38 17799
+++ trunk/gtk/gtkaccount.c 2006/11/21 05:32:55 17800
@@ -810,7 +810,7 @@
if (node->data != NULL) {
kvp = (GaimKeyValuePair *) node->data;
if ((kvp->value != NULL) && (str_value != NULL) &&
- !g_utf8_collate(kvp->value, str_value))
+ !g_utf8_collate(kvp->value, str_value))
idx = i;
gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
gaim_account_set_string(account, setting, value2);
- g_free(value2);
break;
default:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 31 Oct 2006 01:31:13 -0000 1.10
+++ .cvsignore 26 Nov 2006 19:53:35 -0000 1.11
@@ -1 +1 @@
-gaim-2.0.0beta4.tar.bz2
+gaim-2.0.0beta5.tar.bz2
Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gaim-meanwhile.spec 31 Oct 2006 01:31:13 -0000 1.16
+++ gaim-meanwhile.spec 26 Nov 2006 19:53:35 -0000 1.17
@@ -23,7 +23,7 @@
%define meanwhile_integration 1
# Prerelease define
-%define betaver beta4
+%define betaver beta5
Name: gaim-meanwhile
Version: 2.0.0
@@ -52,6 +52,16 @@
# to be replaced by upstream fix
Patch5: gaim2-PIE.patch
+## Patches 100+: To be Included in Future Upstream
+Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
+Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
+Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
+Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
+Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
+Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
+
+Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -88,7 +98,7 @@
%endif
# Evolution integration (FC3+)
%if %{evolution_integration}
-BuildRequires: evolution-data-server-devel >= 1.9.1
+BuildRequires: evolution-data-server-devel
%endif
# SILC integration (FC3+)
%if %{silc_integration}
@@ -121,8 +131,16 @@
%prep
%setup -q -n gaim-%{version}%{betaver}
-#PIE patch is broken
#%patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch102 -p0
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
+%patch150 -p1
# Relabel internal version for support purposes
sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 31 Oct 2006 01:31:13 -0000 1.10
+++ sources 26 Nov 2006 19:53:35 -0000 1.11
@@ -1 +1 @@
-ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2
+84099216123de25402fa7e904ceca437 gaim-2.0.0beta5.tar.bz2
More information about the fedora-extras-commits
mailing list