--- /tmp/t/gnome-pilot-2.0.17/applet/pilot.c 2007-01-11 08:32:39.000000000 +0000
+++ gnome-pilot-2.0.17/applet/pilot.c 2009-05-04 23:55:04.000000000 +0100
@@ -29,7 +29,7 @@
#include <errno.h>
#include <gnome.h>
#include <glade/glade.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <gtk/gtk.h>
#include <panel-applet-gconf.h>
#include <signal.h>
@@ -131,6 +131,7 @@
{
GdkColormap *colormap;
gchar *buf;
+ GError *error;
PilotApplet *applet = PILOT_APPLET (user_data);
gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),
@@ -146,8 +147,8 @@
if (applet->properties.popups == FALSE) return;
if (applet->progressDialog == NULL) {
- gnome_window_icon_set_default_from_file (
- GNOME_ICONDIR "/sync_icon.png");
+ gtk_window_set_default_icon_from_file (
+ GNOME_ICONDIR "/sync_icon.png", &error);
GladeXML *xml = glade_xml_new (applet->glade_file,"ProgressDialog",NULL);
applet->progressDialog = glade_xml_get_widget (xml,"ProgressDialog");
applet->sync_label = glade_xml_get_widget (xml,"sync_label");
@@ -427,7 +428,10 @@
static void
about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
+
{
+ GError *error;
+
GtkWidget *about;
const gchar *authors[] = {"Vadim Strizhevsky <vadim@optonline.net>",
"Eskil Heyn Olsen, <eskil@eskil.dk>",
@@ -437,8 +441,15 @@
"Matt Davey <mcdavey@mrao.cam.ac.uk>",
NULL};
- gnome_window_icon_set_default_from_file (
- GNOME_ICONDIR "/sync_icon.png");
+ gtk_window_set_default_icon_from_file (
+ GNOME_ICONDIR "/sync_icon.png", &error);
+
+
+ if (error)
+ {
+ g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" );
+ }
+
about = gnome_about_new (_("gnome-pilot applet"),
VERSION,
_("Copyright 2000-2006 Free Software Foundation, Inc."),
@@ -493,8 +504,9 @@
PilotApplet *self = user_data;
GtkWidget *button, *entry, *dialog;
GladeXML *xml;
+ GError *error;
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR "/sync_icon.png");
+ gtk_window_set_default_icon_from_file (GNOME_ICONDIR "/sync_icon.png", &error);
xml =glade_xml_new (self->glade_file,"PropertiesDialog", NULL);
dialog=glade_xml_get_widget (xml,"PropertiesDialog");
@@ -1325,7 +1337,6 @@
create_pilot_widgets (GtkWidget *widget, PilotApplet *self)
{
GtkStyle *style;
- int i;
static GtkTargetEntry drop_types [] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
@@ -1345,10 +1356,6 @@
self->curstate = INITIALISING;
- for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++)
- pixmaps[i] = gnome_program_locate_file(
- NULL, GNOME_FILE_DOMAIN_PIXMAP, pixmaps[i], TRUE, NULL);
-
self->image = gtk_image_new_from_file (pixmaps[self->curstate]);
gtk_signal_connect (GTK_OBJECT (widget), "button-press-event",