r22427 - gnucash/trunk/src - Update to gtkosxapplication version 2

[John Ralls]

Author: jralls
Date: 2012-09-29 14:29:21 -0400 (Sat, 29 Sep 2012)
New Revision: 22427
Trac: http://svn.gnucash.org/trac/changeset/22427

Modified:
   gnucash/trunk/src/core-utils/binreloc.c
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
Log:
Update to gtkosxapplication version 2

Modified: gnucash/trunk/src/core-utils/binreloc.c
===================================================================
--- gnucash/trunk/src/core-utils/binreloc.c	2012-09-24 19:07:22 UTC (rev 22426)
+++ gnucash/trunk/src/core-utils/binreloc.c	2012-09-29 18:29:21 UTC (rev 22427)
@@ -63,7 +63,7 @@
     g_free (prefix);
     return result;
 #elif defined MAC_INTEGRATION
-    gchar *path = quartz_application_get_executable_path();
+    gchar *path = gtkosx_application_get_executable_path();
     g_print ("Application Path %s\n", path);
     return path;
 #else
@@ -363,8 +363,8 @@
 gnc_gbr_find_prefix (const gchar *default_prefix)
 {
 #if defined ENABLE_BINRELOC && defined MAC_INTEGRATION
-    gchar *id = quartz_application_get_bundle_id ();
-    gchar *path = quartz_application_get_resource_path ();
+    gchar *id = gtkosx_application_get_bundle_id ();
+    gchar *path = gtkosx_application_get_resource_path ();
     if (id == NULL)
     {
         gchar *dirname = g_path_get_dirname (path);

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2012-09-24 19:07:22 UTC (rev 22426)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2012-09-29 18:29:21 UTC (rev 22427)
@@ -158,8 +158,8 @@
 static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
 
 #ifdef MAC_INTEGRATION
-static void gnc_quartz_shutdown(GtkOSXApplication *theApp, gpointer data);
-static gboolean gnc_quartz_should_quit(GtkOSXApplication *theApp, GncMainWindow *window);
+static void gnc_quartz_shutdown(GtkosxApplication *theApp, gpointer data);
+static gboolean gnc_quartz_should_quit(GtkosxApplication *theApp, GncMainWindow *window);
 static void gnc_quartz_set_menu(GncMainWindow* window);
 #endif
 
@@ -3479,7 +3479,7 @@
  * loop.
  */
 static void
-gnc_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
+gnc_quartz_shutdown (GtkosxApplication *theApp, gpointer data)
 {
     /* Do Nothing. It's too late. */
 }
@@ -3491,7 +3491,7 @@
  * opportunity to shut down.
  */
 static gboolean
-gnc_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
+gnc_quartz_should_quit (GtkosxApplication *theApp, GncMainWindow *window)
 {
     QofSession *session;
     gboolean needs_save;
@@ -3514,7 +3514,7 @@
 static void
 gnc_quartz_set_menu(GncMainWindow* window)
 {
-    GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+    GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
     GtkWidget       *menu;
     GtkWidget       *item;
 
@@ -3522,7 +3522,7 @@
     if (GTK_IS_MENU_ITEM (menu))
         menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
     gtk_widget_hide(menu);
-    gtk_osxapplication_set_menu_bar (theApp, GTK_MENU_SHELL (menu));
+    gtkosx_application_set_menu_bar (theApp, GTK_MENU_SHELL (menu));
 
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/File/FileQuit");
@@ -3532,24 +3532,24 @@
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/Edit/EditPreferences");
     if (GTK_IS_MENU_ITEM (item))
-        gtk_osxapplication_insert_app_menu_item (theApp, GTK_WIDGET (item), 0);
+        gtkosx_application_insert_app_menu_item (theApp, GTK_WIDGET (item), 0);
 
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/Help/HelpAbout");
     if (GTK_IS_MENU_ITEM (item))
     {
-        gtk_osxapplication_insert_app_menu_item (theApp,
+        gtkosx_application_insert_app_menu_item (theApp,
                 gtk_separator_menu_item_new (),
                 0);
-        gtk_osxapplication_insert_app_menu_item (theApp, GTK_WIDGET (item), 0);
+        gtkosx_application_insert_app_menu_item (theApp, GTK_WIDGET (item), 0);
     }
 
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/Help");
-    gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(item));
+    gtkosx_application_set_help_menu(theApp, GTK_MENU_ITEM(item));
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/Windows");
-    gtk_osxapplication_set_window_menu(theApp, GTK_MENU_ITEM(item));
+    gtkosx_application_set_window_menu(theApp, GTK_MENU_ITEM(item));
     g_signal_connect(theApp, "NSApplicationBlockTermination",
                      G_CALLBACK(gnc_quartz_should_quit), window);
 
@@ -4161,7 +4161,7 @@
 {
     GList *window_iter;
 #ifdef MAC_INTEGRATION
-    GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+    GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
 #endif
     for (window_iter = active_windows; window_iter != NULL; window_iter = window_iter->next)
     {
@@ -4173,7 +4173,7 @@
 #ifdef MAC_INTEGRATION
     g_signal_connect(theApp, "NSApplicationWillTerminate",
                      G_CALLBACK(gnc_quartz_shutdown), NULL);
-    gtk_osxapplication_ready(theApp);
+    gtkosx_application_ready(theApp);
 #endif
 }