comparison src/protocols/novell/novell.c @ 12408:3d297efa70bb

[gaim-migrate @ 14715] One less format string non-literal warning to deal with if we check that from time to time (which is probably a good idea). Make a couple functions static. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Thu, 08 Dec 2005 20:59:07 +0000
parents b1d06ade0e10
children 3169cd6727ad
comparison
equal deleted inserted replaced
12407:b33b4e326c90 12408:3d297efa70bb
1028 1028
1029 #if !defined(_WIN32) 1029 #if !defined(_WIN32)
1030 1030
1031 const char *sysname = ""; 1031 const char *sysname = "";
1032 const char *release = ""; 1032 const char *release = "";
1033 const char *template = "Gaim/%s (%s; %s)";
1034 struct utsname u; 1033 struct utsname u;
1035 1034
1036 if (uname(&u) == 0) { 1035 if (uname(&u) == 0) {
1037 sysname = u.sysname; 1036 sysname = u.sysname;
1038 release = u.release; 1037 release = u.release;
1039 } else { 1038 } else {
1040 sysname = "Linux"; 1039 sysname = "Linux";
1041 release = "Unknown"; 1040 release = "Unknown";
1042 } 1041 }
1043 1042
1044 return g_strdup_printf(template, VERSION, sysname, release); 1043 return g_strdup_printf("Gaim/%s (%s; %s)", VERSION, sysname, release);
1045 1044
1046 #else 1045 #else
1047 1046
1048 const char *sysname = ""; 1047 const char *sysname = "";
1049 const char *template = "Gaim/%s (%s; %d.%d)";
1050 OSVERSIONINFO os_info; 1048 OSVERSIONINFO os_info;
1051 SYSTEM_INFO sys_info; 1049 SYSTEM_INFO sys_info;
1052 1050
1053 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); 1051 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
1054 GetVersionEx(&os_info); 1052 GetVersionEx(&os_info);
1098 } 1096 }
1099 } else { 1097 } else {
1100 sysname = "Windows"; 1098 sysname = "Windows";
1101 } 1099 }
1102 1100
1103 return g_strdup_printf(template, VERSION, sysname, 1101 return g_strdup_printf("Gaim/%s (%s; %d.%d)", VERSION, sysname,
1104 os_info.dwMajorVersion, os_info.dwMinorVersion); 1102 os_info.dwMajorVersion, os_info.dwMinorVersion);
1105 1103
1106 #endif 1104 #endif
1107 1105
1108 1106
1646 name = g_strdup_printf(_("GroupWise Conference %d"), id); 1644 name = g_strdup_printf(_("GroupWise Conference %d"), id);
1647 1645
1648 return name; 1646 return name;
1649 } 1647 }
1650 1648
1651 void 1649 static void
1652 _show_privacy_locked_error(GaimConnection *gc, NMUser *user) 1650 _show_privacy_locked_error(GaimConnection *gc, NMUser *user)
1653 { 1651 {
1654 char *err; 1652 char *err;
1655 1653
1656 err = g_strdup_printf(_("Unable to change server side privacy settings (%s)."), 1654 err = g_strdup_printf(_("Unable to change server side privacy settings (%s)."),
2390 } 2388 }
2391 2389
2392 serv_got_chat_left(gc, id); 2390 serv_got_chat_left(gc, id);
2393 } 2391 }
2394 2392
2395 void 2393 static void
2396 novell_chat_invite(GaimConnection *gc, int id, 2394 novell_chat_invite(GaimConnection *gc, int id,
2397 const char *message, const char *who) 2395 const char *message, const char *who)
2398 { 2396 {
2399 NMConference *conference; 2397 NMConference *conference;
2400 NMUser *user; 2398 NMUser *user;