Changeset 3314 for trunk/jons-gtk2-gui

Timestamp:

02/26/03 11:20:23 (6 years ago)

Author:

bostjanlah

Message:

A few minor changes

Location:

trunk/jons-gtk2-gui/src

Files:

• system_message.cpp (modified) (2 diffs)
• system_status.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 #include <gtk/gtk.h>
 
-void system_message_window()
+void
+system_message_window()
 {
     GtkWidget *button;
@@ -50 +51 @@
     GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(sm->text));
     /* Display what type of system message it is */
-    switch(event->SubCommand())
-    {
-    case ICQ_CMDxSUB_AUTHxREQUEST:
-        gtk_text_buffer_set_text(tb,
-                        "Authorization Request\n-------------------\n\n", -1);
-        menu_system_auth_user(0, ((CEventAuthRequest *)event)->Uin());
-        break;
-    
-    case ICQ_CMDxSUB_AUTHxGRANTED:
-        gtk_text_buffer_set_text(tb,
-                "Authorization Granted\n--------------------\n\n", -1);
-        break;
+    switch (event->SubCommand()) {
+      case ICQ_CMDxSUB_AUTHxREQUEST:
+          gtk_text_buffer_set_text(tb,
+                          "Authorization Request\n-------------------\n\n", -1);
+          menu_system_auth_user(0, ((CEventAuthRequest *)event)->Uin());
+          break;
 
-    case ICQ_CMDxSUB_AUTHxREFUSED:
-        gtk_text_buffer_set_text(tb,
-                "Authorization Refused\n--------------------\n\n", -1);
-        break;
+      case ICQ_CMDxSUB_AUTHxGRANTED:
+          gtk_text_buffer_set_text(tb,
+                  "Authorization Granted\n--------------------\n\n", -1);
+          break;
 
-    case ICQ_CMDxSUB_ADDEDxTOxLIST:
-        gtk_text_buffer_set_text(tb,
-                "Added To Contact List\n-------------------\n\n", -1);
-        break;
+      case ICQ_CMDxSUB_AUTHxREFUSED:
+          gtk_text_buffer_set_text(tb,
+                  "Authorization Refused\n--------------------\n\n", -1);
+          break;
 
-    case ICQ_CMDxSUB_WEBxPANEL:
-        gtk_text_buffer_set_text(tb,
-                "Web Panel\n--------\n\n", -1);
-        break;
+      case ICQ_CMDxSUB_ADDEDxTOxLIST:
+          gtk_text_buffer_set_text(tb,
+                  "Added To Contact List\n-------------------\n\n", -1);
+          break;
 
-    case ICQ_CMDxSUB_EMAILxPAGER:
-        gtk_text_buffer_set_text(tb,
-                "E-mail Pager\n-----------\n\n", -1);
-        break;
+      case ICQ_CMDxSUB_WEBxPANEL:
+          gtk_text_buffer_set_text(tb,
+                  "Web Panel\n--------\n\n", -1);
+          break;
 
-    default:
-        g_print("Unknown system message type\n");
+      case ICQ_CMDxSUB_EMAILxPAGER:
+          gtk_text_buffer_set_text(tb,
+                  "E-mail Pager\n-----------\n\n", -1);
+          break;
+
+      default:
+          g_print("Unknown system message type\n");
     }
 
     /* Display the system message */
     time_t time_recv = event->Time();
-    const gchar *time = g_strdup_printf("Time: %s\n",
-        ctime(&time_recv));
+    const gchar *time = g_strdup_printf("Time: %s\n",   ctime(&time_recv));
     const gchar *message = event->Text();
     GtkTextIter iter;

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

@@ -50 +50 @@
 }
 
-void system_status_refresh()
+void 
+system_status_refresh()
 {
     ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
@@ -60 +61 @@
     guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(system_status),
                         "Status");
-    if(num_owner_events > 0)
-    {
-        gtk_statusbar_pop(GTK_STATUSBAR(system_status), id);
+    gtk_statusbar_pop(GTK_STATUSBAR(system_status), id);
+    if (num_owner_events > 0)
         gtk_statusbar_push(GTK_STATUSBAR(system_status), id, "SysMsg");
+    else if (num_user_event > 0) {
+        gchar *label;
+    if (num_user_event == 1)
+        label = g_strdup_printf("%ld msg", num_user_event);
+    else
+        label = g_strdup_printf("%ld msgs", num_user_event);
+
+        gtk_statusbar_push(GTK_STATUSBAR(system_status), id, label);
+    g_free(label);
     }
-
-    else if(num_user_event > 0)
-    {
-        gchar *lbl;
-
-        if(num_user_event == 1)
-            lbl = "msg";
-
-        else
-            lbl = "msgs";
-
-        const gchar *label =
-            g_strdup_printf("%ld %s", num_user_event, lbl);
-
-        gtk_statusbar_pop(GTK_STATUSBAR(system_status), id);
-        gtk_statusbar_push(GTK_STATUSBAR(system_status), id, label);
-    }
-
     else
-    {
-        gtk_statusbar_pop(GTK_STATUSBAR(system_status), id);
         gtk_statusbar_push(GTK_STATUSBAR(system_status), id, "No msgs");
-    }
 
     if (num_owner_events > 0 || num_user_event > 0)
@@ -95 +83 @@
 }
 
-void system_status_click(GtkWidget *w, GdkEventButton *event, gpointer d)
+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))
+    if (event->type != GDK_2BUTTON_PRESS || event->button != 1)
         return;
 
     /* If no events are pending, leave */
-    if(ICQUser::getNumUserEvents() == 0)
+    if (ICQUser::getNumUserEvents() == 0)
         return;
 
@@ -109 +98 @@
     gushort owner_events = owner->NewMessages();
 
-    if(owner_events > 0)
-    {
+    if (owner_events > 0) {
         system_message_window();
         gUserManager.DropOwner();