Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14337/src
Modified Files:
applet.c applet.h server.c
Log Message:
David Raeman's applet icons
Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- applet.c 2001/09/27 19:17:10 1.13
+++ applet.c 2001/10/09 23:40:18 1.14
@@ -110,7 +110,30 @@
} else if (!connections) {
gtk_pixmap_set(GTK_PIXMAP(icon), icon_offline_pm, icon_offline_bm);
applet_set_tooltips(_("Offline. Click to bring up login box."));
- } else if (!awaymessage) {
+ } else if (awaymessage) {
+ int dsr = 0;
+
+ if ((away_options & OPT_AWAY_QUEUE) && message_queue) {
+ GSList *m = message_queue;
+ int dsr = 0;
+ while (m) {
+ struct queued_message *qm = m->data;
+ if (qm->flags & WFLAG_RECV)
+ dsr++;
+ m = m->next;
+ }
+ }
+
+ if (dsr) {
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_msg_pending_pm, icon_msg_pending_bm);
+ g_snprintf(buf, sizeof(buf), _("Away: %d pending."), dsr);
+ } else {
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_away_pm, icon_away_bm);
+ g_snprintf(buf, sizeof(buf), _("Away."));
+ }
+
+ applet_set_tooltips(buf);
+ } else {
gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
g_snprintf(buf, sizeof buf, "Online: ");
while (c) {
@@ -120,8 +143,6 @@
strcat(buf, ", ");
}
applet_set_tooltips(buf);
- } else {
- gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
}
return TRUE;
@@ -135,6 +156,10 @@
&icon_connect_pm, &icon_connect_bm);
load_applet_icon(GAIM_GNOME_ONLINE_ICON, (sizehint - 1), (sizehint - 1),
&icon_online_pm, &icon_online_bm);
+ load_applet_icon(GAIM_GNOME_AWAY_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_away_pm, &icon_away_bm);
+ load_applet_icon(GAIM_GNOME_MSG_PENDING_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_msg_pending_pm, &icon_msg_pending_bm);
update_applet();
gtk_widget_set_usize(appletframe, sizehint, sizehint);
}
@@ -326,7 +351,11 @@
/*load online icon */
load_applet_icon(GAIM_GNOME_ONLINE_ICON, 32, 32, &icon_online_pm, &icon_online_bm);
- /*icon_away and icon_msg_pennding need to be implemented */
+ /*load away icon */
+ load_applet_icon(GAIM_GNOME_AWAY_ICON, 32, 32, &icon_away_pm, &icon_away_bm);
+
+ /*load msg_pending icon */
+ load_applet_icon(GAIM_GNOME_ONLINE_ICON, 32, 32, &icon_msg_pending_pm, &icon_msg_pending_bm);
icon = gtk_pixmap_new(icon_offline_pm, icon_offline_bm);
Index: applet.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- applet.h 2001/10/05 22:23:27 1.6
+++ applet.h 2001/10/09 23:40:18 1.7
@@ -63,9 +63,17 @@
#define GAIM_GNOME_PENGUIN_CONNECT "gaim/gnome/penguin-connect.png"
#define GAIM_GNOME_PENGUIN_ONLINE "gaim/gnome/penguin-online.png"
+/*
#define GAIM_GNOME_OFFLINE_ICON "apple-red.png"
#define GAIM_GNOME_CONNECT_ICON "gnome-battery.png"
#define GAIM_GNOME_ONLINE_ICON "apple-green.png"
+*/
+
+#define GAIM_GNOME_OFFLINE_ICON "gaim/offline.png"
+#define GAIM_GNOME_CONNECT_ICON "gaim/connect.png"
+#define GAIM_GNOME_ONLINE_ICON "gaim/online.png"
+#define GAIM_GNOME_AWAY_ICON "gaim/away.png"
+#define GAIM_GNOME_MSG_PENDING_ICON "gaim/msgpend.png"
extern GtkWidget *applet;
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- server.c 2001/10/05 22:06:27 1.196
+++ server.c 2001/10/09 23:40:18 1.197
@@ -510,6 +510,10 @@
qm->flags = WFLAG_RECV | away;
message_queue = g_slist_append(message_queue, qm);
+#ifdef USE_APPLET
+ set_user_state(away);
+#endif
+
row = find_queue_row_by_name(qm->name);
if (row >= 0) {
|
