Changeset 1065dd4 for protocols/msn

Timestamp:

2015-01-17T20:00:49Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

eb4ad8d

Parents:

bc7a0d4 (diff), 6b13103 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge cleanup changes. (FSF address fix, and using GLib variants of some
functions which cleans up compiler warnings.)

Location:

protocols/msn

Files:

• invitation.c (modified) (1 diff)
• invitation.h (modified) (1 diff)
• msn.c (modified) (2 diffs)
• msn.h (modified) (1 diff)
• msn_util.c (modified) (1 diff)
• ns.c (modified) (3 diffs)
• sb.c (modified) (3 diffs)
• soap.c (modified) (1 diff)
• soap.h (modified) (1 diff)
• tables.c (modified) (1 diff)

protocols/msn/invitation.c

@@ -21 +21 @@
  You should have received a copy of the GNU General Public License with
  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA  02111-1307  USA
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+ Fifth Floor, Boston, MA  02110-1301  USA
  */
 

protocols/msn/invitation.h

@@ -20 +20 @@
  You should have received a copy of the GNU General Public License with
  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA  02111-1307  USA
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+ Fifth Floor, Boston, MA  02110-1301  USA
  */
 

protocols/msn/msn.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -377 +377 @@
         g_tree_insert( md->domaintree, bu->handle, bu );
         
-        for( handle = bu->handle; isdigit( *handle ); handle ++ );
+        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ );
         if( *handle == ':' )
         {

protocols/msn/msn.h

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 

protocols/msn/msn_util.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 

protocols/msn/ns.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -581 +581 @@
                 ic->flags |= OPT_PONGED;
         }
-        else if( isdigit( cmd[0][0] ) )
+        else if( g_ascii_isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );
@@ -997 +997 @@
         /* This might be a federated contact. Get its network number,
            prefixed to bu->handle with a colon. Default is 1. */
-        for( handle = bu->handle; isdigit( *handle ); handle ++ )
+        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ )
                 type = type * 10 + *handle - '0';
         if( *handle == ':' )

protocols/msn/sb.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -506 +506 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
+                if( num_parts < 4 || !g_ascii_isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -645 +645 @@
                 }
         }
-        else if( isdigit( cmd[0][0] ) )
+        else if( g_ascii_isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );

protocols/msn/soap.c

@@ -23 +23 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 

protocols/msn/soap.h

@@ -23 +23 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 

protocols/msn/tables.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */