Группа :: Сети/Чат
Пакет: gaim
навигация по пакетам
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: sms_prpl.patch
Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.152
diff -u -r1.152 configure.ac
--- configure.ac 23 Aug 2003 23:06:07 -0000 1.152
+++ configure.ac 28 Aug 2003 02:30:20 -0000
@@ -83,7 +83,7 @@
AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes)
AC_ARG_WITH(static-prpls, [ --with-static-prpls link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="")
if test "x$STATIC_PRPLS" = "xall" ; then
- STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr"
+ STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr sms"
fi
AC_SUBST(STATIC_PRPLS)
STATIC_LINK_LIBS=
@@ -104,6 +104,7 @@
trepia) static_trepia=yes ;;
yahoo) static_yahoo=yes ;;
zephyr) static_zephyr=yes ;;
+ sms) static_sms=yes ;;
*) echo "Invalid static protocol $i!!" ; exit ;;
esac
done
@@ -117,6 +118,7 @@
AM_CONDITIONAL(STATIC_TREPIA, test "x$static_trepia" = "xyes")
AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+AM_CONDITIONAL(STATIC_SMS, test "x$static_sms" = "xyes")
AC_SUBST(STATIC_LINK_LIBS)
AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto },[Loads static protocol plugin module initialization functions.])
@@ -477,6 +479,7 @@
src/protocols/toc/Makefile
src/protocols/yahoo/Makefile
src/protocols/zephyr/Makefile
+ src/protocols/sms/Makefile
gaim.spec
])
Index: src/gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.90
diff -u -r1.90 gtkaccount.c
--- src/gtkaccount.c 25 Aug 2003 15:42:38 -0000 1.90
+++ src/gtkaccount.c 28 Aug 2003 02:30:21 -0000
@@ -689,6 +689,11 @@
break;
}
}
+
+ if (dialog->prpl_info->options & OPT_PROTO_NO_PROXY) {+ gtk_widget_hide(dialog->proxy_frame);
+ }
+
}
static GtkWidget *
Index: src/prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.125
diff -u -r1.125 prpl.c
--- src/prpl.c 28 Aug 2003 01:18:50 -0000 1.125
+++ src/prpl.c 28 Aug 2003 02:30:21 -0000
@@ -51,6 +51,7 @@
case GAIM_PROTO_GADUGADU: return "prpl-gg"; break;
case GAIM_PROTO_MOO: return "prpl-moo"; break;
case GAIM_PROTO_TREPIA: return "prpl-trepia"; break;
+ case GAIM_PROTO_SMS: return "prpl-sms"; break;
default:
break;
@@ -76,6 +77,7 @@
else if (!strcmp(id, "prpl-gg")) return GAIM_PROTO_GADUGADU;
else if (!strcmp(id, "prpl-moo")) return GAIM_PROTO_MOO;
else if (!strcmp(id, "prpl-trepia")) return GAIM_PROTO_TREPIA;
+ else if (!strcmp(id, "prpl-sms")) return GAIM_PROTO_SMS;
return -1;
}
Index: src/prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.126
diff -u -r1.126 prpl.h
--- src/prpl.h 25 Aug 2003 14:12:25 -0000 1.126
+++ src/prpl.h 28 Aug 2003 02:30:21 -0000
@@ -63,6 +63,7 @@
GAIM_PROTO_TREPIA, /**< Trepia IM protocol */
GAIM_PROTO_BATTLENET, /**< Battle.NET protocol */
GAIM_PROTO_SSCP, /**< SSCP (ConfMgr) protocol */
+ GAIM_PROTO_SMS, /**< GSM SMS protocol */
GAIM_PROTO_UNTAKEN /**< Untaken protocol number */
} GaimProtocol;
@@ -177,7 +178,14 @@
*
* Probably just Jabber and Y!M
*/
- OPT_PROTO_USE_POINTSIZE = 0x00000200
+ OPT_PROTO_USE_POINTSIZE = 0x00000200,
+
+ /**
+ * Hide the proxy settings dropdown
+ *
+ * Some protocols can't use a proxy.
+ */
+ OPT_PROTO_NO_PROXY = 0x00000400
} GaimProtocolOptions;
Index: src/protocols/Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- src/protocols/Makefile.am 16 Jul 2003 14:28:26 -0000 1.10
+++ src/protocols/Makefile.am 28 Aug 2003 02:30:21 -0000
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = gg irc jabber msn napster oscar toc yahoo zephyr
+DIST_SUBDIRS = gg irc jabber msn napster oscar toc yahoo zephyr sms
if PRPLS