PageRenderTime 27ms CodeModel.GetById 16ms RepoModel.GetById 0ms app.codeStats 0ms

/recipes/matchbox-applet-cards/files/oz-gpe.patch

https://github.com/e3c/openembedded
Patch | 466 lines | 420 code | 46 blank | 0 comment | 0 complexity | ad9b65ee078b1e01d4b385c5ed6bc9df MD5 | raw file
    

  1. --- mb-applet-cards-1.0.2/mb-applet-cards.desktop.ori	2005-11-10 21:17:56.000000000 +0100
    2. 

  2. +++ mb-applet-cards-1.0.2/mb-applet-cards.desktop	2005-11-10 21:18:11.000000000 +0100
    3. 

  3. @@ -1,7 +1,7 @@
    4. 

  4.  [Desktop Entry]
    5. 

  5.  Name=CF/SD Monitor
    6. 

  6.  Comment=Panel based CF/SD Monitor
    7. 

  7. -Exec=mb-applet-cards
    8. 

  8. +Exec=gpe-applet-cards
    9. 

  9.  Type=PanelApp
    10. 

  10.  Icon=cards.png
    11. 

  11.  Categories=Panel;Utility;MB
    12. 

  12. --- mb-applet-cards-1.0.2/mb-applet-cards.c.ori	2005-09-13 22:18:53.000000000 +0200
    13. 

  13. +++ mb-applet-cards-1.0.2/mb-applet-cards.c	2005-11-15 10:33:13.000000000 +0100
    14. 

  14. @@ -47,6 +47,8 @@
    15. 

  15.  #define POPUP_PTR_SZ 10
    16. 

  16.  
    17. 

  17.  #define IMG_PREFIX	"/usr/share/pixmaps"
    18. 

  18. +#define SD_MOUNT_PATH   "/media/card"
    19. 

  19. +#define CARD_CONTROL   "/sbin/cardctl"
    20. 

  20.  
    21. 

  21.  static char *ImgLookup[64] = {
    22. 

  22.    "cards."      IMG_EXT,
    23. 

  23. @@ -71,8 +73,8 @@
    24. 

  24.  
    25. 

  25.  GtkWidget *cards_window;
    26. 

  26.  GtkWidget *cards;
    27. 

  27. -GtkWidget *button;
    28. 

  28. -GtkWidget *button1;
    29. 

  29. +GtkWidget *button_cf;
    30. 

  30. +GtkWidget *button_sd;
    31. 

  31.  GtkWidget *boxV;
    32. 

  32.  GtkWidget *box_cf;
    33. 

  33.  GtkWidget *box_sd;
    34. 

  34. @@ -123,15 +125,15 @@
    35. 

  35.      int err;
    36. 

  36.      gtk_widget_hide (cards_window);
    37. 

  37.      if (old_cf_status == 1) {
    38. 

  38. -        err = system("cardctl eject 0");
    39. 

  39. -	if (err != 0) {
    40. 

  40. -	    error_dialog("CF/PCMCIA card eject failed!");
    41. 

  41. -	}
    42. 

  42. +        err = system(CARD_CONTROL " eject 0");
    43. 

  43. +        if (err != 0) {
    44. 

  44. +            error_dialog("CF/PCMCIA card eject failed!");
    45. 

  45. +        }
    46. 

  46.      } else {
    47. 

  47. -	err = system("cardctl insert 0");
    48. 

  48. -	if (err != 0) {
    49. 

  49. -	    error_dialog("CF/PCMCIA card insert failed!");
    50. 

  50. -	}
    51. 

  51. +        err = system(CARD_CONTROL " insert 0");
    52. 

  52. +        if (err != 0) {
    53. 

  53. +            error_dialog("CF/PCMCIA card insert failed!");
    54. 

  54. +        }
    55. 

  55.      }
    56. 

  56.  }
    57. 

  57.  
    58. 

  58. @@ -142,15 +144,15 @@
    59. 

  59.      GtkWidget *dialog;
    60. 

  60.      gtk_widget_hide (cards_window);
    61. 

  61.      if (old_sd_status == 1) {
    62. 

  62. -	err = system("umount /mnt/card");
    63. 

  63. -	if (err != 0) {
    64. 

  64. -	    error_dialog("SD/MMC card unmount failed!");
    65. 

  65. -	}
    66. 

  66. +        err = system("umount " SD_MOUNT_PATH);
    67. 

  67. +        if (err != 0) {
    68. 

  68. +            error_dialog("SD/MMC card unmount failed!");
    69. 

  69. +        }
    70. 

  70.      } else {
    71. 

  71. -	err = system("mount /mnt/card");
    72. 

  72. -	if (err != 0) {
    73. 

  73. -	    error_dialog("SD/MMC card mount failed!");
    74. 

  74. -	}
    75. 

  75. +        err = system("mount " SD_MOUNT_PATH);
    76. 

  76. +        if (err != 0) {
    77. 

  77. +            error_dialog("SD/MMC card mount failed!");
    78. 

  78. +        }
    79. 

  79.      }
    80. 

  80.  }
    81. 

  81.  
    82. 

  82. @@ -158,35 +160,35 @@
    83. 

  83.  {
    84. 

  84.      boxV = gtk_vbox_new(FALSE, 0);
    85. 

  85.  
    86. 

  86. -    button = gtk_button_new ();
    87. 

  87. +    button_cf = gtk_button_new ();
    88. 

  88.  
    89. 

  89. -    g_signal_connect (G_OBJECT (button), "clicked",
    90. 

  90. -		      G_CALLBACK (callback_cf), (gpointer) "cool button");
    91. 

  91. +    g_signal_connect (G_OBJECT (button_cf), "clicked",
    92. 

  92. +        G_CALLBACK (callback_cf), (gpointer) "button_cf");
    93. 

  93.  
    94. 

  94.      box_cf = xpm_label_box (IMG_PREFIX "/cf_mount.png", "CF eject\nlala");
    95. 

  95.  
    96. 

  96.      gtk_widget_show (box_cf);
    97. 

  97.  
    98. 

  98. -    gtk_container_add (GTK_CONTAINER (button), box_cf);
    99. 

  99. +    gtk_container_add (GTK_CONTAINER (button_cf), box_cf);
    100. 

  100.  
    101. 

  101. -    gtk_box_pack_start(GTK_BOX(boxV), button, FALSE, FALSE, 0);
    102. 

  102. +    gtk_box_pack_start(GTK_BOX(boxV), button_cf, FALSE, FALSE, 0);
    103. 

  103.  
    104. 

  104. -    gtk_widget_show (button);
    105. 

  105. +    gtk_widget_show (button_cf);
    106. 

  106.  
    107. 

  107. -    button1 = gtk_button_new ();
    108. 

  108. +    button_sd = gtk_button_new ();
    109. 

  109.  
    110. 

  110. -    g_signal_connect (G_OBJECT (button1), "clicked",
    111. 

  111. -		      G_CALLBACK (callback_sd), (gpointer) "cool button1");
    112. 

  112. +    g_signal_connect (G_OBJECT (button_sd), "clicked",
    113. 

  113. +        G_CALLBACK (callback_sd), (gpointer) "button_sd");
    114. 

  114.  
    115. 

  115.      box_sd = xpm_label_box (IMG_PREFIX "/sd_mount.png", "SD eject");
    116. 

  116.  
    117. 

  117.      gtk_widget_show (box_sd);
    118. 

  118.  
    119. 

  119. -    gtk_container_add (GTK_CONTAINER (button1), box_sd);
    120. 

  120. +    gtk_container_add (GTK_CONTAINER (button_sd), box_sd);
    121. 

  121.  
    122. 

  122. -    gtk_box_pack_start(GTK_BOX(boxV), button1, FALSE, FALSE, 0);
    123. 

  123. +    gtk_box_pack_start(GTK_BOX(boxV), button_sd, FALSE, FALSE, 0);
    124. 

  124.  
    125. 

  125. -    gtk_widget_show (button1);
    126. 

  126. +    gtk_widget_show (button_sd);
    127. 

  127.  
    128. 

  128.      gtk_container_add (GTK_CONTAINER (cards_window), boxV);
    129. 

  129.  
    130. 

  130. @@ -198,49 +200,51 @@
    131. 

  131.      int sd_found = 0;
    132. 

  132.      FILE *inf;
    133. 

  133.      char buf[256];
    134. 

  134. -    inf = fopen("/var/lib/pcmcia/stab", "r");
    135. 

  135. +    //inf = fopen("/var/lib/pcmcia/stab", "r");
    136. 

  136. +    inf = fopen("/var/run/stab", "r");
    137. 

  137.      fgets(buf, 256, inf);
    138. 

  138.      fclose(inf);
    139. 

  139.      if (strncmp(buf, "Socket 0: empty", 15 ) == 0) {
    140. 

  140. -//	if (old_cf_status != 0) {
    141. 

  141. -	    gtk_widget_destroy(box_cf);
    142. 

  142. -	    box_cf = xpm_label_box (IMG_PREFIX "/cf_unmount.png", "empty");
    143. 

  143. -	    gtk_widget_show (box_cf);
    144. 

  144. -	    gtk_container_add (GTK_CONTAINER (button), box_cf);
    145. 

  145. -//	}
    146. 

  146. -	old_cf_status = 0;
    147. 

  147. +// if (old_cf_status != 0) {
    148. 

  148. +        gtk_widget_destroy(box_cf);
    149. 

  149. +        box_cf = xpm_label_box (IMG_PREFIX "/cf_unmount.png", "empty");
    150. 

  150. +        gtk_widget_show (box_cf);
    151. 

  151. +        gtk_container_add (GTK_CONTAINER (button_cf), box_cf);
    152. 

  152. +// }
    153. 

  153. +    old_cf_status = 0;
    154. 

  154.      } else {
    155. 

  155. -//	if (old_cf_status != 1) {
    156. 

  156. -	    gtk_widget_destroy(box_cf);
    157. 

  157. -	    box_cf = xpm_label_box (IMG_PREFIX "/cf_mount.png", &buf[10]);
    158. 

  158. -	    gtk_widget_show (box_cf);
    159. 

  159. -	    gtk_container_add (GTK_CONTAINER (button), box_cf);	    
    160. 

  160. -//	}
    161. 

  161. -	old_cf_status = 1;
    162. 

  162. +// if (old_cf_status != 1) {
    163. 

  163. +        gtk_widget_destroy(box_cf);
    164. 

  164. +        box_cf = xpm_label_box (IMG_PREFIX "/cf_mount.png", &buf[10]);
    165. 

  165. +        gtk_widget_show (box_cf);
    166. 

  166. +        gtk_container_add (GTK_CONTAINER (button_cf), box_cf);	    
    167. 

  167. +// }
    168. 

  168. +    old_cf_status = 1;
    169. 

  169.      }
    170. 

  170.  
    171. 

  171.      inf = fopen("/etc/mtab", "r");
    172. 

  172.      while (!feof(inf)) {
    173. 

  173. -	fgets(buf, 256, inf);
    174. 

  174. -	if (strncmp(buf, "/dev/mmcd", 9) == 0) sd_found = 1;
    175. 

  175. +    fgets(buf, 256, inf);
    176. 

  176. +    //if (strncmp(buf, "/dev/mmcd", 9) == 0) sd_found = 1;
    177. 

  177. +    if (strncmp(buf, "/dev/mmc", 8) == 0) sd_found = 1;
    178. 

  178.      }
    179. 

  179.      fclose(inf);
    180. 

  180.      if (sd_found == 0) {
    181. 

  181. -//	if (old_sd_status != 0) {
    182. 

  182. -	    gtk_widget_destroy(box_sd);
    183. 

  183. -	    box_sd = xpm_label_box (IMG_PREFIX "/sd_unmount.png", "empty");
    184. 

  184. -	    gtk_widget_show (box_sd);
    185. 

  185. -	    gtk_container_add (GTK_CONTAINER (button1), box_sd);
    186. 

  186. -//	}
    187. 

  187. -	old_sd_status = 0;
    188. 

  188. +// if (old_sd_status != 0) {
    189. 

  189. +        gtk_widget_destroy(box_sd);
    190. 

  190. +        box_sd = xpm_label_box (IMG_PREFIX "/sd_unmount.png", "empty");
    191. 

  191. +        gtk_widget_show (box_sd);
    192. 

  192. +        gtk_container_add (GTK_CONTAINER (button_sd), box_sd);
    193. 

  193. +// }
    194. 

  194. +    old_sd_status = 0;
    195. 

  195.      } else {
    196. 

  196. -//	if (old_sd_status != 1) {
    197. 

  197. -	    gtk_widget_destroy(box_sd);
    198. 

  198. -	    box_sd = xpm_label_box (IMG_PREFIX "/sd_mount.png", "SD card");
    199. 

  199. -	    gtk_widget_show (box_sd);
    200. 

  200. -	    gtk_container_add (GTK_CONTAINER (button1), box_sd);
    201. 

  201. -//	}
    202. 

  202. -	old_sd_status = 1;
    203. 

  203. +// if (old_sd_status != 1) {
    204. 

  204. +        gtk_widget_destroy(box_sd);
    205. 

  205. +        box_sd = xpm_label_box (IMG_PREFIX "/sd_mount.png", "SD card");
    206. 

  206. +        gtk_widget_show (box_sd);
    207. 

  207. +        gtk_container_add (GTK_CONTAINER (button_sd), box_sd);
    208. 

  208. +// }
    209. 

  209. +    old_sd_status = 1;
    210. 

  210.      }
    211. 

  211.  }
    212. 

  212.  
    213. 

  213. @@ -250,13 +254,13 @@
    214. 

  214.  paint_callback (MBTrayApp *app, Drawable drw )
    215. 

  215.  {
    216. 

  216.    MBPixbufImage *img_backing = NULL;
    217. 

  217. -  
    218. 

  218. +
    219. 

  219.    img_backing = mb_tray_app_get_background (app, pb);
    220. 

  220.  
    221. 

  221.    /* CurrentVolLevel */
    222. 

  222. -  mb_pixbuf_img_composite(pb, img_backing, 
    223. 

  223. -			  ImgsScaled[0], 
    224. 

  224. -			  0, 0);
    225. 

  225. +  mb_pixbuf_img_composite(pb, img_backing,
    226. 

  226. +        ImgsScaled[0],
    227. 

  227. +        0, 0);
    228. 

  228.  
    229. 

  229.    mb_pixbuf_img_render_to_drawable(pb, img_backing, drw, 0, 0);
    230. 

  230.  
    231. 

  231. @@ -284,48 +288,46 @@
    232. 

  232.    for (i=0; i<1; i++)
    233. 

  233.      {
    234. 

  234.        if (Imgs[i] != NULL) mb_pixbuf_img_free(pb, Imgs[i]);
    235. 

  235. -      icon_path = mb_dot_desktop_icon_get_full_path (ThemeName, 
    236. 

  236. -						     32, 
    237. 

  237. -						     ImgLookup[i]);
    238. 

  238. -      
    239. 

  239. -      if (icon_path == NULL 
    240. 

  240. -	  || !(Imgs[i] = mb_pixbuf_img_new_from_file(pb, icon_path)))
    241. 

  241. -	{
    242. 

  242. -	  fprintf(stderr, "cards: failed to load icon\n" );
    243. 

  243. -	  exit(1);
    244. 

  244. -	}
    245. 

  245. +      icon_path = mb_dot_desktop_icon_get_full_path (ThemeName,
    246. 

  246. +                            32,
    247. 

  247. +                            ImgLookup[i]);
    248. 

  248.  
    249. 

  249. +      if (icon_path == NULL
    250. 

  250. +        || !(Imgs[i] = mb_pixbuf_img_new_from_file(pb, icon_path)))
    251. 

  251. +    {
    252. 

  252. +        fprintf(stderr, "cards: failed to load icon\n" );
    253. 

  253. +        exit(1);
    254. 

  254. +    }
    255. 

  255.        free(icon_path);
    256. 

  256.      }
    257. 

  257.  }
    258. 

  258.  
    259. 

  259. -void 
    260. 

  260. +void
    261. 

  261.  theme_callback (MBTrayApp *app, char *theme_name)
    262. 

  262.  {
    263. 

  263.    if (!theme_name) return;
    264. 

  264.    if (ThemeName) free(ThemeName);
    265. 

  265.    ThemeName = strdup(theme_name);
    266. 

  266. -  load_icons(); 	
    267. 

  267. +  load_icons();
    268. 

  268.    resize_callback (app, mb_tray_app_width(app), mb_tray_app_width(app) );
    269. 

  269.  }
    270. 

  270.  
    271. 

  271. +/*
    272. 

  272.  gboolean
    273. 

  273.  popup_close (GtkWidget *w, GtkWidget *list_view)
    274. 

  274.  {
    275. 

  275.    gtk_widget_hide (cards_window);
    276. 

  276.    PopupIsMapped = False;
    277. 

  277. -      
    278. 

  278.  }
    279. 

  279. +*/
    280. 

  280.  
    281. 

  281.  static void
    282. 

  282.  cards_clicked (GtkWidget *w, GdkEventButton *ev)
    283. 

  283.  {
    284. 

  284.    gdk_pointer_ungrab (ev->time);
    285. 

  285. -
    286. 

  286.    gtk_widget_hide (cards_window);
    287. 

  287.  }
    288. 

  288.  
    289. 

  289. -
    290. 

  290.  static void
    291. 

  291.  button_callback (MBTrayApp *app, int cx, int cy, Bool is_released)
    292. 

  292.  {
    293. 

  293. @@ -337,6 +339,7 @@
    294. 

  294.    if (PopupIsMapped) {
    295. 

  295.      gtk_widget_hide (cards_window);
    296. 

  296.      PopupIsMapped = False;
    297. 

  297. +    return;
    298. 

  298.    }
    299. 

  299.  
    300. 

  300.    mb_tray_app_get_absolute_coords (app, &x, &y);
    301. 

  301. @@ -344,65 +347,58 @@
    302. 

  302.    gtk_widget_show_all (cards_window);
    303. 

  303.  
    304. 

  304.    gdk_window_get_geometry (cards_window->window, NULL, NULL,
    305. 

  305. -			   &win_w, &win_h, NULL);
    306. 

  306. +            &win_w, &win_h, NULL);
    307. 

  307.  
    308. 

  308.    if (mb_tray_app_tray_is_vertical (app))
    309. 

  309.      {
    310. 

  310. -      if (x > (DisplayWidth(mb_tray_app_xdisplay(app), 
    311. 

  311. -			    mb_tray_app_xscreen(app)) /2) )
    312. 

  312. -	x -= ( mb_tray_app_width(app) + win_w );
    313. 

  313. +      if (x > (DisplayWidth(mb_tray_app_xdisplay(app),
    314. 

  314. +            mb_tray_app_xscreen(app)) /2) )
    315. 

  315. +    x -= ( mb_tray_app_width(app) + win_w );
    316. 

  316.        else
    317. 

  317. -	x += mb_tray_app_width(app);
    318. 

  318. +    x += mb_tray_app_width(app);
    319. 

  319.      }
    320. 

  320.    else
    321. 

  321.      {
    322. 

  322.        if (y < mb_tray_app_height(app))
    323. 

  323. -	{ y = mb_tray_app_height(app); }
    324. 

  324. +    { y = mb_tray_app_height(app); }
    325. 

  325.        else
    326. 

  326. -	{ 
    327. 

  327. -	  y = DisplayHeight(mb_tray_app_xdisplay(app), 
    328. 

  328. -			    mb_tray_app_xscreen(app)) 
    329. 

  329. -	    - win_h - mb_tray_app_height(app) - 4;
    330. 

  330. -	}
    331. 

  331. -
    332. 

  332. -      x -= (mb_tray_app_width(app)/2);
    333. 

  333. -      
    334. 

  334. -      if ((x + win_w) > DisplayWidth(mb_tray_app_xdisplay(app), 
    335. 

  335. -				     mb_tray_app_xscreen(app)))
    336. 

  336. -	x = DisplayWidth(mb_tray_app_xdisplay(app), 
    337. 

  337. -			 mb_tray_app_xscreen(app)) - win_w - 2;
    338. 

  338. +    {
    339. 

  339. +        y = DisplayHeight(mb_tray_app_xdisplay(app),
    340. 

  340. +            mb_tray_app_xscreen(app))
    341. 

  341. +        - win_h - mb_tray_app_height(app) - 4;
    342. 

  342. +    }
    343. 

  343. +
    344. 

  344. +        x -= (mb_tray_app_width(app)/2);
    345. 

  345. +
    346. 

  346. +        if ((x + win_w) > DisplayWidth(mb_tray_app_xdisplay(app),
    347. 

  347. +            mb_tray_app_xscreen(app)))
    348. 

  348. +        x = DisplayWidth(mb_tray_app_xdisplay(app),
    349. 

  349. +        mb_tray_app_xscreen(app)) - win_w - 2;
    350. 

  350.      }
    351. 

  351.  
    352. 

  352. -  
    353. 

  353.    check_for_cards();
    354. 

  354. -  
    355. 

  355. +
    356. 

  356.    gtk_widget_set_uposition (GTK_WIDGET (cards_window), x, y);
    357. 

  357. -  
    358. 

  358. +
    359. 

  359.    gdk_pointer_grab (cards_window->window, TRUE, GDK_BUTTON_PRESS_MASK, NULL, NULL, CurrentTime);
    360. 

  360.  
    361. 

  361.    PopupIsMapped = True;
    362. 

  362.  }
    363. 

  363.  
    364. 

  364. -
    365. 

  365. +/*
    366. 

  366.  void
    367. 

  367.  popup_vol_changed_cb (GtkAdjustment *adj, gpointer data)
    368. 

  368.  {
    369. 

  369.    int value;
    370. 

  370.    MBTrayApp *app = (MBTrayApp *)data;
    371. 

  371. -  
    372. 

  372.  
    373. 

  373.    mb_tray_app_repaint(app);
    374. 

  374.  }
    375. 

  375. +*/
    376. 

  376.  
    377. 

  377.  void
    378. 

  378.  popup_init(MBTrayApp *app)
    379. 

  379.  {
    380. 

  380. -  GtkWidget     *vbox;
    381. 

  381. -  GtkWidget     *hbox;
    382. 

  382. -  GtkWidget     *label;
    383. 

  383. -  GtkWidget     *button_mute, *button_ok;
    384. 

  384. -  GtkAdjustment *adj;
    385. 

  385. -
    386. 

  386.    cards_window = gtk_window_new (GTK_WINDOW_POPUP);
    387. 

  387.  
    388. 

  388.    g_signal_connect (G_OBJECT (cards_window), "button-press-event", G_CALLBACK (cards_clicked), NULL);
    389. 

  389. @@ -412,8 +408,6 @@
    390. 

  390.    gtk_widget_realize (cards_window);
    391. 

  391.  }
    392. 

  392.  
    393. 

  393. -
    394. 

  394. -
    395. 

  395.  GdkFilterReturn
    396. 

  396.  event_filter (GdkXEvent *xev, GdkEvent *gev, gpointer data)
    397. 

  397.  {
    398. 

  398. @@ -430,7 +424,6 @@
    399. 

  399.  static gboolean
    400. 

  400.  cards_timeout_cb (MBTrayApp *app)
    401. 

  401.  {
    402. 

  402. -  
    403. 

  403.    mb_tray_app_repaint(app);
    404. 

  404.  
    405. 

  405.    return TRUE;
    406. 

  406. @@ -451,40 +444,39 @@
    407. 

  407.  #endif
    408. 

  408.  
    409. 

  409.    /* XXX check for err_str here */
    410. 

  410. -  
    411. 

  411.    app = mb_tray_app_new_with_display ( "CF/SD Monitor",
    412. 

  412. -				       resize_callback,
    413. 

  413. -				       paint_callback,
    414. 

  414. -				       &argc,
    415. 

  415. -				       &argv,
    416. 

  416. -				       GDK_DISPLAY ());  
    417. 

  417. -  
    418. 

  418. -  if (!app) exit(0); 
    419. 

  419. -  
    420. 

  420. -  pb = mb_pixbuf_new(mb_tray_app_xdisplay(app), 
    421. 

  421. -		     mb_tray_app_xscreen(app));
    422. 

  422. -  
    423. 

  423. +                    resize_callback,
    424. 

  424. +                    paint_callback,
    425. 

  425. +                    &argc,
    426. 

  426. +                    &argv,
    427. 

  427. +                    GDK_DISPLAY ());
    428. 

  428. +
    429. 

  429. +  if (!app) exit(0);
    430. 

  430. +
    431. 

  431. +  pb = mb_pixbuf_new(mb_tray_app_xdisplay(app),
    432. 

  432. +        mb_tray_app_xscreen(app));
    433. 

  433. +
    434. 

  434.    mb_tray_app_set_theme_change_callback (app, theme_callback );
    435. 

  435.  
    436. 

  436.    mb_tray_app_set_button_callback (app, button_callback );
    437. 

  437. -  
    438. 

  438. +
    439. 

  439.    gtk_timeout_add (500,
    440. 

  440. -		   (GSourceFunc) cards_timeout_cb,
    441. 

  441. -		   app);
    442. 

  442. -  
    443. 

  443. +        (GSourceFunc) cards_timeout_cb,
    444. 

  444. +        app);
    445. 

  445. +
    446. 

  446.    load_icons();
    447. 

  447. -  
    448. 

  448. +
    449. 

  449.    mb_tray_app_set_icon(app, pb, Imgs[0]);
    450. 

  450.  
    451. 

  451.    popup_init(app);
    452. 

  452.  
    453. 

  453.    mb_tray_app_main_init (app);
    454. 

  454. -  
    455. 

  455. +
    456. 

  456.    gdk_window_add_filter (NULL, event_filter, (gpointer)app );
    457. 

  457. -  
    458. 

  458. +
    459. 

  459.    init_buttons();
    460. 

  460. -  
    461. 

  461. +
    462. 

  462.    gtk_main ();
    463. 

  463. -  
    464. 

  464. +
    465. 

  465.    return 1;
    466. 

  466.  }
    467. 

  467.