[Commits] notification_popup.c 1.1.2.33 1.1.2.34 notification_trayicon.c 1.1.2.38 1.1.2.39

[miras at claws-mail.org]

Update of /home/claws-mail/plugins/notification/src
In directory claws-mail:/tmp/cvs-serv10388/src

Modified Files:
      Tag: gtk2
	notification_popup.c notification_trayicon.c 
Log Message:
2012-01-03 [mir]	0.29cvs3

	* src/notification_popup.c
	* src/notification_trayicon.c
	    We can load default icon.

Index: notification_trayicon.c
===================================================================
RCS file: /home/claws-mail/plugins/notification/src/Attic/notification_trayicon.c,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -d -r1.1.2.38 -r1.1.2.39
--- notification_trayicon.c	3 Jan 2012 00:26:59 -0000	1.1.2.38
+++ notification_trayicon.c	3 Jan 2012 01:02:42 -0000	1.1.2.39
@@ -602,9 +602,7 @@
 {
   gchar *summary = NULL;
   gchar *utf8_str = NULL;
-#ifndef USE_NEW_ADDRBOOK
   GdkPixbuf *pixbuf;
-#endif
   GList *caps = NULL;
   gboolean support_actions = FALSE;
 
@@ -661,9 +659,9 @@
     return FALSE;
   }
 
-#ifndef USE_NEW_ADDRBOOK
   /* Icon */
   pixbuf = NULL;
+#ifndef USE_NEW_ADDRBOOK
   if(msginfo && msginfo->from) {
     gchar *icon_path;
     icon_path = addrindex_get_picture_file(msginfo->from);
@@ -688,6 +686,7 @@
       debug_print("Picture path does not exist: %s\n",icon_path);
     g_free(icon_path);
   }
+#endif
   if(!pixbuf)
     pixbuf = g_object_ref(notification_pixbuf_get(NOTIFICATION_CM_LOGO_64x64));
 
@@ -697,7 +696,6 @@
   }
   else /* This is not fatal */
     debug_print("Notification plugin: Icon could not be loaded.\n");
-#endif
 
   /* timeout */
   notify_notification_set_timeout(popup.notification, notify_config.trayicon_popup_timeout);

Index: notification_popup.c
===================================================================
RCS file: /home/claws-mail/plugins/notification/src/Attic/notification_popup.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -d -r1.1.2.33 -r1.1.2.34
--- notification_popup.c	3 Jan 2012 00:26:59 -0000	1.1.2.33
+++ notification_popup.c	3 Jan 2012 01:02:42 -0000	1.1.2.34
@@ -281,9 +281,7 @@
 static gboolean notification_libnotify_create(MsgInfo *msginfo,
 					      NotificationFolderType nftype)
 {
-#ifndef USE_NEW_ADDRBOOK
   GdkPixbuf *pixbuf;
-#endif
   NotificationPopup *ppopup;
   gchar *summary = NULL;
   gchar *text = NULL;
@@ -381,9 +379,9 @@
 				   GINT_TO_POINTER(nftype),
 				   notification_libnotify_free_func);
 
-#ifndef USE_NEW_ADDRBOOK
   /* Icon */
   pixbuf = NULL;
+#ifndef USE_NEW_ADDRBOOK
   if(msginfo && msginfo->from) {
     gchar *icon_path;
     icon_path = addrindex_get_picture_file(msginfo->from);
@@ -408,6 +406,7 @@
       debug_print("Picture path does not exist: %s\n",icon_path);
     g_free(icon_path);
   }
+#endif
   if(!pixbuf)
    pixbuf = g_object_ref(notification_pixbuf_get(NOTIFICATION_CM_LOGO_64x64));
 
@@ -417,7 +416,6 @@
   }
   else /* This is not fatal */
     debug_print("Notification plugin: Icon could not be loaded.\n");
-#endif
 
   /* timeout */
   notify_notification_set_timeout(ppopup->notification, notify_config.popup_timeout);