[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_9-31-g7d99616
Pierre Biava
nobody at users.sourceforge.net
Sun Jan 6 07:44:51 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-0.8.x has been updated
via 7d9961675b0302d1db83d33c29771d64eb2669c3 (commit)
from f9bf80ec40bcbcfb360a7cb77593bbeff0fac991 (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 7d9961675b0302d1db83d33c29771d64eb2669c3
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Jan 6 07:10:12 2013 +0100
changes to gtk-mac-integration-2.01
-----------------------------------------------------------------------
Changes:
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index ecba90a..e0f7abf 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,8 +186,8 @@ 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);
return FALSE;
@@ -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 );
}
@@ -304,8 +304,8 @@ gchar *grisbi_osx_get_locale_dir ( void )
{
gchar *dir;
- if ( quartz_application_get_bundle_id ( ) )
- dir = g_strconcat ( quartz_application_get_resource_path (), "/share/locale", NULL );
+ if ( gtkosx_application_get_bundle_id ( ) )
+ dir = g_strconcat ( gtkosx_application_get_resource_path (), "/share/locale", NULL );
else
dir = g_strdup ( LOCALEDIR );
@@ -323,8 +323,8 @@ gchar *grisbi_osx_get_pixmaps_dir ( void )
{
gchar *dir;
- if ( quartz_application_get_bundle_id ( ) )
- dir = g_strconcat ( quartz_application_get_resource_path (), "/share/pixmaps/grisbi", NULL );
+ if ( gtkosx_application_get_bundle_id ( ) )
+ dir = g_strconcat ( gtkosx_application_get_resource_path (), "/share/pixmaps/grisbi", NULL );
else
dir = g_strdup ( PIXMAPS_DIR );
@@ -342,8 +342,8 @@ gchar *grisbi_osx_get_plugins_dir ( void )
{
gchar *dir;
- if ( quartz_application_get_bundle_id ( ) )
- dir = g_strconcat ( quartz_application_get_resource_path (), "/lib/grisbi", NULL );
+ if ( gtkosx_application_get_bundle_id ( ) )
+ dir = g_strconcat ( gtkosx_application_get_resource_path (), "/lib/grisbi", NULL );
else
dir = g_strdup ( PLUGINS_DIR );
diff --git a/src/grisbi_osx.h b/src/grisbi_osx.h
index 6925540..0df535f 100644
--- a/src/grisbi_osx.h
+++ b/src/grisbi_osx.h
@@ -3,14 +3,13 @@
#ifdef GTKOSXAPPLICATION
#include <gtkosxapplication.h>
-#endif /* GTKOSXAPPLICATION */
/* START_INCLUDE_H */
/* END_INCLUDE_H */
/* 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 );
gchar *grisbi_osx_get_locale_dir ( void );
gchar *grisbi_osx_get_pixmaps_dir ( void );
@@ -19,5 +18,6 @@ gchar *grisbi_osx_get_plugins_dir ( void );
GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *vbox );
/* END_DECLARATION */
+#endif /* GTKOSXAPPLICATION */
#endif
diff --git a/src/main.c b/src/main.c
index c4863d1..dd648f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -227,7 +227,7 @@ void main_mac_osx ( int argc, char **argv )
gchar *locale_dir;
gboolean first_use = FALSE;
gint status = CMDLINE_SYNTAX_OK;
- GtkOSXApplication *theApp;
+ GtkosxApplication *theApp;
devel_debug ("main_mac_osx");
@@ -235,10 +235,10 @@ void main_mac_osx ( int argc, char **argv )
gsb_grisbi_print_environment_var ( );
#endif
- gtk_init ( &argc, &argv );
-
/* init the app */
- theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
+ theApp = g_object_new ( GTKOSX_TYPE_APPLICATION, NULL );
+
+ gtk_init ( &argc, &argv );
locale_dir = grisbi_osx_get_locale_dir ( );
bindtextdomain ( PACKAGE, locale_dir );
@@ -297,17 +297,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
(GRISBI_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