[grisbi-cvs] [SCM] grisbi branch, grisbi-1.0.x, updated. upstream_version_0_9_90-1-g896ae2e
Pierre Biava
nobody at users.sourceforge.net
Sun Jan 6 07:44:56 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, grisbi-1.0.x has been updated
via 896ae2ece55484763fe0fc9addd0a2e07000ad86 (commit)
from 7f7044de52fb265dd85d414142790c9a0f53017e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 896ae2ece55484763fe0fc9addd0a2e07000ad86
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Jan 6 07:26:39 2013 +0100
changes to gtk-mac-integration-2.01
-----------------------------------------------------------------------
Changes:
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index 7137b12..bd26ed1 100644
--- a/src/grisbi_osx.c
+++ b/src/grisbi_osx.c
@@ -72,15 +72,15 @@ typedef struct
typedef struct
{
- GtkOSXApplication *app;
- GtkOSXApplicationAttentionType type;
+ GtkosxApplication *app;
+ GtkosxApplicationAttentionType type;
} AttentionRequest;
/*START_STATIC*/
static void action_activate_cb ( GtkAction *action, gpointer data );
static gboolean attention_cb ( AttentionRequest* req );
-static void bounce_cb ( GtkWidget *button, GtkOSXApplication *app );
+static void bounce_cb ( GtkWidget *button, GtkosxApplication *app );
static MenuCBData *menu_cbdata_new ( gchar *label, gpointer item );
static void menu_cbdata_delete ( MenuCBData *datum );
static void menu_item_activate_cb ( GtkWidget *item, MenuCBData *datum );
@@ -186,7 +186,7 @@ static void radio_item_changed_cb ( GtkAction* action, GtkAction* current, MenuC
* */
static gboolean attention_cb ( AttentionRequest* req )
{
- gtk_osxapplication_attention_request ( req->app, req->type );
+ gtkosx_application_attention_request ( req->app, req->type );
g_free(req);
@@ -200,7 +200,7 @@ static gboolean attention_cb ( AttentionRequest* req )
*
*
* */
-static void bounce_cb ( GtkWidget *button, GtkOSXApplication *app )
+static void bounce_cb ( GtkWidget *button, GtkosxApplication *app )
{
AttentionRequest *req = g_new0 ( AttentionRequest, 1 );
@@ -217,7 +217,7 @@ static void bounce_cb ( GtkWidget *button, GtkOSXApplication *app )
*
*
* */
-void grisbi_osx_app_active_cb ( GtkOSXApplication* app, gboolean* data )
+void grisbi_osx_app_active_cb ( GtkosxApplication* app, gboolean* data )
{
g_print("Application became %s\n", *data ? "active" : "inactive");
}
@@ -235,9 +235,9 @@ GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *menubar )
GtkWidget *sep;
MenuItems *items;
GtkUIManager *ui_manager;
- GtkOSXApplication *theApp;
+ GtkosxApplication *theApp;
- theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
+ theApp = g_object_new ( GTKOSX_TYPE_APPLICATION, NULL );
ui_manager = gsb_menu_get_ui_manager ( );
items = menu_items_new ( );
@@ -254,20 +254,20 @@ GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *menubar )
gtk_widget_hide ( items->quit_item );
gtk_widget_hide ( menubar );
- gtk_osxapplication_set_menu_bar ( theApp, GTK_MENU_SHELL ( menubar ) );
- gtk_osxapplication_insert_app_menu_item ( theApp, items->about_item, 0 );
+ gtkosx_application_set_menu_bar ( theApp, GTK_MENU_SHELL ( menubar ) );
+ gtkosx_application_insert_app_menu_item ( theApp, items->about_item, 0 );
sep = gtk_separator_menu_item_new ( );
g_object_ref ( sep );
- gtk_osxapplication_insert_app_menu_item ( theApp, sep, 1 );
- gtk_osxapplication_insert_app_menu_item ( theApp, items->preferences_item, 2);
+ gtkosx_application_insert_app_menu_item ( theApp, sep, 1 );
+ gtkosx_application_insert_app_menu_item ( theApp, items->preferences_item, 2);
sep = gtk_separator_menu_item_new ( );
g_object_ref ( sep );
- gtk_osxapplication_insert_app_menu_item ( theApp, sep, 3 );
+ gtkosx_application_insert_app_menu_item ( theApp, sep, 3 );
- gtk_osxapplication_set_help_menu ( theApp, GTK_MENU_ITEM ( items->help_menu ) );
- gtk_osxapplication_set_window_menu ( theApp, NULL );
+ gtkosx_application_set_help_menu ( theApp, GTK_MENU_ITEM ( items->help_menu ) );
+ gtkosx_application_set_window_menu ( theApp, NULL );
if ( !menu_items_quark )
menu_items_quark = g_quark_from_static_string ( "MenuItem" );
@@ -286,11 +286,11 @@ GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *menubar )
* */
void grisbi_osx_app_update_menus_cb ( void )
{
- GtkOSXApplication *theApp;
+ GtkosxApplication *theApp;
- theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
+ theApp = g_object_new ( GTKOSX_TYPE_APPLICATION, NULL );
- gtk_osxapplication_sync_menubar ( theApp );
+ gtkosx_application_sync_menubar ( theApp );
}
diff --git a/src/grisbi_osx.h b/src/grisbi_osx.h
index d5e27de..ba0e2bc 100644
--- a/src/grisbi_osx.h
+++ b/src/grisbi_osx.h
@@ -10,7 +10,7 @@
/* START_DECLARATION */
-void grisbi_osx_app_active_cb ( GtkOSXApplication* app, gboolean* data );
+void grisbi_osx_app_active_cb ( GtkosxApplication* app, gboolean* data );
void grisbi_osx_app_update_menus_cb ( void );
GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *vbox );
/* END_DECLARATION */
diff --git a/src/gsb_dirs.c b/src/gsb_dirs.c
index c414fe0..1e6036d 100644
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@ -66,11 +66,11 @@ void gsb_dirs_init ( void )
}
#else
#ifdef GTKOSXAPPLICATION
- if ( quartz_application_get_bundle_id ( ) )
+ if ( gtkosx_application_get_bundle_id ( ) )
{
gchar *res_path;
- res_path = quartz_application_get_resource_path ();
+ res_path = gtkosx_application_get_resource_path ();
categories_dir = g_build_filename ( res_path, "share/grisbi/categories", NULL );
locale_dir = g_strconcat (res_path, "/share/locale", NULL );
pixmaps_dir = g_strconcat (res_path, "/share/pixmaps/grisbi", NULL );
diff --git a/src/main.c b/src/main.c
index 2428df3..81cfce1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -253,7 +253,7 @@ void main_mac_osx ( int argc, char **argv )
cmdline_options opt;
gboolean first_use = FALSE;
gint status = CMDLINE_SYNTAX_OK;
- GtkOSXApplication *theApp;
+ GtkosxApplication *theApp;
devel_debug ("main_mac_osx");
@@ -261,6 +261,9 @@ void main_mac_osx ( int argc, char **argv )
gsb_grisbi_print_environment_var ( );
#endif
+ /* init the app */
+ theApp = g_object_new ( GTKOSX_TYPE_APPLICATION, NULL );
+
gtk_init ( &argc, &argv );
#ifdef HAVE_GOFFICE
@@ -270,9 +273,6 @@ void main_mac_osx ( int argc, char **argv )
go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
#endif /* HAVE_GOFFICE */
- /* init the app */
- theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
-
/* initialisation des différents répertoires */
gsb_dirs_init ( );
@@ -333,17 +333,17 @@ void main_mac_osx ( int argc, char **argv )
else
display_tip ( FALSE );
- if ( quartz_application_get_bundle_id ( ) == NULL )
+ if ( gtkosx_application_get_bundle_id ( ) == NULL )
{
pixbuf = gdk_pixbuf_new_from_file ( g_build_filename
(gsb_dirs_get_pixmaps_dir ( ), "grisbi-logo.png", NULL), NULL );
if ( pixbuf )
- gtk_osxapplication_set_dock_icon_pixbuf ( theApp, pixbuf );
+ gtkosx_application_set_dock_icon_pixbuf ( theApp, pixbuf );
}
- gtk_osxapplication_set_use_quartz_accelerators ( theApp, TRUE );
+ gtkosx_application_set_use_quartz_accelerators ( theApp, TRUE );
- gtk_osxapplication_ready ( theApp );
+ gtkosx_application_ready ( theApp );
gtk_main ();
hooks/post-receive
--
grisbi
More information about the cvs
mailing list