16637N/A--- /tmp/t/gnome-pilot-2.0.17/applet/pilot.c 2007-01-11 08:32:39.000000000 +0000

16637N/A+++ gnome-pilot-2.0.17/applet/pilot.c 2009-05-04 23:55:04.000000000 +0100

16637N/A@@ -29,7 +29,7 @@

16637N/A #include <errno.h>

16637N/A #include <gnome.h>

16637N/A #include <glade/glade.h>

16637N/A-#include <libgnomeui/gnome-window-icon.h>

16637N/A+#include <gtk/gtk.h>

16637N/A #include <panel-applet-gconf.h>

16637N/A

16637N/A #include <signal.h>

16637N/A@@ -131,6 +131,7 @@

16637N/A {

16637N/A GdkColormap *colormap;

16637N/A gchar *buf;

16637N/A+ GError *error;

16637N/A PilotApplet *applet = PILOT_APPLET (user_data);

16637N/A

16637N/A gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),

16637N/A@@ -146,8 +147,8 @@

16637N/A if (applet->properties.popups == FALSE) return;

16637N/A

16637N/A if (applet->progressDialog == NULL) {

16637N/A- gnome_window_icon_set_default_from_file (

16637N/A- GNOME_ICONDIR "/sync_icon.png");

16637N/A+ gtk_window_set_default_icon_from_file (

16637N/A+ GNOME_ICONDIR "/sync_icon.png", &error);

16637N/A GladeXML *xml = glade_xml_new (applet->glade_file,"ProgressDialog",NULL);

16637N/A applet->progressDialog = glade_xml_get_widget (xml,"ProgressDialog");

16637N/A applet->sync_label = glade_xml_get_widget (xml,"sync_label");

16637N/A@@ -427,7 +428,10 @@

16637N/A

16637N/A static void

16637N/A about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)

16637N/A+

16637N/A {

16637N/A+ GError *error;

16637N/A+

16637N/A GtkWidget *about;

16637N/A const gchar *authors[] = {"Vadim Strizhevsky <vadim@optonline.net>",

16637N/A "Eskil Heyn Olsen, <eskil@eskil.dk>",

16637N/A@@ -437,8 +441,15 @@

16637N/A "Matt Davey <mcdavey@mrao.cam.ac.uk>",

16637N/A NULL};

16637N/A

16637N/A- gnome_window_icon_set_default_from_file (

16637N/A- GNOME_ICONDIR "/sync_icon.png");

16637N/A+ gtk_window_set_default_icon_from_file (

16637N/A+ GNOME_ICONDIR "/sync_icon.png", &error);

16637N/A+

16637N/A+

16637N/A+ if (error)

16637N/A+ {

16637N/A+ g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" );

16637N/A+ }

16637N/A+

16637N/A about = gnome_about_new (_("gnome-pilot applet"),

16637N/A VERSION,

16637N/A _("Copyright 2000-2006 Free Software Foundation, Inc."),

16637N/A@@ -493,8 +504,9 @@

16637N/A PilotApplet *self = user_data;

16637N/A GtkWidget *button, *entry, *dialog;

16637N/A GladeXML *xml;

16637N/A+ GError *error;

16637N/A

16637N/A- gnome_window_icon_set_default_from_file (GNOME_ICONDIR "/sync_icon.png");

16637N/A+ gtk_window_set_default_icon_from_file (GNOME_ICONDIR "/sync_icon.png", &error);

16637N/A xml =glade_xml_new (self->glade_file,"PropertiesDialog", NULL);

16637N/A dialog=glade_xml_get_widget (xml,"PropertiesDialog");

16637N/A

16637N/A@@ -1325,7 +1337,6 @@

16637N/A create_pilot_widgets (GtkWidget *widget, PilotApplet *self)

16637N/A {

16637N/A GtkStyle *style;

16637N/A- int i;

16637N/A

16637N/A static GtkTargetEntry drop_types [] = {

16637N/A { "text/uri-list", 0, TARGET_URI_LIST },

16637N/A@@ -1345,10 +1356,6 @@

16637N/A

16637N/A self->curstate = INITIALISING;

16637N/A

16637N/A- for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++)

16637N/A- pixmaps[i] = gnome_program_locate_file(

16637N/A- NULL, GNOME_FILE_DOMAIN_PIXMAP, pixmaps[i], TRUE, NULL);

16637N/A-

16637N/A self->image = gtk_image_new_from_file (pixmaps[self->curstate]);

16637N/A

16637N/A gtk_signal_connect (GTK_OBJECT (widget), "button-press-event",