/soc/2013/ankitkv/gobjectification: badfcdf6b95d: Merged default...

Ankit Vani a at nevitus.org
Tue Aug 13 11:20:12 EDT 2013


Changeset: badfcdf6b95dae5b415c1b09a1bbfd2547bbb6f5
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-13 20:46 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/badfcdf6b95d

Description:

Merged default branch

diffstat:

 finch/libgnt/Makefile.am                       |   8 ++++--
 libpurple/plugins/Makefile.am                  |   6 +++-
 libpurple/plugins/perl/Makefile.am             |   7 +++--
 libpurple/plugins/ssl/ssl-gnutls.c             |   5 +--
 libpurple/protocols/yahoo/yahoo_filexfer.c     |   3 +-
 libpurple/tag.sh                               |  29 ++++++++++++++++---------
 pidgin/gtkutils.c                              |   2 +-
 pidgin/plugins/musicmessaging/Makefile.am      |   6 +++-
 pidgin/plugins/musicmessaging/musicmessaging.c |   2 +
 pidgin/plugins/perl/Makefile.am                |   7 +++--
 10 files changed, 46 insertions(+), 29 deletions(-)

diffs (242 lines):

diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -73,11 +73,13 @@ CLEANFILES = \
 	gntmarshal.c
 
 gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
-	echo "#include \"gntmarshal.h\"" > $@
-	glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
+	@echo -e "  GEN\t$@"
+	@echo "#include \"gntmarshal.h\"" > $@
+	@glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
 
 gntmarshal.h: $(srcdir)/genmarshal
-	glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
+	@echo -e "  GEN\t$@"
+	@glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -118,10 +118,12 @@ dbus_example_la_LIBADD      = $(GLIB_LIB
 .PHONY: always
 
 $(top_builddir)/libpurple/dbus-types.h: always
-	cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+	@echo -e "  GEN\t$@"
+	@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
 dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
-	cat $(srcdir)/$(dbus_example_la_SOURCES) | \
+	@echo -e "  GEN\t$@"
+	@cat $(srcdir)/$(dbus_example_la_SOURCES) | \
 	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
 $(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libpurple/dbus-types.h
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -92,6 +92,7 @@ EXTRA_DIST = \
 	$(perl_scripts)
 
 common/Makefile: common/Makefile.PL
+	@echo -e "  GEN\t$@"
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
 			srcloc=${srcdir}; \
@@ -99,7 +100,7 @@ common/Makefile: common/Makefile.PL
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL
+	@cd common && $(perlpath) Makefile.PL > /dev/null
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
@@ -110,8 +111,8 @@ all-local: common/Makefile
 		if [ ! -f Makefile ]; then \
 			$(perlpath) Makefile.PL; \
 		fi && \
-		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
-		 $(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
+		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" LD="@$(abs_top_srcdir)/libpurple/tag.sh LD $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" CP="@cp" RM_F="@rm -f" CHMOD="@chmod" $(PERL_EXTRA_OPTS) || \
+		 $(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" LD="@$(abs_top_srcdir)/libpurple/tag.sh LD $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" CP="@cp" RM_F="@rm -f" CHMOD="@chmod" $(PERL_EXTRA_OPTS)) && \
 		cd ..; \
 	done
 
diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -386,7 +386,6 @@ static void
 ssl_gnutls_connect(PurpleSslConnection *gsc)
 {
 	PurpleSslGnutlsData *gnutls_data;
-	static const int cert_type_priority[2] = { GNUTLS_CRT_X509, 0 };
 
 	gnutls_data = g_new0(PurpleSslGnutlsData, 1);
 	gsc->private_data = gnutls_data;
@@ -413,8 +412,8 @@ ssl_gnutls_connect(PurpleSslConnection *
 	gnutls_set_default_priority(gnutls_data->session);
 #endif
 
-	gnutls_certificate_type_set_priority(gnutls_data->session,
-		cert_type_priority);
+	gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host,
+		strlen(gsc->host));
 
 	gnutls_credentials_set(gnutls_data->session, GNUTLS_CRD_CERTIFICATE,
 		xcred);
diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -972,8 +972,9 @@ void yahoo_process_filetrans_info_15(Pur
 		xfer_data->is_relay = (val_249 == 3);
 
 		if (!xfer_data->is_relay) {
+			purple_debug_error("yahoo", "Non-relay FT aren't tested yet.\n");
 			purple_notify_error(gc, NULL, _("File Transfer Failed"),
-				_("Non-relay FT aren't tested yet."));
+				_("Unsupported method"));
 			purple_xfer_cancel_remote(xfer);
 		}
 
diff --git a/libpurple/tag.sh b/libpurple/tag.sh
--- a/libpurple/tag.sh
+++ b/libpurple/tag.sh
@@ -7,8 +7,9 @@
 tag=$1
 found=0
 object=""
-c_file=""
-xs_file=""
+file_1=""
+file_2=""
+is_final=0
 for arg in "$@"
 do
 	if [ "$found" == 1 ]; then
@@ -21,16 +22,22 @@ do
 	if [ "$tag" == "auto" ] && [ "$arg" == "-shared" ]; then
 		tag="CCLD"
 	fi
-	if [ "$tag" == "PERL" ] && [ "$arg" == "-e" ]; then
-		found=1
+	if [ "$tag" == "PERL" ] && [ "${arg%(*}" == "Mkbootstrap" ]; then
+		object="${arg%;}"
+		is_final=1
+		break
 	fi
 	ext_1=${arg#${arg%??}}
 	if [ "${ext_1}" == ".c" ]; then
-		c_file="$arg"
+		file_1="$arg"
 	fi
 	ext_2=${arg#${arg%???}}
 	if [ "${ext_2}" == ".xs" ]; then
-		xs_file="$arg"
+		file_2="$arg"
+	fi
+	ext_3=${arg#${arg%????}}
+	if [ "${ext_3}" == ".3pm" ]; then
+		file_2="$arg"
 	fi
 done
 
@@ -38,15 +45,15 @@ if [ "$tag" == "auto" ]; then
 	tag="CC"
 fi
 
-if [ "$tag" == "PERL" ]; then
+if [ "$tag" == "PERL" ] && [ "$is_final" == 0 ]; then
 	object=`echo "$object" | sed -n 's|.*output *=> *"\([^"]*\)".*|\1|p'`
 fi
 
-if [ "$object" == "" ] && [ "${c_file}" != "" ]; then
-	object="${c_file}"
+if [ "$object" == "" ] && [ "${file_1}" != "" ]; then
+	object="${file_1}"
 fi
-if [ "$object" == "" ] && [ "${xs_file}" != "" ]; then
-	object="${xs_file}"
+if [ "$object" == "" ] && [ "${file_2}" != "" ]; then
+	object="${file_2}"
 fi
 
 shift 1
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -249,7 +249,7 @@ pidgin_create_webview(gboolean editable,
 	if (editable) {
 		gtk_webviewtoolbar_attach(GTK_WEBVIEWTOOLBAR(toolbar), webview);
 		gtk_webviewtoolbar_associate_smileys(GTK_WEBVIEWTOOLBAR(toolbar), "default");
-		gtk_webview_set_toolbar(webview, toolbar);
+		gtk_webview_set_toolbar(GTK_WEBVIEW(webview), toolbar);
 	}
 	pidgin_setup_webview(webview);
 
diff --git a/pidgin/plugins/musicmessaging/Makefile.am b/pidgin/plugins/musicmessaging/Makefile.am
--- a/pidgin/plugins/musicmessaging/Makefile.am
+++ b/pidgin/plugins/musicmessaging/Makefile.am
@@ -23,10 +23,12 @@ CLEANFILES              = music-messagin
 .PHONY: always
 
 $(top_builddir)/libpurple/dbus-types.h: always
-	cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+	@echo -e "  GEN\t$@"
+	@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
 music-messaging-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
-	cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
+	@echo -e "  GEN\t$@"
+	@cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
 	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
 $(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/libpurple/dbus-types.h
diff --git a/pidgin/plugins/musicmessaging/musicmessaging.c b/pidgin/plugins/musicmessaging/musicmessaging.c
--- a/pidgin/plugins/musicmessaging/musicmessaging.c
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c
@@ -588,7 +588,9 @@ static void conv_destroyed (PurpleConver
 
 static void add_button (MMConversation *mmconv)
 {
+#if 0
 	PurpleConversation *conv = mmconv->conv;
+#endif
 
 	GtkWidget *button, *image, *sep;
 	gchar *file_path;
diff --git a/pidgin/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST = \
 	$(common_sources)
 
 common/Makefile: common/Makefile.PL
+	@echo -e "  GEN\t$@"
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
 			srcloc=${srcdir}; \
@@ -44,7 +45,7 @@ common/Makefile: common/Makefile.PL
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL
+	@cd common && $(perlpath) Makefile.PL > /dev/null
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
@@ -55,8 +56,8 @@ all-local: common/Makefile
 		if [ ! -f Makefile ]; then \
 			$(perlpath) Makefile.PL; \
 		fi && \
-		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
-		$(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
+		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" LD="@$(abs_top_srcdir)/libpurple/tag.sh LD $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" CP="@cp" RM_F="@rm -f" CHMOD="@chmod" $(PERL_EXTRA_OPTS) || \
+		$(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" LD="@$(abs_top_srcdir)/libpurple/tag.sh LD $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" CP="@cp" RM_F="@rm -f" CHMOD="@chmod" $(PERL_EXTRA_OPTS)) && \
 		cd ..; \
 	done
 



More information about the Commits mailing list