evolution-webcal r462 - in trunk: . src

[dobey svn gnome org]

Author: dobey
Date: Thu Feb 12 18:54:08 2009
New Revision: 462
URL: http://svn.gnome.org/viewvc/evolution-webcal?rev=462&view=rev

Log:

	Fixes #571499



Modified:
   trunk/ChangeLog
   trunk/src/evolution-webcal-notify.c

Modified: trunk/src/evolution-webcal-notify.c
==============================================================================
--- trunk/src/evolution-webcal-notify.c	(original)
+++ trunk/src/evolution-webcal-notify.c	Thu Feb 12 18:54:08 2009
@@ -37,7 +37,7 @@
 typedef struct {
   GtkWidget * dialog;
   GtkWidget * image;
-  GnomeIconTheme * theme;
+  GtkIconTheme * theme;
 } EIcalShareDialog;
 
 enum {
@@ -82,18 +82,11 @@
 		    G_CALLBACK (e_webcal_label_size_allocate_cb), label);
 }
 
-static void e_webcal_icon_theme_changed (GnomeIconTheme * theme,
+static void e_webcal_icon_theme_changed (GtkIconTheme * theme,
 					 EIcalShareDialog * dialog) {
-  gchar * icofile;
-
-  icofile = gnome_icon_theme_lookup_icon (dialog->theme, "x-office-calendar",
-					  48, NULL, NULL);
-
-  if (icofile != NULL) {
-    gtk_window_set_default_icon_from_file (icofile, NULL);
-    gtk_image_set_from_file (GTK_IMAGE (dialog->image), icofile);
-  }
-  g_free (icofile);
+  gtk_window_set_default_icon_name ("x-office-calendar");
+  gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image),
+				"x-office-calendar", GTK_ICON_SIZE_DIALOG);
 }
 
 static void e_webcal_change_adjustment (GtkMenuShell * shell,
@@ -250,7 +243,7 @@
   GtkWidget * label, * button;
   SoupURI * tmpuri;
   gchar * tmpname;
-  gchar * icofile, * mrkname, * ref_str;
+  gchar * mrkname, * ref_str;
   gint ref_timeout, ref_multi;
   ESource * source;
   ESourceGroup * events_group = NULL;
@@ -347,8 +340,7 @@
 
   dialog = g_new0 (EIcalShareDialog, 1);
 
-  dialog->theme = gnome_icon_theme_new ();
-  gnome_icon_theme_set_allow_svg (dialog->theme, TRUE);
+  dialog->theme = gtk_icon_theme_get_default ();
 
   g_signal_connect (G_OBJECT (dialog->theme), "changed",
 		    G_CALLBACK (e_webcal_icon_theme_changed), dialog);
@@ -359,12 +351,7 @@
   gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
   gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 376, 144);
 
-  icofile = gnome_icon_theme_lookup_icon (dialog->theme,
-					  "x-office-calendar",
-					  48, NULL, NULL);
-  if (icofile != NULL) {
-    gtk_window_set_default_icon_from_file (icofile, NULL);
-  }
+  gtk_window_set_default_icon_name ("x-office-calendar");
 
   gtk_widget_realize (dialog->dialog);
 
@@ -420,7 +407,8 @@
   gtk_widget_show (vbox);
 
   /* Pretty icon */
-  dialog->image = gtk_image_new_from_file (icofile);
+  dialog->image = gtk_image_new_from_icon_name ("x-office-calendar",
+						GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (vbox), dialog->image, FALSE, FALSE, 0);
   gtk_widget_show (dialog->image);
 
@@ -533,7 +521,6 @@
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (clabel), cbutton);
 
-  g_free (icofile);
   g_free (tmpname);
   soup_uri_free (tmpuri);
 
@@ -590,7 +577,6 @@
     g_object_unref (tasks_sources);
     g_object_unref (source);
 
-    g_object_unref (dialog->theme);
     gtk_widget_destroy (dialog->dialog);
     break;
   }