IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove account.glade, deleted in r20669, from src/gnome/glade/Makefile.am

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20684 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2011-05-23 19:28:01 +00:00
parent ef1e42b89c
commit 15d4ec937d
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gnome-utils/gnc-main-window.c
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 gnc_quartz_shutdown(GtkOSXApplication *theApp, gpointer data); static void gtk_quartz_shutdown(GtkOSXApplication *theApp, gpointer data);
static gboolean gnc_quartz_should_quit(GtkOSXApplication *theApp, GncMainWindow *window); static gboolean gtk_quartz_should_quit(GtkOSXApplication *theApp, GncMainWindow *window);
static void gnc_quartz_set_menu(GncMainWindow* window); static void gtk_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
@ -2308,8 +2308,9 @@ gnc_main_window_destroy (GtkObject *object)
gnc_window_set_progressbar_window(NULL); gnc_window_set_progressbar_window(NULL);
/* Update the "Windows" menu in all other windows */ /* Update the "Windows" menu in all other windows */
#ifndef MAC_INTEGRATION
gnc_main_window_update_all_menu_items(); gnc_main_window_update_all_menu_items();
#endif
gnc_gconf_remove_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE, gnc_gconf_remove_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE,
GNC_MAIN_WINDOW_NAME); GNC_MAIN_WINDOW_NAME);
gnc_gconf_remove_notification(G_OBJECT(window), GCONF_GENERAL, gnc_gconf_remove_notification(G_OBJECT(window), GCONF_GENERAL,
@ -2356,8 +2357,9 @@ gnc_main_window_new (void)
} }
active_windows = g_list_append (active_windows, window); active_windows = g_list_append (active_windows, window);
gnc_main_window_update_title(window); gnc_main_window_update_title(window);
gnc_main_window_update_all_menu_items(); #ifndef MAC_INTEGRATION
gnc_main_window_update_allmenu_items();
#endif
gnc_engine_add_commit_error_callback( gnc_main_window_engine_commit_error_callback, window ); gnc_engine_add_commit_error_callback( gnc_main_window_engine_commit_error_callback, window );
return window; return window;
@ -3373,13 +3375,13 @@ gnc_main_window_setup_window (GncMainWindow *window)
#ifdef MAC_INTEGRATION #ifdef MAC_INTEGRATION
static void static void
gnc_quartz_shutdown (GtkOSXApplication *theApp, gpointer data) gtk_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
{ {
gnc_shutdown(0); gnc_shutdown(0);
} }
static gboolean static gboolean
gnc_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window) gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
{ {
QofSession *session; QofSession *session;
gboolean needs_save, do_shutdown; gboolean needs_save, do_shutdown;
@ -3397,7 +3399,7 @@ gnc_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
} }
static void static void
gnc_quartz_set_menu(GncMainWindow* window) gtk_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);
@ -3440,7 +3442,7 @@ gnc_quartz_set_menu(GncMainWindow* window)
"/menubar/Windows"); "/menubar/Windows");
gtk_osxapplication_set_window_menu(theApp, GTK_MENU_ITEM(item)); gtk_osxapplication_set_window_menu(theApp, GTK_MENU_ITEM(item));
g_signal_connect(theApp, "NSApplicationBlockTermination", g_signal_connect(theApp, "NSApplicationBlockTermination",
G_CALLBACK(gnc_quartz_should_quit), window); G_CALLBACK(gtk_quartz_should_quit), window);
} }
#endif //MAC_INTEGRATION #endif //MAC_INTEGRATION
@ -3561,8 +3563,9 @@ gnc_main_window_switch_page (GtkNotebook *notebook,
g_list_length(priv->installed_pages) > 1); g_list_length(priv->installed_pages) > 1);
gnc_main_window_update_title(window); gnc_main_window_update_title(window);
#ifndef MAC_INTEGRATION
gnc_main_window_update_menu_item(window); gnc_main_window_update_menu_item(window);
#endif
g_signal_emit (window, main_window_signals[PAGE_CHANGED], 0, page); g_signal_emit (window, main_window_signals[PAGE_CHANGED], 0, page);
LEAVE(" "); LEAVE(" ");
} }
@ -3923,7 +3926,9 @@ gnc_main_window_cmd_window_raise (GtkAction *action,
/* revert the change in the radio group /* revert the change in the radio group
* impossible while handling "changed" (G_SIGNAL_NO_RECURSE) */ * impossible while handling "changed" (G_SIGNAL_NO_RECURSE) */
#ifndef MAC_INTEGRATION
g_idle_add((GSourceFunc)gnc_main_window_update_radio_button, old_window); g_idle_add((GSourceFunc)gnc_main_window_update_radio_button, old_window);
#endif
LEAVE(" "); LEAVE(" ");
} }
@ -4057,12 +4062,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
gnc_quartz_set_menu(window_iter->data); gtk_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(gnc_quartz_shutdown), NULL); G_CALLBACK(gtk_quartz_shutdown), NULL);
gtk_osxapplication_ready(theApp); gtk_osxapplication_ready(theApp);
#endif #endif
} }