/soc/2013/ankitkv/gobjectification: f6311fd36997: Merged soc.201...

[Ankit Vani]

Changeset: f6311fd369973f6de1aeb99ce686697d038c8871
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-29 16:55 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f6311fd36997

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/protocols/null/nullprotocol.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff --git a/libpurple/protocols/null/nullprotocol.c b/libpurple/protocols/null/nullprotocol.c
--- a/libpurple/protocols/null/nullprotocol.c
+++ b/libpurple/protocols/null/nullprotocol.c
@@ -517,7 +517,7 @@ static void null_get_info(PurpleConnecti
   if (!get_null_gc(username)) {
     char *msg = g_strdup_printf(_("%s is not logged in."), username);
     purple_notify_error(gc, _("User Info"), _("User info not available. "), msg,
-	                    purple_request_cpar_from_account(acct));
+                        purple_request_cpar_from_account(acct));
     g_free(msg);
   }
 
@@ -697,7 +697,7 @@ static void null_join_chat(PurpleConnect
     purple_debug_info("nullprotocol", "%s is already in chat room %s\n", username,
                       room);
     purple_notify_info(gc, _("Join chat"), _("Join chat"), tmp,
-	                   purple_request_cpar_from_connection(gc));
+                       purple_request_cpar_from_connection(gc));
     g_free(tmp);
   }
 }
@@ -721,7 +721,7 @@ static void null_reject_chat(PurpleConne
                      _("Chat invitation rejected"),
                      _("Chat invitation rejected"),
                      message,
-					 purple_request_cpar_from_connection(gc));
+                     purple_request_cpar_from_connection(gc));
   g_free(message);
 }
 
@@ -750,7 +750,7 @@ static void null_chat_invite(PurpleConne
                         "ignoring invitation from %s\n",
                         who, room, username);
       purple_notify_info(gc, _("Chat invitation"), _("Chat invitation"), tmp,
-	                     purple_request_cpar_from_conversation(PURPLE_CONVERSATION(to_conv)));
+                         purple_request_cpar_from_conversation(PURPLE_CONVERSATION(to_conv)));
       g_free(tmp);
     } else {
       GHashTable *components;