Changeset 3408 for trunk/jons-gtk2-gui

Timestamp:

03/24/03 04:01:55 (6 years ago)

Author:

bostjanlah

Message:

Use status_change
A few other minor changes

Files:

• trunk/jons-gtk2-gui/src/system_status.cpp (modified) (7 diffs)

trunk/jons-gtk2-gui/src/system_status.cpp

@@ -19 +19 @@
  */
 
+#include "utilities.h"
 #include "licq_gtk.h"
 
@@ -24 +25 @@
 
 GtkWidget *system_status;
+bool allow_refresh = true;
 
-void system_status_click(GtkWidget *, GdkEventButton *, gpointer);
 void system_message_window();
 void licq_tray_start_flashing();
 void licq_tray_stop_flashing();
+void convo_open(ICQUser *);
 
-GtkWidget *system_status_new(gint borderwidth)
+gboolean
+system_status_click(GtkWidget *w, GdkEventButton *event, gpointer)
+{
+    /* Make sure we have a double click here */
+    if (event->type != GDK_2BUTTON_PRESS || event->button != 1)
+        return TRUE;
+
+    /* If no events are pending, leave */
+    if (ICQUser::getNumUserEvents() == 0)
+        return TRUE;
+
+    /* Check for system messages first */
+    ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
+    gushort owner_events = owner->NewMessages();
+
+    if (owner_events > 0) {
+        system_message_window();
+        gUserManager.DropOwner();
+        return TRUE;
+    }
+    else
+        gUserManager.DropOwner();
+
+    /* Now for the user messages */
+    allow_refresh = false;
+    FOR_EACH_USER_START(LOCK_R)
+    {
+        if (pUser->NewMessages() > 0)
+            convo_open(pUser);
+    }   
+    FOR_EACH_USER_END
+    allow_refresh = true;
+
+    contact_list_refresh();
+    system_status_refresh();
+
+    return TRUE;
+}
+
+GtkWidget *
+system_status_new()
 {
     system_status = gtk_statusbar_new();
 
-    gtk_container_set_border_width(GTK_CONTAINER(system_status), borderwidth);
+    gtk_container_set_border_width(GTK_CONTAINER(system_status), 2);
 
     /* The event box for new messages */
@@ -46 +88 @@
             G_CALLBACK(system_status_click), 0);
     
-    gtk_widget_show(system_status);
-    gtk_widget_show(event_box);
+    gtk_widget_show_all(event_box);
 
     return event_box;
@@ -55 +96 @@
 system_status_refresh()
 {
+    if (!allow_refresh)
+        return;
+        
     ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
     gushort num_owner_events = owner->NewMessages();
@@ -61 +105 @@
     gulong num_user_event = ICQUser::getNumUserEvents() - num_owner_events;
 
-    guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(system_status),
-                        "Status");
-    gtk_statusbar_pop(GTK_STATUSBAR(system_status), id);
     if (num_owner_events > 0)
-        gtk_statusbar_push(GTK_STATUSBAR(system_status), id, "SysMsg");
+        status_change(system_status, "sta", "SysMsg");
     else if (num_user_event > 0) {
         gchar *label;
@@ -73 +114 @@
         label = g_strdup_printf("%ld msgs", num_user_event);
 
-        gtk_statusbar_push(GTK_STATUSBAR(system_status), id, label);
+        status_change(system_status, "sta", label);
     g_free(label);
     }
     else
-        gtk_statusbar_push(GTK_STATUSBAR(system_status), id, "No msgs");
+        status_change(system_status, "sta", "No msgs");
 
     if (num_owner_events > 0 || num_user_event > 0)
@@ -84 +125 @@
         licq_tray_stop_flashing();
 }
-
-void 
-system_status_click(GtkWidget *w, GdkEventButton *event, gpointer d)
-{
-    /* Make sure we have a double click here */
-    if (event->type != GDK_2BUTTON_PRESS || event->button != 1)
-        return;
-
-    /* If no events are pending, leave */
-    if (ICQUser::getNumUserEvents() == 0)
-        return;
-
-    /* Check for system messages first */
-    ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
-    gushort owner_events = owner->NewMessages();
-
-    if (owner_events > 0) {
-        system_message_window();
-        gUserManager.DropOwner();
-        return;
-    }
-    else
-        gUserManager.DropOwner();
-
-    /* Now for the user messages */
-    FOR_EACH_USER_START(LOCK_R)
-    {
-        if(pUser->NewMessages() > 0)
-            convo_open(pUser, false);
-    }   
-    FOR_EACH_USER_END
-
-    contact_list_refresh();
-    system_status_refresh();
-}