gg-sigsev.patch

   1 diff -ur gg-0.2.2pre6/src/callbacks.c gg/src/callbacks.c
   2 --- gg-0.2.2pre6/src/callbacks.c        Wed Mar 27 11:35:56 2002
   3 +++ gg/src/callbacks.c  Fri Mar 29 00:40:37 2002
   4 @@ -1,4 +1,4 @@
   5 -/* $Id$ */
   6 +/* $Id$ */
   7
   8  /*
   9   * (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
  10 @@ -1559,3 +1559,11 @@
  11  {
  12      gg_delete_userlist();
  13  }
  14 +
  15 +
  16 +void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data)
  17 +{
  18 +    GtkWidget *widget;
  19 +    widget = create_pubdir_info();
  20 +    gtk_widget_show(widget);
  21 +}
  22 diff -ur gg-0.2.2pre6/src/callbacks.h gg/src/callbacks.h
  23 --- gg-0.2.2pre6/src/callbacks.h        Mon Feb 18 12:46:14 2002
  24 +++ gg/src/callbacks.h  Fri Mar 29 00:40:37 2002
  25 @@ -1,4 +1,4 @@
  26 -/* $Id$ */
  27 +/* $Id$ */
  28
  29  /*
  30   * (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
  31 @@ -89,3 +89,5 @@
  32  void on_import_activate(GtkMenuItem * menuitem, gpointer user_data);
  33  void on_export_activate(GtkMenuItem * menuitem, gpointer user_data);
  34  void on_delete_activate(GtkMenuItem * menuitem, gpointer user_data);
  35 +
  36 +void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data);
  37 diff -ur gg-0.2.2pre6/src/dock.c gg/src/dock.c
  38 --- gg-0.2.2pre6/src/dock.c     Mon Mar 25 09:24:15 2002
  39 +++ gg/src/dock.c       Thu Apr  4 09:04:03 2002
  40 @@ -1,4 +1,4 @@
  41 -/* $Id$ */
  42 +/* $Id$ */
  43
  44  /*
  45   * (C) Copyright 2001-2002 Igor Popik. Released under terms of GPL license.
  46 @@ -29,8 +29,17 @@
  47
  48  #if USE_APPLET || USE_DOCKLET
  49
  50 +#include "callbacks.h"
  51 +
  52  extern GtkWidget *window;
  53
  54 +enum {
  55 +       MENU_ONLINE_IDX,
  56 +       MENU_AWAY_IDX,
  57 +       MENU_INVISIBLE_IDX,
  58 +       MENU_OFFLINE_IDX
  59 +};
  60 +
  61  gboolean show_hide_main(GtkWidget * widget, gpointer data)
  62  {
  63         if (!GTK_WIDGET_VISIBLE(window)) {
  64 @@ -42,17 +51,36 @@
  65  }
  66
  67  static
  68 -void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
  69 -                      gpointer data)
  70 +void applet_menu_change_status(GtkWidget * widget, gint * index)
  71  {
  72 +       GtkWidget *optionmenu;
  73 +       GtkWidget *status_menu;
  74
  75 -       if (ev == NULL)
  76 -               return;
  77 -       if (ev->button != 1 || ev->type != GDK_BUTTON_PRESS)
  78 -               return;
  79 -       show_hide_main(widget, NULL);
  80 +       switch (*index) {
  81 +       case MENU_ONLINE_IDX:
  82 +               on_available_activate(NULL, NULL);
  83 +               break;
  84 +       case MENU_AWAY_IDX:
  85 +               on_away_activate(NULL, NULL);
  86 +               break;
  87 +       case MENU_INVISIBLE_IDX:
  88 +               on_invisible_activate(NULL, NULL);
  89 +               break;
  90 +       case MENU_OFFLINE_IDX:
  91 +               on_not_available_activate(NULL, NULL);
  92 +               break;
  93 +       }
  94 +
  95 +       optionmenu = lookup_widget(window, "optionmenu");
  96 +       status_menu =
  97 +           gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
  98
  99 +       gtk_widget_ref(status_menu);
 100 +       gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
 101 +       gtk_menu_set_active(GTK_MENU(status_menu), *index);
 102 +       gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
 103  }
 104 +
 105  #endif
 106
 107  #ifdef USE_APPLET
 108 @@ -63,19 +91,23 @@
 109  #include <gdk/gdk.h>
 110
 111  #include "interface.h"
 112 -#include "callbacks.h"
 113 -
 114 -enum {
 115 -       MENU_ONLINE_IDX,
 116 -       MENU_AWAY_IDX,
 117 -       MENU_INVISIBLE_IDX,
 118 -       MENU_OFFLINE_IDX
 119 -};
 120
 121  extern GGConfig config;
 122  extern GtkWidget *applet;
 123
 124  static
 125 +void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
 126 +                      gpointer data)
 127 +{
 128 +
 129 +       if (ev == NULL)
 130 +               return;
 131 +       if (ev->button != 1 || ev->type != GDK_BUTTON_PRESS)
 132 +               return;
 133 +       show_hide_main(widget, NULL);
 134 +
 135 +}
 136 +static
 137  gint applet_save_session(GtkWidget * widget,
 138                          const gchar * privcfgpath,
 139                          const gchar * globcfgpath)
 140 @@ -120,36 +152,6 @@
 141  }
 142  #endif
 143
 144 -static
 145 -void applet_menu_change_status(GtkWidget * widget, gint * index)
 146 -{
 147 -       GtkWidget *optionmenu;
 148 -       GtkWidget *status_menu;
 149 -
 150 -       switch (*index) {
 151 -       case MENU_ONLINE_IDX:
 152 -               on_available_activate(NULL, NULL);
 153 -               break;
 154 -       case MENU_AWAY_IDX:
 155 -               on_away_activate(NULL, NULL);
 156 -               break;
 157 -       case MENU_INVISIBLE_IDX:
 158 -               on_invisible_activate(NULL, NULL);
 159 -               break;
 160 -       case MENU_OFFLINE_IDX:
 161 -               on_not_available_activate(NULL, NULL);
 162 -               break;
 163 -       }
 164 -
 165 -       optionmenu = lookup_widget(window, "optionmenu");
 166 -       status_menu =
 167 -           gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
 168 -
 169 -       gtk_widget_ref(status_menu);
 170 -       gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
 171 -       gtk_menu_set_active(GTK_MENU(status_menu), *index);
 172 -       gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
 173 -}
 174
 175  void applet_change_status_pixmap(gchar *filename)
 176  {
 177 @@ -581,6 +583,109 @@
 178
 179  }
 180
 181 +GtkWidget *create_docklet_menu()
 182 +{
 183 +    GtkWidget *menu;
 184 +    GtkWidget *submenu;
 185 +    GtkWidget *menuitem;
 186 +    static gint menus[] = { 0, 1, 2, 3 };
 187 +
 188 +    menu = gtk_menu_new();
 189 +
 190 +    submenu = gtk_menu_new();
 191 +    gtk_widget_show(submenu);
 192 +
 193 +    menuitem = gtk_menu_item_new_with_label(_("Dostêpny"));
 194 +    gtk_widget_show(menuitem);
 195 +    gtk_menu_append(GTK_MENU(submenu), menuitem);
 196 +
 197 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 198 +                          GTK_SIGNAL_FUNC(applet_menu_change_status),
 199 +                          &menus[MENU_ONLINE_IDX]);
 200 +
 201 +
 202 +    menuitem = gtk_menu_item_new_with_label(_("Zaraz wracam"));
 203 +    gtk_widget_show(menuitem);
 204 +    gtk_menu_append(GTK_MENU(submenu), menuitem);
 205 +
 206 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 207 +                          GTK_SIGNAL_FUNC(applet_menu_change_status),
 208 +                          &menus[MENU_AWAY_IDX]);
 209 +
 210 +    menuitem = gtk_menu_item_new_with_label(_("Niewidzialny"));
 211 +    gtk_widget_show(menuitem);
 212 +    gtk_menu_append(GTK_MENU(submenu), menuitem);
 213 +
 214 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 215 +                          GTK_SIGNAL_FUNC(applet_menu_change_status),
 216 +                          &menus[MENU_INVISIBLE_IDX]);
 217 +
 218 +
 219 +    menuitem = gtk_menu_item_new_with_label(_("Niedostêpny"));
 220 +    gtk_widget_show(menuitem);
 221 +    gtk_menu_append(GTK_MENU(submenu), menuitem);
 222 +
 223 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 224 +                          GTK_SIGNAL_FUNC(applet_menu_change_status),
 225 +                          &menus[MENU_OFFLINE_IDX]);
 226 +
 227 +    menuitem = gtk_menu_item_new_with_label(_("Zmieñ status"));
 228 +    gtk_widget_show(menuitem);
 229 +    gtk_menu_append(GTK_MENU(menu), menuitem);
 230 +    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 231 +
 232 +    menuitem = gtk_menu_item_new();
 233 +    gtk_widget_show(menuitem);
 234 +    gtk_menu_append(GTK_MENU(menu), menuitem);
 235 +
 236 +    menuitem = gtk_menu_item_new_with_label(_("Preferencje"));
 237 +    gtk_widget_show(menuitem);
 238 +    gtk_menu_append(GTK_MENU(menu), menuitem);
 239 +
 240 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 241 +                          GTK_SIGNAL_FUNC(on_konfiguracja_activate), NULL);
 242 +
 243 +    menuitem = gtk_menu_item_new_with_label(_("Zakoñcz"));
 244 +    gtk_widget_show(menuitem);
 245 +    gtk_menu_append(GTK_MENU(menu), menuitem);
 246 +
 247 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 248 +                          GTK_SIGNAL_FUNC(on_wyjscie_activate), NULL);
 249 +
 250 +
 251 +    menuitem = gtk_menu_item_new_with_label(_("Informacje o..."));
 252 +    gtk_widget_show(menuitem);
 253 +    gtk_menu_append(GTK_MENU(menu), menuitem);
 254 +
 255 +    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 256 +                          GTK_SIGNAL_FUNC(on_informacje_o_activate), NULL);
 257 +
 258 +
 259 +
 260 +    return menu;
 261 +}
 262 +
 263 +static
 264 +void docklet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
 265 +                      gpointer data)
 266 +{
 267 +
 268 +       GtkWidget *menu;
 269 +
 270 +       if (ev == NULL)
 271 +               return;
 272 +       if (ev->type == GDK_BUTTON_PRESS) {
 273 +           switch (ev->button) {
 274 +               case 1:
 275 +                       show_hide_main(widget, NULL);
 276 +                       break;
 277 +               default:
 278 +                       menu = create_docklet_menu();
 279 +                       gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
 280 +                       ev->button, ev->time);
 281 +           }
 282 +       }
 283 +}
 284
 285  GtkWidget *create_docklet()
 286  {
 287 @@ -614,7 +719,7 @@
 288         gtk_widget_show(pixmap);
 289
 290         gtk_signal_connect(GTK_OBJECT(docklet), "button_press_event",
 291 -                          GTK_SIGNAL_FUNC(applet_clicked_cb), NULL);
 292 +                          GTK_SIGNAL_FUNC(docklet_clicked_cb), NULL);
 293         kwm_dockwindow_atom = gdk_atom_intern("KWM_DOCKWINDOW", FALSE);
 294         kde_net_system_tray_window_for_atom = gdk_atom_intern("_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", FALSE);
 295         data[0] = TRUE;
 296 diff -ur gg-0.2.2pre6/src/gg.c gg/src/gg.c
 297 --- gg-0.2.2pre6/src/gg.c       Wed Mar 27 11:35:57 2002
 298 +++ gg/src/gg.c Wed Apr  3 22:55:39 2002
 299 @@ -1,4 +1,4 @@
 300 -/* $Id$ */
 301 +/* $Id$ */
 302
 303  /*
 304   * (C) Copyright 2001-2002 Igor Popik. Released under terms of GPL license.
 305 @@ -131,10 +131,8 @@
 306         gint cnt = 0;
 307
 308         tmplist = watches;
 309 -       g_print("TIMEOUT\n");
 310 +       g_print("TIMEOUT %d\n", (int) tmplist);
 311         while (tmplist) {
 312 -               g_print("timeout = %d\n", r->timeout);
 313 -
 314                 r = ((GGWatch *) (tmplist->data));
 315
 316                 if (r != NULL) {
 317 @@ -150,6 +148,7 @@
 318                 cnt++;
 319                 tmplist = tmplist->next;
 320         }
 321 +       g_print("OUT\n");
 322         if (cnt)
 323                 return TRUE;
 324         else {
 325 diff -ur gg-0.2.2pre6/src/interface.c gg/src/interface.c
 326 --- gg-0.2.2pre6/src/interface.c        Wed Mar 27 11:44:59 2002
 327 +++ gg/src/interface.c  Sun Mar 31 11:09:27 2002
 328 @@ -1,4 +1,4 @@
 329 -/* $Id$ */
 330 +/* $Id$ */
 331
 332  /*
 333   * (C) Copyright 2001 Igor Popik. Released under terms of GPL license.
 334 @@ -82,6 +82,12 @@
 335          (gpointer) on_przypomnij_haslo_activate, NULL, NULL,
 336          GNOME_APP_PIXMAP_NONE, NULL,
 337          0, (GdkModifierType) 0, NULL},
 338 +       {
 339 +        GNOME_APP_UI_ITEM, N_("Katalog publiczny"),
 340 +        NULL,
 341 +        (gpointer) on_katalog_publiczny_activate, NULL, NULL,
 342 +        GNOME_APP_PIXMAP_NONE, NULL,
 343 +        0, (GdkModifierType) 0, NULL},
 344
 345         GNOMEUIINFO_MENU_PREFERENCES_ITEM(on_konfiguracja_activate, NULL),
 346         {
 347 @@ -2409,3 +2415,167 @@
 348
 349         return register_dialog;
 350  }
 351 +
 352 +
 353 +GtkWidget *create_pubdir_info()
 354 +{
 355 +       GtkWidget *pubdir;
 356 +       GtkWidget *main_vbox;
 357 +       GtkWidget *vbox;
 358 +       GtkWidget *frame;
 359 +       GtkWidget *hbox;
 360 +       GtkWidget *pixmap;
 361 +       GtkWidget *label;
 362 +       GtkWidget *entry;
 363 +       GtkWidget *hbuttonbox;
 364 +       GtkWidget *button;
 365 +
 366 +       pubdir = gtk_window_new(GTK_WINDOW_DIALOG);
 367 +       gtk_object_set_data(GTK_OBJECT(pubdir), "pubdir", pubdir);
 368 +       gtk_widget_set_usize(pubdir, 430, 250);
 369 +       gtk_window_set_title(GTK_WINDOW(pubdir),
 370 +                            _("Edycja danych w katalogu publicznym"));
 371 +       gtk_window_set_position(GTK_WINDOW(pubdir), GTK_WIN_POS_CENTER);
 372 +
 373 +       main_vbox = gtk_vbox_new(FALSE, 0);
 374 +       gtk_widget_show(main_vbox);
 375 +       gtk_container_add(GTK_CONTAINER(pubdir), main_vbox);
 376 +
 377 +       frame = gtk_frame_new(_("Osoba"));
 378 +       gtk_widget_show(frame);
 379 +       gtk_box_pack_start(GTK_BOX(main_vbox), frame, TRUE, TRUE,
 380 +                          3);
 381 +       gtk_container_set_border_width(GTK_CONTAINER(frame), 3);
 382 +
 383 +       vbox = gtk_vbox_new(FALSE, 0);
 384 +       gtk_widget_show(vbox);
 385 +       gtk_container_add(GTK_CONTAINER(frame), vbox);
 386 +
 387 +       hbox = gtk_hbox_new(FALSE, 0);
 388 +       gtk_widget_show(hbox);
 389 +       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 390 +
 391 +       pixmap = create_pixmap(pubdir, "pubdir_info.xpm");
 392 +       gtk_widget_show(pixmap);
 393 +       gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE,
 394 +                          0);
 395 +
 396 +       vbox = gtk_vbox_new(FALSE, 0);
 397 +       gtk_widget_show(vbox);
 398 +       gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE,
 399 +                          0);
 400 +
 401 +       hbox = gtk_hbox_new(FALSE, 0);
 402 +       gtk_widget_show(hbox);
 403 +       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE,
 404 +                          0);
 405 +
 406 +       label = gtk_label_new(_("Imiê: "));
 407 +       gtk_widget_show(label);
 408 +       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE,
 409 +                          FALSE, 5);
 410 +       gtk_widget_set_usize(label, 45, -2);
 411 +
 412 +       entry = gtk_entry_new();
 413 +       gtk_widget_ref(entry);
 414 +       gtk_object_set_data_full(GTK_OBJECT(pubdir), "first_name",
 415 +                                entry,
 416 +                                (GtkDestroyNotify) gtk_widget_unref);
 417 +       gtk_widget_show(entry);
 418 +       gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, TRUE,
 419 +                          0);
 420 +       gtk_widget_set_usize(entry, 110, -2);
 421 +
 422 +       label = gtk_label_new(_("Nazwisko: "));
 423 +       gtk_widget_show(label);
 424 +       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE,
 425 +                          FALSE, 10);
 426 +
 427 +       entry = gtk_entry_new();
 428 +       gtk_widget_ref(entry);
 429 +       gtk_object_set_data_full(GTK_OBJECT(pubdir), "last_name",
 430 +                                entry,
 431 +                                (GtkDestroyNotify) gtk_widget_unref);
 432 +       gtk_widget_show(entry);
 433 +       gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, TRUE,
 434 +                          0);
 435 +       gtk_widget_set_usize(entry, 110, -2);
 436 +
 437 +       hbox = gtk_hbox_new(FALSE, 0);
 438 +       gtk_widget_show(hbox);
 439 +       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE,
 440 +                          0);
 441 +
 442 +       label = gtk_label_new(_("Pseudo:"));
 443 +       gtk_widget_show(label);
 444 +       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE,
 445 +                          FALSE, 5);
 446 +       gtk_widget_set_usize(label, 45, -2);
 447 +
 448 +       entry = gtk_entry_new();
 449 +       gtk_widget_ref(entry);
 450 +       gtk_object_set_data_full(GTK_OBJECT(pubdir), "nick", entry,
 451 +                                (GtkDestroyNotify) gtk_widget_unref);
 452 +       gtk_widget_show(entry);
 453 +       gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, TRUE, 0);
 454 +       gtk_widget_set_usize(entry, 110, -2);
 455 +
 456 +       frame = gtk_frame_new(_("Miejscowo¶æ"));
 457 +       gtk_widget_show(frame);
 458 +       gtk_box_pack_start(GTK_BOX(main_vbox), frame, TRUE, TRUE,
 459 +                          3);
 460 +       gtk_container_set_border_width(GTK_CONTAINER(frame), 3);
 461 +
 462 +       hbox = gtk_hbox_new(FALSE, 0);
 463 +       gtk_widget_show(hbox);
 464 +       gtk_container_add(GTK_CONTAINER(frame), hbox);
 465 +
 466 +       entry = gtk_entry_new();
 467 +       gtk_widget_ref(entry);
 468 +       gtk_object_set_data_full(GTK_OBJECT(pubdir), "city", entry,
 469 +                                (GtkDestroyNotify) gtk_widget_unref);
 470 +       gtk_widget_show(entry);
 471 +       gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, TRUE, 5);
 472 +       gtk_widget_set_usize(entry, 100, -2);
 473 +
 474 +       frame = gtk_frame_new(_("Tel. komórkowy"));
 475 +       gtk_widget_show(frame);
 476 +       gtk_box_pack_start(GTK_BOX(main_vbox), frame, TRUE, TRUE,
 477 +                          3);
 478 +       gtk_container_set_border_width(GTK_CONTAINER(frame), 3);
 479 +
 480 +       hbox = gtk_hbox_new(FALSE, 0);
 481 +       gtk_widget_show(hbox);
 482 +       gtk_container_add(GTK_CONTAINER(frame), hbox);
 483 +
 484 +       entry = gtk_entry_new();
 485 +       gtk_widget_ref(entry);
 486 +       gtk_object_set_data_full(GTK_OBJECT(pubdir), "mobile", entry,
 487 +                                (GtkDestroyNotify) gtk_widget_unref);
 488 +       gtk_widget_show(entry);
 489 +       gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
 490 +       gtk_widget_set_usize(entry, 100, -2);
 491 +
 492 +       hbuttonbox = gtk_hbutton_box_new();
 493 +       gtk_widget_show(hbuttonbox);
 494 +       gtk_box_pack_start(GTK_BOX(main_vbox), hbuttonbox, FALSE, TRUE,
 495 +                          0);
 496 +
 497 +       button = gtk_button_new_with_label(_("Ok"));
 498 +       gtk_widget_show(button);
 499 +       gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
 500 +       GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 501 +       gtk_signal_connect(GTK_OBJECT(button), "clicked",
 502 +                          GTK_SIGNAL_FUNC(on_zamknij_anuluj_clicked), pubdir);
 503 +
 504 +       button = gtk_button_new_with_label(_("Anuluj"));
 505 +       gtk_widget_show(button);
 506 +       gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
 507 +       GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 508 +
 509 +       gtk_signal_connect(GTK_OBJECT(button), "clicked",
 510 +                          GTK_SIGNAL_FUNC(on_zamknij_anuluj_clicked),
 511 +                          pubdir);
 512 +
 513 +       return pubdir;
 514 +}