Changeset bd69a21 for protocols/nogaim.c

Timestamp:

2005-12-15T12:24:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

4146a07

Parents:

2983f5e (diff), bf02a67 (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 Wilmer

File:

• protocols/nogaim.c (modified) (7 diffs)

protocols/nogaim.c

@@ -55 +55 @@
 GSList *connections;
 
+#ifdef WITH_PLUGINS
 gboolean load_plugin(char *path)
 {
@@ -75 +76 @@
         return TRUE;
 }
+
+void load_plugins(void)
+{
+        GDir *dir;
+        GError *error = NULL;
+
+        dir = g_dir_open(PLUGINDIR, 0, &error);
+
+        if (dir) {
+                const gchar *entry;
+                char *path;
+
+                while ((entry = g_dir_read_name(dir))) {
+                        path = g_build_filename(PLUGINDIR, entry, NULL);
+                        if(!path) {
+                                log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
+                                continue;
+                        }
+
+                        load_plugin(path);
+
+                        g_free(path);
+                }
+
+                g_dir_close(dir);
+        }
+}
+#endif
 
 /* nogaim.c */
@@ -101 +130 @@
 void nogaim_init()
 {
-        GDir *dir;
-        GError *error = NULL;
+        extern void msn_init();
+        extern void oscar_init();
+        extern void byahoo_init();
+        extern void jabber_init();
 
 #ifdef WITH_MSN
-        extern void msn_init();
         msn_init();
 #endif
 
 #ifdef WITH_OSCAR
-        extern void oscar_init();
         oscar_init();
 #endif
         
 #ifdef WITH_YAHOO
-        extern void byahoo_init();
         byahoo_init();
 #endif
         
 #ifdef WITH_JABBER
-        extern void jabber_init();
         jabber_init();
 #endif
 
-        dir = g_dir_open(PLUGINDIR, 0, &error);
-
-        if (dir) {
-                const gchar *entry;
-                char *path;
-
-                while ((entry = g_dir_read_name(dir))) {
-                        path = g_build_filename(PLUGINDIR, entry, NULL);
-                        if(!path) {
-                                log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
-                                continue;
-                        }
-
-                        load_plugin(path);
-
-                        g_free(path);
-                }
-
-                g_dir_close(dir);
-        }
+#ifdef WITH_PLUGINS
+        load_plugins();
+#endif
 }
 
@@ -442 +452 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        serv_got_crap( gc, "Error: %s", msg );
+        if( msg && title )
+                serv_got_crap( gc, "Error: %s: %s", title, msg );
+        else if( msg )
+                serv_got_crap( gc, "Error: %s", msg );
+        else if( title )
+                serv_got_crap( gc, "Error: %s", title );
+        else
+                serv_got_crap( gc, "Error" );
 }
 
@@ -727 +744 @@
                 /* If there's a newline/space in this string, split up there,
                    looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
+                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
                 {
                         msg[425] = tmp;
@@ -751 +768 @@
 }
 
-void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout )
+void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type )
 {
         user_t *u;
@@ -758 +775 @@
                 return;
         
-        if( ( u = user_findhandle( gc, handle ) ) )
-                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
+        if( ( u = user_findhandle( gc, handle ) ) ) {
+                /* If type is:
+                 * 0: user has stopped typing
+                 * 1: user is actively typing
+                 * 2: user has entered text, but is not actively typing
+                 */
+                if (type == 0 || type == 1 || type == 2) {
+                        char buf[256]; 
+                        g_snprintf(buf, 256, "\1TYPING %d\1", type); 
+                        irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, buf );
+                }
+        }
 }