Bug 1257046 - Revert part of 69428cd068a1 to re-apply 783630602d6f to fix building on Windows. rs=clokep
authorPatrick Cloke <clokep@gmail.com>
Wed, 06 Apr 2016 08:03:59 -0400
changeset 787 6476bd54c5ca7c4674095f2740aacaea06fb3047
parent 786 d4ef6e84d8a0aa5f6dfd87f794a16b7f30ad09a4
child 788 747fd3ff1c0be6fbc7c0a5867d47b5d6ee7e83f5
push id62
push userclokep@gmail.com
push dateWed, 06 Apr 2016 13:23:24 +0000
reviewersclokep
bugs1257046
Bug 1257046 - Revert part of 69428cd068a1 to re-apply 783630602d6f to fix building on Windows. rs=clokep
libpurple/protocols/sipe/purple-buddy.c
libpurple/protocols/sipe/purple-notify.c
--- a/libpurple/protocols/sipe/purple-buddy.c
+++ b/libpurple/protocols/sipe/purple-buddy.c
@@ -478,19 +478,16 @@ void sipe_purple_add_buddy(PurpleConnect
 					    purple_buddy_get_name(buddy),
 					    purple_group_get_name(group));
 		} else {
 			SIPE_DEBUG_ERROR_NOFORMAT("sipe_purple_add_buddy[CB]: buddy name is invalid for URI");
 			purple_blist_remove_buddy(buddy);
 			purple_notify_error(gc, NULL,
 					    _("User name should be a valid SIP URI\nExample: user@company.com"),
 					    NULL
-#if PURPLE_VERSION_CHECK(3,0,0)
-					    , NULL
-#endif
 					    );
 		}
 	}
 }
 
 void sipe_purple_remove_buddy(PurpleConnection *gc,
 			      PurpleBuddy *buddy,
 			      PurpleGroup *group)
--- a/libpurple/protocols/sipe/purple-notify.c
+++ b/libpurple/protocols/sipe/purple-notify.c
@@ -87,19 +87,16 @@ void sipe_backend_notify_message_info(st
 
 void sipe_backend_notify_error(struct sipe_core_public *sipe_public,
 			       const gchar *title,
 			       const gchar *msg)
 {
 	struct sipe_backend_private *purple_private = sipe_public->backend_private;
 
 	purple_notify_error(purple_private->gc, NULL, title, msg
-#if PURPLE_VERSION_CHECK(3,0,0)
-			    , NULL
-#endif
 			    );
 }
 
 /*
   Local Variables:
   mode: c
   c-file-style: "bsd"
   indent-tabs-mode: t