SOURCES: gg2-orange.patch (NEW) - s/idea/orange
freetz
freetz at pld-linux.org
Sun Sep 25 11:55:07 CEST 2005
Author: freetz Date: Sun Sep 25 09:55:07 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- s/idea/orange
---- Files affected:
SOURCES:
gg2-orange.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/gg2-orange.patch
diff -u /dev/null SOURCES/gg2-orange.patch:1.1
--- /dev/null Sun Sep 25 11:55:07 2005
+++ SOURCES/gg2-orange.patch Sun Sep 25 11:55:02 2005
@@ -0,0 +1,413 @@
+diff -aurN gg2-2.2.8/src/plugins/sms/sms_core.c gg2-2.2.8.cvs/src/plugins/sms/sms_core.c
+--- gg2-2.2.8/src/plugins/sms/sms_core.c 2005-09-01 16:49:47.000000000 +0200
++++ gg2-2.2.8.cvs/src/plugins/sms/sms_core.c 2005-09-24 05:44:20.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$ */
++/* $Id$ */
+
+ /*
+ * SMS plugin for GNU Gadu 2
+@@ -47,7 +47,7 @@
+ #include "sms_gui.h"
+ #include "sms_core.h"
+
+-extern char *idea_token_path;
++extern char *orange_token_path;
+ extern gint method;
+
+ /* URLencoding code by Ahmad Baitalmal <ahmad at bitbuilder.com>
+@@ -93,7 +93,7 @@
+ return new_string;
+ }
+
+-/* laczenie sie z wybranym hostem, zwraca -1 przy błedzie, inaczej 0 */
++/* laczenie sie z wybranym hostem, zwraca -1 przy błedzie, inaczej 0 */
+ gint sms_connect(gchar * sms_info, gchar * sms_host, int *sock_s)
+ {
+ struct hostent *h;
+@@ -182,19 +182,19 @@
+ g_free(message->number);
+ g_free(message->sender);
+ g_free(message->body);
+- g_free(message->idea_token);
+- g_free(message->idea_pass);
++ g_free(message->orange_token);
++ g_free(message->orange_pass);
+ g_free(message);
+
+ return;
+ }
+
+ /* tu bedzie wymiana na cos innego, GUI musi to obslugiwac a nie "samowolka" ;-) */
+-gboolean IDEA_logo(SMS * user_data)
++gboolean ORANGE_logo(SMS * user_data)
+ {
+- GGaduDialog *dialog = ggadu_dialog_new_full(GGADU_DIALOG_GENERIC, _("IDEA token"), "get token", user_data);
++ GGaduDialog *dialog = ggadu_dialog_new_full(GGADU_DIALOG_GENERIC, _("ORANGE token"), "get token", user_data);
+
+- ggadu_dialog_add_entry(dialog, 0, "", VAR_IMG, idea_token_path, VAR_FLAG_NONE);
++ ggadu_dialog_add_entry(dialog, 0, "", VAR_IMG, orange_token_path, VAR_FLAG_NONE);
+ ggadu_dialog_add_entry(dialog, 1, _("Enter token text"), VAR_STR, NULL, VAR_FLAG_NONE);
+
+ signal_emit_from_thread("sms", "gui show dialog", dialog, "main-gui");
+@@ -240,7 +240,7 @@
+ }
+
+ /* wyslanie na idee */
+-gint send_IDEA(SMS * message)
++gint send_ORANGE(SMS * message)
+ {
+ gchar *token = NULL;
+ gchar temp[2];
+@@ -248,20 +248,20 @@
+ gchar *recv_buff = NULL;
+ gchar *buf = NULL;
+ gint i = 0, j, k, retries = 3;
+- FILE *idea_logo;
++ FILE *orange_logo;
+ HTTPstruct *HTTP = NULL;
+ SMS *message2 = NULL;
+ int sock_s;
+
+ HTTP = httpstruct_new();
+ HTTP->method = SMS_METHOD_GET;
+- HTTP->host = g_strdup(GGADU_SMS_IDEA_HOST);
+- HTTP->url = g_strdup(GGADU_SMS_IDEA_URL_GET);
++ HTTP->host = g_strdup(GGADU_SMS_ORANGE_HOST);
++ HTTP->url = g_strdup(GGADU_SMS_ORANGE_URL_GET);
+ HTTP->url_params = g_strdup(" ");
+
+ get_mainpage:
+ /* pobranie adresu do obrazka */
+- if (sms_connect("IDEA", "213.218.116.131", &sock_s))
++ if (sms_connect("ORANGE", "213.218.116.131", &sock_s))
+ {
+ httpstruct_free(HTTP);
+ return ERR_SERVICE;
+@@ -277,7 +277,7 @@
+
+ close(sock_s);
+
+- print_debug("\n=======retries left: %d=====\nIDEA RECVBUFF1: %s\n\n", retries - 1, recv_buff);
++ print_debug("\n=======retries left: %d=====\nORANGE RECVBUFF1: %s\n\n", retries - 1, recv_buff);
+
+ if (!g_strstr_len(recv_buff, i, "200 OK"))
+ {
+@@ -301,13 +301,13 @@
+ return ERR_READ_TOKEN;
+ }
+
+- if (!(token = g_strndup(buf + 24, GGADU_SMS_IDEA_TOKENLEN)))
++ if (!(token = g_strndup(buf + 24, GGADU_SMS_ORANGE_TOKENLEN)))
+ {
+ g_free(recv_buff);
+ return ERR_READ_TOKEN;
+ }
+
+- if (strlen(token) < GGADU_SMS_IDEA_TOKENLEN)
++ if (strlen(token) < GGADU_SMS_ORANGE_TOKENLEN)
+ {
+ g_free(token);
+ g_free(recv_buff);
+@@ -319,12 +319,12 @@
+
+ HTTP = httpstruct_new();
+ HTTP->method = SMS_METHOD_GET;
+- HTTP->host = g_strdup(GGADU_SMS_IDEA_HOST);
++ HTTP->host = g_strdup(GGADU_SMS_ORANGE_HOST);
+ HTTP->url = g_strdup(gettoken);
+ HTTP->url_params = g_strdup(" ");
+
+ get_token:
+- if (sms_connect("IDEA", GGADU_SMS_IDEA_HOST, &sock_s))
++ if (sms_connect("ORANGE", GGADU_SMS_ORANGE_HOST, &sock_s))
+ {
+ httpstruct_free(HTTP);
+ return ERR_SERVICE;
+@@ -340,7 +340,7 @@
+
+ close(sock_s);
+
+- print_debug("\n============retries left: %d=================\nIDEA RECVBUFF2: %s\n\n", retries, recv_buff);
++ print_debug("\n============retries left: %d=================\nORANGE RECVBUFF2: %s\n\n", retries, recv_buff);
+
+ if (!g_strstr_len(recv_buff, i, "200 OK"))
+ {
+@@ -379,8 +379,8 @@
+ recv_buff[k] = recv_buff[k + j];
+ recv_buff[k] = 0;
+
+- /* oops, bail out if idea_token_path cannot be written. */
+- if (!(idea_logo = fopen(idea_token_path, "w")))
++ /* oops, bail out if orange_token_path cannot be written. */
++ if (!(orange_logo = fopen(orange_token_path, "w")))
+ {
+ g_free(token);
+ g_free(recv_buff);
+@@ -388,8 +388,8 @@
+ }
+
+ /* write token image to file, close fd */
+- fwrite(recv_buff, 1, i - j, idea_logo);
+- fclose(idea_logo);
++ fwrite(recv_buff, 1, i - j, orange_logo);
++ fclose(orange_logo);
+
+ g_free(recv_buff);
+
+@@ -399,15 +399,15 @@
+ message2->sender = g_strdup(message->sender);
+ message2->body = g_strdup(message->body);
+
+- message2->idea_token = token;
+- message2->idea_pass = NULL;
++ message2->orange_token = token;
++ message2->orange_pass = NULL;
+
+- IDEA_logo(message2);
++ ORANGE_logo(message2);
+
+ return TRUE;
+ }
+
+-gpointer send_IDEA_stage2(SMS * message)
++gpointer send_ORANGE_stage2(SMS * message)
+ {
+ gchar *recv_buff = NULL;
+ gchar *post = NULL;
+@@ -420,7 +420,7 @@
+ int sock_s;
+
+ /* is there any better place for this? */
+- unlink(idea_token_path);
++ unlink(orange_token_path);
+
+ if (!message)
+ {
+@@ -428,7 +428,7 @@
+ goto out;
+ }
+
+- if (!message->idea_pass)
++ if (!message->orange_pass)
+ {
+ sms_warning(message->number, _("Please enter token"));
+ goto out;
+@@ -446,8 +446,8 @@
+
+ sender = ggadu_sms_urlencode(g_strdup(message->sender));
+ body = ggadu_sms_urlencode(g_strdup(message->body));
+- post = g_strconcat("token=", message->idea_token, "&SENDER=", sender, "&RECIPIENT=", sms_number, "&SHORT_MESSAGE=", body, "&pass=",
+- message->idea_pass, "&respInfo=2", NULL);
++ post = g_strconcat("token=", message->orange_token, "&SENDER=", sender, "&RECIPIENT=", sms_number, "&SHORT_MESSAGE=", body, "&pass=",
++ message->orange_pass, "&respInfo=2", NULL);
+
+ g_free(sender);
+ g_free(body);
+@@ -456,15 +456,15 @@
+
+ HTTP = httpstruct_new();
+ HTTP->method = SMS_METHOD_POST;
+- HTTP->host = g_strdup(GGADU_SMS_IDEA_HOST);
+- HTTP->url = g_strdup(GGADU_SMS_IDEA_URL_SEND);
++ HTTP->host = g_strdup(GGADU_SMS_ORANGE_HOST);
++ HTTP->url = g_strdup(GGADU_SMS_ORANGE_URL_SEND);
+ HTTP->url_params = g_strdup(" ");
+ HTTP->post_data = g_strdup(post);
+ HTTP->post_length = strlen(post);
+ g_free(post);
+
+ send_sms:
+- if (sms_connect("IDEA", "213.218.116.131", &sock_s))
++ if (sms_connect("ORANGE", "213.218.116.131", &sock_s))
+ {
+ sms_warning(message->number, _("Cannot connect!"));
+ httpstruct_free(HTTP);
+@@ -480,7 +480,7 @@
+
+ close(sock_s);
+
+- print_debug("\n============retries left: %d===================\nIDEA RECVBUFF3: %s\n\n", retries, recv_buff);
++ print_debug("\n============retries left: %d===================\nORANGE RECVBUFF3: %s\n\n", retries, recv_buff);
+
+ if (!g_strstr_len(recv_buff, i, "200 OK"))
+ {
+@@ -498,10 +498,10 @@
+ httpstruct_free(HTTP);
+ }
+
+- if (g_strstr_len(recv_buff, i, "SMS został wysłany"))
++ if (g_strstr_len(recv_buff, i, "SMS został wysłany"))
+ sms_message(message->number, _("SMS has been sent"));
+
+- else if (g_strstr_len(recv_buff, i, "Podano błędne hasło, SMS nie został wysłany"))
++ else if (g_strstr_len(recv_buff, i, "Podano błędne hasło, SMS nie został wysłany"))
+ sms_warning(message->number, _("Bad token!"));
+
+ else if (g_strstr_len(recv_buff, i, "Object moved"))
+@@ -513,7 +513,7 @@
+ else if (g_strstr_len(recv_buff, i, "serwis chwilowo"))
+ sms_warning(message->number, _("Gateway error!"));
+
+- else if (g_strstr_len(recv_buff, i, "nie ma aktywnej usługi"))
++ else if (g_strstr_len(recv_buff, i, "nie ma aktywnej usługi"))
+ sms_warning(message->number, _("Service not activated!"));
+
+ else if (g_strstr_len(recv_buff, i, "adres odbiorcy wiadomosci jest nieprawid"))
+@@ -591,11 +591,11 @@
+
+ if (!strlen(recv_buff))
+ ret = ERR_SERVICE;
+- else if (g_strstr_len(recv_buff, i, "wiadomość została wysłana na numer"))
++ else if (g_strstr_len(recv_buff, i, "wiadomość została wysłana na numer"))
+ ret = TRUE;
+- else if (g_strstr_len(recv_buff, i, "podano zły numer"))
++ else if (g_strstr_len(recv_buff, i, "podano zły numer"))
+ ret = ERR_BAD_RCPT;
+- else if (g_strstr_len(recv_buff, i, "Z powodu przekroczenia limitów bramki"))
++ else if (g_strstr_len(recv_buff, i, "Z powodu przekroczenia limitĂłw bramki"))
+ ret = ERR_LIMIT_EX;
+
+ g_free(recv_buff);
+@@ -739,7 +739,7 @@
+ return FALSE;
+
+ if (*sms_number == '5')
+- return SMS_IDEA;
++ return SMS_ORANGE;
+
+ if (*sms_number == '6')
+ {
+@@ -789,14 +789,14 @@
+ gsm_oper = check_operator(message->number);
+ switch (gsm_oper)
+ {
+- case SMS_IDEA:
++ case SMS_ORANGE:
+ if (message->external)
+ {
+ result = system(g_strconcat("sms ", message->number, " \"", message->body, " ", message->sender, "\"", NULL));
+ goto out;
+ }
+ else
+- result = send_IDEA(message);
++ result = send_ORANGE(message);
+
+ break;
+
+@@ -846,8 +846,8 @@
+ {
+ /* successes */
+ case TRUE:
+- /* dirty IDEA workaround: we can't handle send_idea*() return values here,
+- send_idea*() eventually notifies about success itself. */
++ /* dirty ORANGE workaround: we can't handle send_orange*() return values here,
++ send_orange*() eventually notifies about success itself. */
+ if (gsm_oper == SMS_PLUS)
+ sms_message(message->number, _("SMS has been sent"));
+ else if (gsm_oper == SMS_ERA)
+diff -aurN gg2-2.2.8/src/plugins/sms/sms_core.h gg2-2.2.8.cvs/src/plugins/sms/sms_core.h
+--- gg2-2.2.8/src/plugins/sms/sms_core.h 2005-09-01 16:49:47.000000000 +0200
++++ gg2-2.2.8.cvs/src/plugins/sms/sms_core.h 2005-09-24 05:44:20.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$ */
++/* $Id$ */
+
+ /*
+ * SMS plugin for GNU Gadu 2
+@@ -27,9 +27,9 @@
+ #define GGADU_SMS_PLUS_HOST "www.text.plusgsm.pl"
+ #define GGADU_SMS_PLUS_URL "/sms/sendsms.php"
+
+-#define GGADU_SMS_IDEA_HOST "sms.idea.pl"
+-#define GGADU_SMS_IDEA_URL_GET "/"
+-#define GGADU_SMS_IDEA_URL_SEND "/sendsms.aspx"
++#define GGADU_SMS_ORANGE_HOST "sms.orange.pl"
++#define GGADU_SMS_ORANGE_URL_GET "/Default.aspx?id=A2B6173D-CF1A-4c38-B7A7-E3144D43D70C"
++#define GGADU_SMS_ORANGE_URL_SEND "/sendsms.aspx"
+
+ #define GGADU_SMS_ERA_HOST "www.eraomnix.pl"
+ #define GGADU_SMS_ERA_URL "/msg/api/do/tinker/sponsored"
+@@ -56,13 +56,13 @@
+
+ #define GGADU_SMS_RECVBUFF_LEN 32768
+
+-#define IDEA_GFX "/idea_token.gfx"
+-#define GGADU_SMS_IDEA_TOKENLEN 36
++#define ORANGE_GFX "/orange_token.gfx"
++#define GGADU_SMS_ORANGE_TOKENLEN 36
+ #define RESERVED_CHARS "!\"'()*+-.<>[]\\^_`{}|~\t#;/?:&=+,$% \r\n\v\x7f"
+
+ enum
+ {
+- SMS_IDEA = 2,
++ SMS_ORANGE = 2,
+ SMS_ERA,
+ SMS_PLUS
+ };
+@@ -116,12 +116,12 @@
+ gchar *sender; /* free() me */
+ gchar *era_login;
+ gchar *era_password;
+- gchar *idea_token; /* free() me */
+- gchar *idea_pass; /* free() me */
++ gchar *orange_token; /* free() me */
++ gchar *orange_pass; /* free() me */
+ } SMS;
+
+ gpointer send_sms(SMS * message);
+-gpointer send_IDEA_stage2(SMS * message);
++gpointer send_ORANGE_stage2(SMS * message);
+
+ void sms_message(const gchar * sms_number, const gchar * message);
+ void sms_warning(const gchar * sms_number, const gchar * warning);
+diff -aurN gg2-2.2.8/src/plugins/sms/sms_gui.c gg2-2.2.8.cvs/src/plugins/sms/sms_gui.c
+--- gg2-2.2.8/src/plugins/sms/sms_gui.c 2005-01-19 22:02:18.000000000 +0100
++++ gg2-2.2.8.cvs/src/plugins/sms/sms_gui.c 2005-09-24 05:43:21.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$ */
++/* $Id$ */
+
+ /*
+ * SMS plugin for GNU Gadu 2
+@@ -43,7 +43,7 @@
+
+ GGaduPlugin *sms_handler;
+ GSList *smslist = NULL;
+-gchar *idea_token_path = NULL;
++gchar *orange_token_path = NULL;
+ gint method;
+
+ GGaduProtocol *p;
+@@ -200,7 +200,7 @@
+ if (!ggadu_config_read(sms_handler))
+ g_warning(_("Unable to read config file for plugin sms"));
+
+- idea_token_path = g_build_filename(config->configdir, IDEA_GFX, NULL);
++ orange_token_path = g_build_filename(config->configdir, ORANGE_GFX, NULL);
+
+ register_signal_receiver((GGaduPlugin *) sms_handler, (signal_func_ptr) signal_receive);
+
+@@ -479,11 +479,11 @@
+ {
+ GGaduKeyValue *kv = (GGaduKeyValue *) tmplist->data;
+ if (kv->key == 1)
+- message->idea_pass = g_strdup(kv->value);
++ message->orange_pass = g_strdup(kv->value);
+
+ tmplist = tmplist->next;
+ }
+- g_thread_create((gpointer(*)())send_IDEA_stage2, message, FALSE, NULL);
++ g_thread_create((gpointer(*)())send_ORANGE_stage2, message, FALSE, NULL);
+ }
+
+ GGaduDialog_free(dialog);
+@@ -569,7 +569,7 @@
+ signal_emit(GGadu_PLUGIN_NAME, "gui unregister protocol", p, "main-gui");
+ ggadu_menu_free(menu_smsmenu);
+
+- g_free(idea_token_path);
++ g_free(orange_token_path);
+ }
+
+ /* zapis listy numerow do pliku */
================================================================
More information about the pld-cvs-commit
mailing list