Rename gtk_quartz_shutdown, gtk_quartz_should_quit, and gtk_quartz_set_menu to gnc_quartz_... for better naming consistency and conformance to GObject naming standards.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20716 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2011-05-28 21:52:54 +00:00
parent ad3f925b50
commit bdb0ff2acd

View File

@ -151,9 +151,9 @@ static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page); static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
#ifdef MAC_INTEGRATION #ifdef MAC_INTEGRATION
static void gtk_quartz_shutdown(GtkOSXApplication *theApp, gpointer data); static void gnc_quartz_shutdown(GtkOSXApplication *theApp, gpointer data);
static gboolean gtk_quartz_should_quit(GtkOSXApplication *theApp, GncMainWindow *window); static gboolean gnc_quartz_should_quit(GtkOSXApplication *theApp, GncMainWindow *window);
static void gtk_quartz_set_menu(GncMainWindow* window); static void gnc_quartz_set_menu(GncMainWindow* window);
#endif #endif
/** The instance private data structure for an embedded window /** The instance private data structure for an embedded window
@ -3409,7 +3409,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
* loop. * loop.
*/ */
static void static void
gtk_quartz_shutdown (GtkOSXApplication *theApp, gpointer data) gnc_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
{ {
/* Do Nothing. It's too late. */ /* Do Nothing. It's too late. */
} }
@ -3421,7 +3421,7 @@ gtk_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
* opportunity to shut down. * opportunity to shut down.
*/ */
static gboolean static gboolean
gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window) gnc_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
{ {
QofSession *session; QofSession *session;
gboolean needs_save, do_shutdown; gboolean needs_save, do_shutdown;
@ -3440,7 +3440,7 @@ gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
} }
static void static void
gtk_quartz_set_menu(GncMainWindow* window) gnc_quartz_set_menu(GncMainWindow* window)
{ {
GtkOSXApplicationMenuGroup *group; GtkOSXApplicationMenuGroup *group;
GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
@ -4102,12 +4102,12 @@ gnc_main_window_show_all_windows(void)
{ {
gtk_widget_show(GTK_WIDGET(window_iter->data)); gtk_widget_show(GTK_WIDGET(window_iter->data));
#ifdef MAC_INTEGRATION #ifdef MAC_INTEGRATION
gtk_quartz_set_menu(window_iter->data); gnc_quartz_set_menu(window_iter->data);
#endif #endif
} }
#ifdef MAC_INTEGRATION #ifdef MAC_INTEGRATION
g_signal_connect(theApp, "NSApplicationWillTerminate", g_signal_connect(theApp, "NSApplicationWillTerminate",
G_CALLBACK(gtk_quartz_shutdown), NULL); G_CALLBACK(gnc_quartz_shutdown), NULL);
gtk_osxapplication_ready(theApp); gtk_osxapplication_ready(theApp);
#endif #endif
} }