evolution-webcal r468 - in trunk: . src

[dobey svn gnome org]

Author: dobey
Date: Sat Feb 14 20:56:43 2009
New Revision: 468
URL: http://svn.gnome.org/viewvc/evolution-webcal?rev=468&view=rev

Log:

	Remove more deprecated code usage



Removed:
   trunk/src/evolution-webcal-main.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/evolution-webcal-main.c
   trunk/src/evolution-webcal-notify.c
   trunk/src/evolution-webcal-notify.h

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Feb 14 20:56:43 2009
@@ -7,9 +7,10 @@
 
 libexec_PROGRAMS = evolution-webcal
 
-evolution_webcal_SOURCES = \
-	evolution-webcal-main.c evolution-webcal-main.h \
-	evolution-webcal-notify.c evolution-webcal-notify.h
+evolution_webcal_SOURCES =	\
+	evolution-webcal-main.c	\
+	evolution-webcal-notify.c	\
+	evolution-webcal-notify.h
 
 evolution_webcal_LDADD = \
 	$(EVOLUTION_WEBCAL_LIBS)

Modified: trunk/src/evolution-webcal-main.c
==============================================================================
--- trunk/src/evolution-webcal-main.c	(original)
+++ trunk/src/evolution-webcal-main.c	Sat Feb 14 20:56:43 2009
@@ -21,10 +21,10 @@
 
 #include <config.h>
 
-#include <libbonobo.h>
 #include <libgnome/gnome-init.h>
+#include <libgnome/gnome-program.h>
 
-#include "evolution-webcal-main.h"
+#include "evolution-webcal-notify.h"
 
 static void e_webcal_open_cal_http (const gchar * uri, const gchar * old);
 
@@ -66,7 +66,7 @@
     soup_uri_free (tmpuri);
     g_free (message);
 
-    bonobo_main_quit ();
+    gtk_main_quit ();
 
     return;
   }
@@ -104,7 +104,7 @@
   g_free (desc);
 #endif
 
-  bonobo_main_quit ();
+  gtk_main_quit ();
 }
 
 static void e_webcal_read (SoupSession *session, SoupMessage * msg, gpointer data) {
@@ -156,7 +156,7 @@
     g_free (errorname);
     g_free (errorstring);
     g_free (data);
-    bonobo_main_quit ();
+    gtk_main_quit ();
     return;
   }
 
@@ -185,7 +185,7 @@
 			    NULL);
     g_free (errorstring);
     g_free (olduri);
-    bonobo_main_quit ();
+    gtk_main_quit ();
     return;
   }
 
@@ -233,14 +233,13 @@
 			      "pass the URI of the calendar to subscribe "
 			      "to, as an argument on the command line."),
 			    NULL);
-    bonobo_main_quit ();
+    gtk_main_quit ();
   }
 
   return FALSE;
 }
 
 gint main (gint argc, gchar ** argv) {
-  CORBA_ORB orb;
   GnomeProgram * program;
   GSList * uri_list = NULL;
   GOptionContext *ctx;
@@ -269,11 +268,7 @@
 				GNOME_PARAM_GOPTION_CONTEXT, ctx,
 				NULL);
 
-  if (!bonobo_activation_is_initialized ()) {
-    orb = bonobo_activation_init (argc, argv);
-  } else {
-    orb = bonobo_activation_orb_get ();
-  }
+  gtk_init (&argc, &argv);
 
   if (args != NULL) {
     const gchar ** p;
@@ -286,7 +281,7 @@
   session = soup_session_async_new ();
 
   g_idle_add (e_webcal_idle_callback, uri_list);
-  bonobo_main ();
+  gtk_main ();
 
   return 0;
 }

Modified: trunk/src/evolution-webcal-notify.c
==============================================================================
--- trunk/src/evolution-webcal-notify.c	(original)
+++ trunk/src/evolution-webcal-notify.c	Sat Feb 14 20:56:43 2009
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <libbonobo.h>
 
 #include "evolution-webcal-notify.h"
 
@@ -271,7 +270,7 @@
     g_free (tmpname);
     soup_uri_free (tmpuri);
     
-    bonobo_main_quit ();
+    gtk_main_quit ();
     return;
   }
 
@@ -333,7 +332,7 @@
     g_object_unref (events_sources);
     g_object_unref (tasks_sources);
 
-    bonobo_main_quit ();
+    gtk_main_quit ();
     return;
   }
 
@@ -468,7 +467,7 @@
   gtk_widget_show (hbox);
 
   /* We need to ask the user when to Refresh the calendar */
-  spinadj = gtk_adjustment_new (12, 1, 23, 1, 1, 1);
+  spinadj = gtk_adjustment_new (12, 1, 23, 1, 1, 0);
   tspinb = gtk_spin_button_new (GTK_ADJUSTMENT (spinadj), 12, 0);
   gtk_box_pack_start (GTK_BOX (hbox), tspinb, FALSE, FALSE, 0);
   gtk_widget_show (tspinb);

Modified: trunk/src/evolution-webcal-notify.h
==============================================================================
--- trunk/src/evolution-webcal-notify.h	(original)
+++ trunk/src/evolution-webcal-notify.h	Sat Feb 14 20:56:43 2009
@@ -23,6 +23,7 @@
 #define _E_WEBCAL_NOTIFY_H_
 
 #include <libecal/e-cal.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>