diff options
60 files changed, 285 insertions, 256 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 97dcec3383..f078402c8a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,33 @@ +2002-11-27 Not Zed <NotZed@Ximian.com> + + * main.c (show_development_warning): changed to use a gtkdialog + instead of a gnome one. + (warning_dialog_response_callback): clicked->response. + + * e-shell-folder-selection-dialog.c: Include gtk/gtkstock.h + + * e-shell-folder-creation-dialog.c: include gnome-dialog.h + (dialog_response_cb): gtk_entry_get_text now returns const. Dont + free result. + + * e-setup.c: include gnome-messagebox.h + + * *.c: (re)run fix.sh over all, for e_notice changes & pick up + some deprecated functions. + + * e-shell-shared-folder-picker-dialog.c + (shared_folder_discovery_callback): reformat e_notice call for + script. + + * e-shell-offline-sync.c + (impl_SyncFolderProgressListener_reportFailure): Fix e_notice + call, we weren't passing type in. + + * e-shell-folder-commands.c (xfer_result_callback): changed around + slightly to save some processing & allow a script to run. + (e_shell_command_rename_folder): reformat e_notice call to help script. + Include gnome-messagebox.h + 2002-11-25 Dan Winship <danw@ximian.com> * e-shell-settings-dialog.c (page_new): e_get_language_list now diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index c61256505f..613b7faa3f 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -239,7 +239,7 @@ activity_info_new (const char *component_id, info = g_new (ActivityInfo, 1); info->component_id = g_strdup (component_id); info->id = id; - info->icon_pixbuf = gdk_pixbuf_ref (icon); + info->icon_pixbuf = g_object_ref (icon); info->information = CORBA_string_dup (information); info->cancellable = cancellable; info->event_listener = CORBA_Object_duplicate (event_listener, &ev); @@ -260,7 +260,7 @@ activity_info_free (ActivityInfo *info) g_free (info->component_id); - gdk_pixbuf_unref (info->icon_pixbuf); + g_object_unref (info->icon_pixbuf); CORBA_free (info->information); CORBA_Object_release (info->event_listener, &ev); @@ -410,7 +410,7 @@ impl_operationStarted (PortableServer_Servant servant, e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget_new_from_activity_info (activity_info)); - gdk_pixbuf_unref (icon_pixbuf); + g_object_unref (icon_pixbuf); priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info); @@ -514,7 +514,7 @@ class_init (GObjectClass *object_class) { EActivityHandlerClass *handler_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 244d2ba7df..fde3ef7e5d 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -348,7 +348,7 @@ class_init (EComponentRegistryClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index e449c0149a..c795f89d5c 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -190,7 +190,7 @@ class_init (ECorbaConfigPageClass *class) config_page_class = E_CONFIG_PAGE_CLASS (class); config_page_class->apply = impl_apply; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c index 8ebeeac02a..cad3af5a4c 100644 --- a/shell/e-corba-shortcuts.c +++ b/shell/e-corba-shortcuts.c @@ -297,7 +297,7 @@ class_init (GObjectClass *object_class) ECorbaShortcutsClass *corba_shortcuts_class; POA_GNOME_Evolution_Shortcuts__epv *epv; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index 07db240d70..0bb87bb9c8 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -442,7 +442,7 @@ class_init (ECorbaStorageRegistryClass *klass) epv->removeListener = impl_StorageRegistry_removeListener; epv->getFolderByUri = impl_StorageRegistry_getFolderByUri; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index 8f09c2846c..1aee5e7091 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -686,7 +686,7 @@ class_init (ECorbaStorageClass *klass) corba_class_init (); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void @@ -822,7 +822,7 @@ e_corba_storage_free_property_items_list (GSList *list) item = (ECorbaStoragePropertyItem *) p->data; if (item->icon != NULL) - gdk_pixbuf_unref (item->icon); + g_object_unref (item->icon); g_free (item->label); g_free (item->tooltip); g_free (item); diff --git a/shell/e-folder-dnd-bridge.c b/shell/e-folder-dnd-bridge.c index fabddb1fb8..405d5dad01 100644 --- a/shell/e-folder-dnd-bridge.c +++ b/shell/e-folder-dnd-bridge.c @@ -52,7 +52,7 @@ folder_xfer_callback (EStorageSet *storage_set, return; parent = GTK_WINDOW (data); - e_notice (parent, GNOME_MESSAGE_BOX_ERROR, _("Cannot transfer folder:\n%s"), + e_notice (parent, GTK_MESSAGE_ERROR, _("Cannot transfer folder:\n%s"), e_storage_result_to_string (result)); } diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c index b6cad2a292..69176ddeab 100644 --- a/shell/e-folder-list.c +++ b/shell/e-folder-list.c @@ -220,7 +220,7 @@ e_folder_list_class_init (EFolderListClass *klass) glade_gnome_init(); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->set_arg = e_folder_list_set_arg; object_class->get_arg = e_folder_list_get_arg; @@ -233,7 +233,7 @@ e_folder_list_class_init (EFolderListClass *klass) gtk_signal_new ("option_menu_changed", GTK_RUN_LAST, E_OBJECT_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EFolderListClass, option_menu_changed), + G_STRUCT_OFFSET (EFolderListClass, option_menu_changed), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -241,7 +241,7 @@ e_folder_list_class_init (EFolderListClass *klass) gtk_signal_new ("changed", GTK_RUN_LAST, E_OBJECT_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EFolderListClass, changed), + G_STRUCT_OFFSET (EFolderListClass, changed), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -335,7 +335,7 @@ add_clicked (GtkButton *button, EFolderList *efl) e_table_memory_store_insert (efl->priv->model, -1, NULL, pixbuf, display_string, folder->displayName, folder->evolutionUri, folder->physicalUri); e_folder_list_changed (efl); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); g_free (display_string); } } @@ -430,11 +430,11 @@ e_folder_list_init (EFolderList *efl) efl->priv->model = E_TABLE_MEMORY_STORE (g_object_get_data (G_OBJECT (efl->priv->scrolled_table), "table-model")); e_glade_xml_connect_widget (gui, "button-add", "clicked", - GTK_SIGNAL_FUNC (add_clicked), efl); + G_CALLBACK (add_clicked), efl); e_glade_xml_connect_widget (gui, "button-remove", "clicked", - GTK_SIGNAL_FUNC (remove_clicked), efl); + G_CALLBACK (remove_clicked), efl); e_glade_xml_connect_widget (gui, "custom-optionmenu", "changed", - GTK_SIGNAL_FUNC (optionmenu_changed), efl); + G_CALLBACK (optionmenu_changed), efl); selection_model = e_table_get_selection_model (e_table_scrolled_get_table (efl->priv->scrolled_table)); @@ -602,7 +602,7 @@ e_folder_list_set_items (EFolderList *efl, EFolderListItem *items) pixbuf, display_string, items[i].display_name, items[i].uri, items[i].physical_uri); CORBA_free (folder); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); g_free (display_string); } } diff --git a/shell/e-folder-type-registry.c b/shell/e-folder-type-registry.c index 96e814faf9..81cb18796e 100644 --- a/shell/e-folder-type-registry.c +++ b/shell/e-folder-type-registry.c @@ -115,7 +115,7 @@ folder_type_new (const char *name, new->mini_icon_pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL); } else { if (new->icon_pixbuf != NULL) - new->mini_icon_pixbuf = gdk_pixbuf_ref (new->icon_pixbuf); + new->mini_icon_pixbuf = g_object_ref (new->icon_pixbuf); else new->mini_icon_pixbuf = NULL; } @@ -134,9 +134,9 @@ folder_type_free (FolderType *folder_type) g_free (folder_type->description); if (folder_type->icon_pixbuf != NULL) - gdk_pixbuf_unref (folder_type->icon_pixbuf); + g_object_unref (folder_type->icon_pixbuf); if (folder_type->mini_icon_pixbuf != NULL) - gdk_pixbuf_unref (folder_type->mini_icon_pixbuf); + g_object_unref (folder_type->mini_icon_pixbuf); if (folder_type->handler != NULL) g_object_unref (folder_type->handler); @@ -248,7 +248,7 @@ class_init (EFolderTypeRegistryClass *class) object_class = G_OBJECT_CLASS (class); object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); } static void diff --git a/shell/e-folder.c b/shell/e-folder.c index 5798ea576b..522ece72dd 100644 --- a/shell/e-folder.c +++ b/shell/e-folder.c @@ -138,7 +138,7 @@ class_init (EFolderClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; @@ -146,14 +146,14 @@ class_init (EFolderClass *klass) signals[CHANGED] = gtk_signal_new ("changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EFolderClass, changed), + G_STRUCT_OFFSET (EFolderClass, changed), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); signals[NAME_CHANGED] = gtk_signal_new ("name_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EFolderClass, name_changed), + G_STRUCT_OFFSET (EFolderClass, name_changed), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); diff --git a/shell/e-gray-bar.c b/shell/e-gray-bar.c index 0e8aab0332..d105791f2d 100644 --- a/shell/e-gray-bar.c +++ b/shell/e-gray-bar.c @@ -81,7 +81,7 @@ class_init (GtkObjectClass *object_class) { GtkWidgetClass *widget_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); widget_class = GTK_WIDGET_CLASS (object_class); widget_class->style_set = impl_style_set; diff --git a/shell/e-history.c b/shell/e-history.c index b9424e0b5a..d12a933241 100644 --- a/shell/e-history.c +++ b/shell/e-history.c @@ -66,7 +66,7 @@ impl_finalize (GObject *object) static void class_init (GObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->finalize = impl_finalize; } diff --git a/shell/e-icon-factory.c b/shell/e-icon-factory.c index 740aefdbf0..c0fceafc42 100644 --- a/shell/e-icon-factory.c +++ b/shell/e-icon-factory.c @@ -56,9 +56,9 @@ icon_new (const char *name, icon->large_pixbuf = large_pixbuf; if (small_pixbuf != NULL) - gdk_pixbuf_ref (small_pixbuf); + g_object_ref (small_pixbuf); if (large_pixbuf != NULL) - gdk_pixbuf_ref (large_pixbuf); + g_object_ref (large_pixbuf); return icon; } @@ -73,9 +73,9 @@ icon_free (Icon *icon) g_free (icon->name); if (icon->large_pixbuf != NULL) - gdk_pixbuf_unref (icon->large_pixbuf); + g_object_unref (icon->large_pixbuf); if (icon->small_pixbuf != NULL) - gdk_pixbuf_unref (icon->small_pixbuf); + g_object_unref (icon->small_pixbuf); g_free (icon); } @@ -106,8 +106,8 @@ load_icon (const char *icon_name) icon = icon_new (icon_name, small_pixbuf, large_pixbuf); - gdk_pixbuf_unref (small_pixbuf); - gdk_pixbuf_unref (large_pixbuf); + g_object_unref (small_pixbuf); + g_object_unref (large_pixbuf); return icon; } @@ -153,10 +153,10 @@ e_icon_factory_get_icon (const char *icon_name, } if (mini) { - gdk_pixbuf_ref (icon->small_pixbuf); + g_object_ref (icon->small_pixbuf); return icon->small_pixbuf; } else { - gdk_pixbuf_ref (icon->large_pixbuf); + g_object_ref (icon->large_pixbuf); return icon->large_pixbuf; } } diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c index 4ba4466922..44de45cef6 100644 --- a/shell/e-local-folder.c +++ b/shell/e-local-folder.c @@ -378,7 +378,7 @@ class_init (ELocalFolderClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (e_folder_get_type ()); + parent_class = g_type_class_ref(e_folder_get_type ()); object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 349dfe46ba..36abe7666f 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -1073,7 +1073,7 @@ class_init (ELocalStorageClass *class) EStorageClass *storage_class; GObjectClass *object_class; - parent_class = gtk_type_class (e_storage_get_type ()); + parent_class = g_type_class_ref(e_storage_get_type ()); object_class = G_OBJECT_CLASS (class); storage_class = E_STORAGE_CLASS (class); diff --git a/shell/e-setup.c b/shell/e-setup.c index 6befdb8e92..ec76528bc0 100644 --- a/shell/e-setup.c +++ b/shell/e-setup.c @@ -39,6 +39,7 @@ #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-messagebox.h> #include <errno.h> #include <sys/stat.h> @@ -169,7 +170,7 @@ check_evolution_directory (const char *evolution_directory) } if (retval == FALSE) - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Could not update files correctly")); out: @@ -192,7 +193,7 @@ copy_default_stuff (const char *evolution_directory) char *old_default_shortcuts_file; if (mkdir (evolution_directory, 0700)) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot create the directory\n%s\nError: %s"), evolution_directory, g_strerror (errno)); @@ -207,7 +208,7 @@ copy_default_stuff (const char *evolution_directory) if (system (command) != 0) { /* FIXME: Give more help. */ - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("An error occurred in copying files into\n`%s'."), evolution_directory); retval = FALSE; } else { @@ -280,7 +281,7 @@ setup_bonobo_conf_private_directory (const char *evolution_directory) name = g_concat_dir_and_file (evolution_directory, "private"); if (stat (name, &buf) == -1) { if (mkdir (name, 0700) != 0) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Evolution could not create directory\n" "%s:\n%s"), name, strerror (errno)); @@ -298,13 +299,13 @@ setup_bonobo_conf_private_directory (const char *evolution_directory) } if (S_ISDIR (buf.st_mode)) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Directory %s\n" "does not have the right permissions. Please make it\n" "readable and executable and restart Evolution."), name); } else { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("File %s\n" "should be removed to allow Evolution to work correctly.\n" "Please remove this file and restart Evolution."), @@ -327,7 +328,7 @@ e_setup (const char *evolution_directory) } if (! S_ISDIR (statinfo.st_mode)) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("The file `%s' is not a directory.\n" "Please move it in order to allow installation\n" "of the Evolution user files.")); @@ -366,7 +367,7 @@ e_setup (const char *evolution_directory) file = g_strdup_printf ("%s/searches.xml", evolution_directory); if (stat (file, &statinfo) != 0) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("The directory `%s' exists but is not the\n" "Evolution directory. Please move it in order\n" "to allow installation of the Evolution user " diff --git a/shell/e-shell-about-box.c b/shell/e-shell-about-box.c index 65761da8aa..a320222756 100644 --- a/shell/e-shell-about-box.c +++ b/shell/e-shell-about-box.c @@ -309,7 +309,7 @@ impl_realize (GtkWidget *widget) g_assert (priv->timeout_id == -1); priv->timeout_id = g_timeout_add (ANIMATION_DELAY, timeout_callback, about_box); - gdk_pixbuf_unref (background_pixbuf); + g_object_unref (background_pixbuf); } static void @@ -363,7 +363,7 @@ class_init (GObjectClass *object_class) { GtkWidgetClass *widget_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; diff --git a/shell/e-shell-config-autocompletion.c b/shell/e-shell-config-autocompletion.c index 4cb498dba1..3ab2650ab2 100644 --- a/shell/e-shell-config-autocompletion.c +++ b/shell/e-shell-config-autocompletion.c @@ -108,7 +108,7 @@ e_shell_config_autocompletion_create_widget (EShell *shell, EvolutionConfigContr ac->control_widget = e_folder_list_new (ac->shell_client, xml); g_free (xml); - gtk_object_set (GTK_OBJECT (ac->control_widget), + g_object_set((ac->control_widget), "title", _("Extra Completion folders"), "possible_types", possible_types, NULL); diff --git a/shell/e-shell-corba-icon-utils.c b/shell/e-shell-corba-icon-utils.c index 0174213ecc..b88483fd35 100644 --- a/shell/e-shell-corba-icon-utils.c +++ b/shell/e-shell-corba-icon-utils.c @@ -201,7 +201,7 @@ e_new_gdk_pixbuf_from_corba_icon (const GNOME_Evolution_Icon *icon, 0, 0, (double) scaled_width / icon->width, (double) scaled_height / icon->height, GDK_INTERP_HYPER); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); return scaled_pixbuf; } diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index b5eefa4b77..596ab65626 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -39,6 +39,7 @@ #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-messagebox.h> #include <gtk/gtklabel.h> #include <gtk/gtksignal.h> @@ -135,19 +136,15 @@ xfer_result_callback (EStorageSet *storage_set, folder_command_data = (FolderCommandData *) data; if (result != E_STORAGE_OK) { - char *msg; + const char *fmt; if (folder_command_data->command == FOLDER_COMMAND_COPY) - msg = g_strdup_printf (_("Cannot copy folder: %s"), - e_storage_result_to_string (result)); + fmt = _("Cannot copy folder: %s"); else - msg = g_strdup_printf (_("Cannot move folder: %s"), - e_storage_result_to_string (result)); + fmt = _("Cannot move folder: %s"); - e_notice (GTK_WINDOW (folder_command_data->shell_view), - GNOME_MESSAGE_BOX_ERROR, msg); - - g_free (msg); + e_notice (GTK_WINDOW (folder_command_data->shell_view), GTK_MESSAGE_ERROR, + fmt, e_storage_result_to_string (result)); } folder_command_data_free (folder_command_data); @@ -192,7 +189,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f else msg = _("Cannot copy a folder over itself."); - e_notice (GTK_WINDOW (folder_selection_dialog), GNOME_MESSAGE_BOX_ERROR, msg); + e_notice (GTK_WINDOW (folder_selection_dialog), GTK_MESSAGE_ERROR, msg); return; } @@ -203,7 +200,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f if (strncmp (folder_command_data->destination_path, folder_command_data->source_path, source_len) == 0) { - e_notice (GTK_WINDOW (folder_selection_dialog), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (folder_selection_dialog), GTK_MESSAGE_ERROR, _("Cannot move a folder into one of its descendants.")); return; } @@ -390,7 +387,7 @@ delete_cb (EStorageSet *storage_set, shell_view = E_SHELL_VIEW (data); if (result != E_STORAGE_OK) - e_notice (GTK_WINDOW (shell_view), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR, _("Cannot delete folder:\n%s"), e_storage_result_to_string (result)); } @@ -485,7 +482,7 @@ rename_cb (EStorageSet *storage_set, EStorageResult result, void *data) callback_data = (RenameCallbackData *) data; if (result != E_STORAGE_OK) { - e_notice (GTK_WINDOW (callback_data->shell_view), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (callback_data->shell_view), GTK_MESSAGE_ERROR, _("Cannot rename folder:\n%s"), e_storage_result_to_string (result)); } else { EFolder *folder; @@ -548,8 +545,7 @@ e_shell_command_rename_folder (EShell *shell, if (e_shell_folder_name_is_valid (new_name, &reason)) break; - e_notice (shell_view != NULL ? GTK_WINDOW (shell_view) : NULL, - GNOME_MESSAGE_BOX_ERROR, + e_notice (shell_view != NULL ? GTK_WINDOW (shell_view) : NULL, GTK_MESSAGE_ERROR, _("The specified folder name is not valid: %s"), reason); } @@ -583,10 +579,10 @@ remove_shared_cb (EStorageSet *storage_set, if (result == E_STORAGE_NOTIMPLEMENTED || result == E_STORAGE_UNSUPPORTEDOPERATION) - e_notice (GTK_WINDOW (shell_view), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR, _("Selected folder does not belong to another user")); else if (result != E_STORAGE_OK) - e_notice (GTK_WINDOW (shell_view), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR, _("Cannot remove folder:\n%s"), e_storage_result_to_string (result)); } diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index 09bd3d725d..442d01f579 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -27,6 +27,7 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-dialog.h> #include <gtk/gtkdialog.h> #include <gtk/gtkoptionmenu.h> @@ -122,7 +123,7 @@ async_create_cb (EStorageSet *storage_set, dialog_data->folder_path, dialog_data->result_callback_data); - e_notice (GTK_WINDOW (dialog_data->dialog), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (dialog_data->dialog), GTK_MESSAGE_ERROR, _("Cannot create the specified folder:\n%s"), e_storage_result_to_string (result)); @@ -147,7 +148,7 @@ dialog_response_cb (GnomeDialog *dialog, const char *folder_type; const char *parent_path; const char *reason; - char *folder_name; + const char *folder_name; char *path; dialog_data = (DialogData *) data; @@ -162,10 +163,10 @@ dialog_response_cb (GnomeDialog *dialog, return; } - folder_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog_data->folder_name_entry)); + folder_name = gtk_entry_get_text(GTK_ENTRY (dialog_data->folder_name_entry)); if (! e_shell_folder_name_is_valid (folder_name, &reason)) { - e_notice (GTK_WINDOW (dialog), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (dialog), GTK_MESSAGE_ERROR, _("The specified folder name is not valid: %s"), reason); return; } @@ -183,7 +184,6 @@ dialog_response_cb (GnomeDialog *dialog, } path = g_concat_dir_and_file (parent_path, folder_name); - g_free (folder_name); storage_set = e_shell_get_storage_set (dialog_data->shell); @@ -424,7 +424,7 @@ add_folder_types (GtkWidget *dialog, menu_item = gtk_menu_item_new_with_label (type->display_name); gtk_widget_show (menu_item); - gtk_menu_append (GTK_MENU (menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); g_object_set_data_full (G_OBJECT (menu_item), "folder_type", g_strdup (type->type), g_free); diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index f7f6f7a6ee..d37e5c09f2 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -41,6 +41,7 @@ #include <gtk/gtksignal.h> #include <gtk/gtklabel.h> +#include <gtk/gtkstock.h> #include <string.h> @@ -273,7 +274,7 @@ class_init (EShellFolderSelectionDialogClass *klass) GObjectClass *object_class; GtkDialogClass *dialog_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); dialog_class = GTK_DIALOG_CLASS (klass); @@ -286,7 +287,7 @@ class_init (EShellFolderSelectionDialogClass *klass) = gtk_signal_new ("folder_selected", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, folder_selected), + G_STRUCT_OFFSET (EShellFolderSelectionDialogClass, folder_selected), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -295,7 +296,7 @@ class_init (EShellFolderSelectionDialogClass *klass) = gtk_signal_new ("cancelled", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, cancelled), + G_STRUCT_OFFSET (EShellFolderSelectionDialogClass, cancelled), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); } diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 328e867828..3f20c8b189 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -168,7 +168,7 @@ new_empty_pixmap_widget (void) gdk_pixbuf_render_pixmap_and_mask (empty_pixbuf, &pixmap, &mask, 127); pixmap_widget = gtk_pixmap_new (pixmap, mask); - gdk_pixbuf_unref (empty_pixbuf); + g_object_unref (empty_pixbuf); return pixmap_widget; } @@ -393,7 +393,7 @@ impl_dispose (GObject *object) priv = folder_title_bar->priv; if (priv->icon != NULL) { - gdk_pixbuf_unref (priv->icon); + g_object_unref (priv->icon); priv->icon = NULL; } @@ -469,12 +469,12 @@ class_init (EShellFolderTitleBarClass *klass) widget_class = GTK_WIDGET_CLASS (klass); widget_class->size_allocate = impl_size_allocate; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); signals[TITLE_TOGGLED] = gtk_signal_new ("title_toggled", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, title_toggled), + G_STRUCT_OFFSET (EShellFolderTitleBarClass, title_toggled), e_shell_marshal_NONE__BOOL, GTK_TYPE_NONE, 1, GTK_TYPE_BOOL); @@ -482,14 +482,14 @@ class_init (EShellFolderTitleBarClass *klass) signals[BACK_CLICKED] = gtk_signal_new ("back_clicked", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, back_clicked), + G_STRUCT_OFFSET (EShellFolderTitleBarClass, back_clicked), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); signals[FORWARD_CLICKED] = gtk_signal_new ("forward_clicked", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, forward_clicked), + G_STRUCT_OFFSET (EShellFolderTitleBarClass, forward_clicked), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); } @@ -708,12 +708,12 @@ e_shell_folder_title_bar_set_icon (EShellFolderTitleBar *folder_title_bar, if (icon == NULL) { if (priv->icon != NULL) - gdk_pixbuf_unref (priv->icon); + g_object_unref (priv->icon); priv->icon = new_empty_pixbuf (); } else { - gdk_pixbuf_ref (icon); + g_object_ref (icon); if (priv->icon != NULL) - gdk_pixbuf_unref (priv->icon); + g_object_unref (priv->icon); priv->icon = icon; } diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 645a0aa1df..ee1456cc95 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -621,7 +621,7 @@ create_plugin_menu (ImportData *data) menu = gtk_menu_new (); item = gtk_menu_item_new_with_label (_("Automatic")); g_object_set_data_full ((GObject *)item, "bonoboiid", g_strdup ("Automatic"), g_free); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); CORBA_exception_init (&ev); info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/Importer:1.0')", NULL, &ev); @@ -643,7 +643,7 @@ create_plugin_menu (ImportData *data) G_CALLBACK (item_selected), data); g_object_set_data_full ((GObject *)item, "bonoboiid", g_strdup (info->iid), g_free); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); } CORBA_free (info_list); diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c index 191220f53c..42972d0e50 100644 --- a/shell/e-shell-offline-handler.c +++ b/shell/e-shell-offline-handler.c @@ -718,13 +718,13 @@ class_init (EShellOfflineHandlerClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); signals[OFFLINE_PROCEDURE_STARTED] = gtk_signal_new ("offline_procedure_started", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellOfflineHandlerClass, offline_procedure_started), + G_STRUCT_OFFSET (EShellOfflineHandlerClass, offline_procedure_started), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -732,7 +732,7 @@ class_init (EShellOfflineHandlerClass *klass) = gtk_signal_new ("offline_procedure_finished", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellOfflineHandlerClass, offline_procedure_finished), + G_STRUCT_OFFSET (EShellOfflineHandlerClass, offline_procedure_finished), e_shell_marshal_NONE__BOOL, GTK_TYPE_NONE, 1, GTK_TYPE_BOOL); diff --git a/shell/e-shell-offline-sync.c b/shell/e-shell-offline-sync.c index dd10c58db2..e40762b0c3 100644 --- a/shell/e-shell-offline-sync.c +++ b/shell/e-shell-offline-sync.c @@ -156,7 +156,7 @@ impl_SyncFolderProgressListener_reportFailure (PortableServer_Servant servant, /* FIXME -- We probably should give the user more of a chance to do something about it. */ - e_notice (GTK_WINDOW (sync_data->dialog), + e_notice (GTK_WINDOW (sync_data->dialog), GTK_MESSAGE_ERROR, _("Error synchronizing \"%s\":\n%s"), e_folder_get_name (folder), message); sync_data->current_folder_finished = TRUE; @@ -236,7 +236,7 @@ static void setup_dialog (SyncData *sync_data) { sync_data->dialog = gnome_dialog_new (_("Syncing Folder"), GNOME_STOCK_BUTTON_CANCEL, NULL); - gtk_widget_set_usize (sync_data->dialog, 300, -1); + gtk_widget_set_size_request (sync_data->dialog, 300, -1); gtk_window_set_policy (GTK_WINDOW (sync_data->dialog), FALSE, FALSE, FALSE); g_signal_connect (sync_data->dialog, "close", diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 4161cba791..53ed1388f9 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -64,7 +64,7 @@ set_dialog_size (EShellSettingsDialog *dialog) width = gdk_string_width (font, "M") * 72; height = (font->ascent + font->descent) * 35; - gtk_widget_set_usize (GTK_WIDGET (dialog), width, height); + gtk_widget_set_size_request (GTK_WIDGET (dialog), width, height); } @@ -91,7 +91,7 @@ page_new (const char *title, Page *page; if (icon != NULL) - gdk_pixbuf_ref (icon); + g_object_ref (icon); page = g_new (Page, 1); page->title = g_strdup (title); @@ -111,7 +111,7 @@ page_free (Page *page) g_free (page->description); if (page->icon != NULL) - gdk_pixbuf_unref (page->icon); + g_object_unref (page->icon); g_free (page); } @@ -223,7 +223,7 @@ load_pages (EShellSettingsDialog *dialog) } if (icon != NULL) - gdk_pixbuf_unref (icon); + g_object_unref (icon); CORBA_exception_free (&ev); } @@ -315,7 +315,7 @@ class_init (EShellSettingsDialog *class) widget_class = GTK_WIDGET_CLASS (class); widget_class->realize = impl_realize; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c index 3d42c79d68..18ec980678 100644 --- a/shell/e-shell-shared-folder-picker-dialog.c +++ b/shell/e-shell-shared-folder-picker-dialog.c @@ -195,7 +195,7 @@ setup_server_option_menu (EShell *shell, g_object_set_data_full (G_OBJECT (menu_item), "storage_name", g_strdup (storage_name), g_free); gtk_widget_show (menu_item); - gtk_menu_append (GTK_MENU (menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if (*storage_name_return == NULL) *storage_name_return = g_strdup (storage_name); @@ -354,7 +354,7 @@ create_progress_dialog (EShell *shell, char *text; dialog = gnome_dialog_new (_("Opening Folder"), GNOME_STOCK_BUTTON_CANCEL, NULL); - gtk_widget_set_usize (dialog, 300, -1); + gtk_widget_set_size_request (dialog, 300, -1); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE); g_signal_connect (dialog, "close", @@ -445,8 +445,7 @@ shared_folder_discovery_callback (EStorage *storage, else e_shell_create_view (shell, uri, NULL); } else { - e_notice (parent ? GTK_WINDOW (parent) : NULL, - GNOME_MESSAGE_BOX_ERROR, + e_notice (parent ? GTK_WINDOW (parent) : NULL, GTK_MESSAGE_ERROR, _("Could not open shared folder: %s."), e_storage_result_to_string (result)); } @@ -499,7 +498,7 @@ discover_folder (EShell *shell, error: /* FIXME: Be more verbose? */ - e_notice (GTK_WINDOW (parent), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (parent), GTK_MESSAGE_ERROR, _("Cannot find the specified shared folder.")); } diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index e2728211f0..6076ce46e5 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -152,7 +152,7 @@ make_mail_dialog_pages (SWData *data) data->mailer = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev); if (BONOBO_EX (&ev)) { #if 0 - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Could not start the Evolution Mailer Assistant interface\n(%s)"), CORBA_exception_id (&ev)); #endif g_warning ("Could not start mailer (%s)", CORBA_exception_id (&ev)); @@ -163,7 +163,7 @@ make_mail_dialog_pages (SWData *data) CORBA_exception_free (&ev); if (data->mailer == CORBA_OBJECT_NIL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Could not start the Evolution Mailer Assistant interface\n")); return; } diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c index 5487e185a1..057ac1bd1e 100644 --- a/shell/e-shell-user-creatable-items-handler.c +++ b/shell/e-shell-user-creatable-items-handler.c @@ -248,7 +248,7 @@ free_menu_items (GSList *menu_items) g_free (item->verb); if (item->icon != NULL) - gdk_pixbuf_unref (item->icon); + g_object_unref (item->icon); g_free (item->component_id); @@ -697,7 +697,7 @@ impl_finalize (GObject *object) static void class_init (GObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index f312efc544..56fe42170d 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -87,7 +87,7 @@ launch_pilot_settings (const char *extra_arg) args[0] = gnome_is_program_in_path ("gpilotd-control-applet"); if (!args[0]) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("The GNOME Pilot tools do not appear to be installed on this system.")); return; } @@ -96,7 +96,7 @@ launch_pilot_settings (const char *extra_arg) g_free (args[0]); if (pid == -1) - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]); + e_notice (NULL, GTK_MESSAGE_ERROR, _("Error executing %s."), args[0]); } diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index c7f92413a3..a60d5bce45 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -250,7 +250,7 @@ load_images (void) g_warning ("Cannot load `%s'", EVOLUTION_IMAGES "/offline.png"); } else { gdk_pixbuf_render_pixmap_and_mask (pixbuf, &offline_pixmap, &offline_mask, 128); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); } pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/online.png", NULL); @@ -258,7 +258,7 @@ load_images (void) g_warning ("Cannot load `%s'", EVOLUTION_IMAGES "/online.png"); } else { gdk_pixbuf_render_pixmap_and_mask (pixbuf, &online_pixmap, &online_mask, 128); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); } } @@ -273,7 +273,7 @@ cleanup_delayed_selection (EShellView *shell_view) g_free (priv->delayed_selection); priv->delayed_selection = NULL; gtk_signal_disconnect_by_func (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), - GTK_SIGNAL_FUNC (new_folder_cb), + G_CALLBACK (new_folder_cb), shell_view); } } @@ -283,7 +283,7 @@ find_socket (GtkContainer *container) { GList *children, *tmp; - children = gtk_container_children (container); + children = gtk_container_get_children(container); while (children) { if (BONOBO_IS_SOCKET (children->data)) return children->data; @@ -628,7 +628,7 @@ storage_set_removed_folder_callback (EStorageSet *storage_set, priv->sockets = g_list_remove (priv->sockets, socket); destroy_connection_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (socket), "e_shell_view_destroy_connection_id")); - gtk_signal_disconnect (GTK_OBJECT (socket), destroy_connection_id); + g_signal_handler_disconnect((socket), destroy_connection_id); page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), view->control); @@ -784,16 +784,16 @@ folder_bar_popup_map_callback (GtkWidget *widget, gtk_grab_add (widget); gtk_signal_connect_while_alive (GTK_OBJECT (widget), "button_release_event", - GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb), shell_view, + G_CALLBACK (storage_set_view_box_button_release_event_cb), shell_view, GTK_OBJECT (priv->folder_bar_popup)); gtk_signal_connect_while_alive (GTK_OBJECT (priv->storage_set_view), "folder_opened", - GTK_SIGNAL_FUNC (storage_set_view_folder_opened_cb), shell_view, + G_CALLBACK (storage_set_view_folder_opened_cb), shell_view, GTK_OBJECT (priv->folder_bar_popup)); gtk_signal_connect_while_alive (GTK_OBJECT (priv->storage_set_view), "button_release_event", - GTK_SIGNAL_FUNC (storage_set_view_box_button_release_event_cb), shell_view, + G_CALLBACK (storage_set_view_box_button_release_event_cb), shell_view, GTK_OBJECT (priv->folder_bar_popup)); gtk_signal_connect_while_alive (GTK_OBJECT (priv->storage_set_title_bar), "button_clicked", - GTK_SIGNAL_FUNC (popup_storage_set_view_button_clicked), shell_view, + G_CALLBACK (popup_storage_set_view_button_clicked), shell_view, GTK_OBJECT (priv->folder_bar_popup)); } @@ -1460,7 +1460,7 @@ impl_dispose (GObject *object) socket_widget = GTK_WIDGET (p->data); destroy_connection_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (socket_widget), "e_shell_view_destroy_connection_id")); - gtk_signal_disconnect (GTK_OBJECT (socket_widget), destroy_connection_id); + g_signal_handler_disconnect((socket_widget), destroy_connection_id); } g_list_free (priv->sockets); priv->sockets = NULL; @@ -1515,13 +1515,13 @@ class_init (EShellViewClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - parent_class = gtk_type_class (BONOBO_TYPE_WINDOW); + parent_class = g_type_class_ref(BONOBO_TYPE_WINDOW); signals[SHORTCUT_BAR_VISIBILITY_CHANGED] = gtk_signal_new ("shortcut_bar_visibility_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellViewClass, shortcut_bar_visibility_changed), + G_STRUCT_OFFSET (EShellViewClass, shortcut_bar_visibility_changed), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -1530,7 +1530,7 @@ class_init (EShellViewClass *klass) = gtk_signal_new ("folder_bar_visibility_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellViewClass, folder_bar_visibility_changed), + G_STRUCT_OFFSET (EShellViewClass, folder_bar_visibility_changed), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -1539,7 +1539,7 @@ class_init (EShellViewClass *klass) = gtk_signal_new ("view_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellViewClass, view_changed), + G_STRUCT_OFFSET (EShellViewClass, view_changed), e_shell_marshal_NONE__STRING_STRING_STRING_STRING, GTK_TYPE_NONE, 4, GTK_TYPE_STRING, @@ -1941,7 +1941,7 @@ update_folder_title_bar (EShellView *shell_view, folder_icon = e_folder_type_registry_get_icon_for_type (folder_type_registry, e_folder_get_type_string (folder), TRUE); - gdk_pixbuf_ref (folder_icon); + g_object_ref (folder_icon); } } @@ -1949,7 +1949,7 @@ update_folder_title_bar (EShellView *shell_view, folder_icon); if (folder_icon != NULL) - gdk_pixbuf_unref (folder_icon); + g_object_unref (folder_icon); if (title != NULL) { char *s; diff --git a/shell/e-shell.c b/shell/e-shell.c index d43cdef323..d7818aa400 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -170,7 +170,7 @@ pop_up_activation_error_dialog (ESplash *splash, char *error_message; error_message = e_get_activation_failure_msg (ev); - e_notice (GTK_WINDOW (splash), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (splash), GTK_MESSAGE_ERROR, _("Cannot activate component %s :\n" "The error from the activation system is:\n" "%s"), @@ -831,7 +831,7 @@ setup_components (EShell *shell, if (splash != NULL) e_splash_add_icon (splash, icon_pixbuf); - gdk_pixbuf_unref (icon_pixbuf); + g_object_unref (icon_pixbuf); g_free (icon_path); } @@ -1168,7 +1168,7 @@ class_init (EShellClass *klass) GObjectClass *object_class; POA_GNOME_Evolution_Shell__epv *epv; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); object_class->dispose = impl_dispose; @@ -1178,7 +1178,7 @@ class_init (EShellClass *klass) gtk_signal_new ("no_views_left", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellClass, no_views_left), + G_STRUCT_OFFSET (EShellClass, no_views_left), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -1186,7 +1186,7 @@ class_init (EShellClass *klass) gtk_signal_new ("line_status_changed", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellClass, line_status_changed), + G_STRUCT_OFFSET (EShellClass, line_status_changed), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -1195,7 +1195,7 @@ class_init (EShellClass *klass) gtk_signal_new ("new_view_created", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShellClass, new_view_created), + G_STRUCT_OFFSET (EShellClass, new_view_created), e_shell_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); @@ -1816,7 +1816,7 @@ e_shell_component_maybe_crashed (EShell *shell, else parent_window = GTK_WINDOW (shell_view); - e_notice (parent_window, GNOME_MESSAGE_BOX_ERROR, + e_notice (parent_window, GTK_MESSAGE_ERROR, _("The Evolution component that handles folders of type \"%s\"\n" "has unexpectedly quit. You will need to quit Evolution and restart\n" "in order to access that data again."), diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c index bdc0b60b06..e7fb8c23fb 100644 --- a/shell/e-shortcuts-view-model.c +++ b/shell/e-shortcuts-view-model.c @@ -281,7 +281,7 @@ class_init (EShortcutsViewModelClass *klass) object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; - parent_class = gtk_type_class (e_shortcut_model_get_type ()); + parent_class = g_type_class_ref(e_shortcut_model_get_type ()); } static void diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 1575cff679..76874ea324 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -705,13 +705,13 @@ class_init (EShortcutsViewClass *klass) shortcut_bar_class->shortcut_drag_motion = impl_shortcut_drag_motion; shortcut_bar_class->shortcut_drag_data_received = impl_shortcut_drag_data_received; - parent_class = gtk_type_class (e_shortcut_bar_get_type ()); + parent_class = g_type_class_ref(e_shortcut_bar_get_type ()); signals[ACTIVATE_SHORTCUT] = gtk_signal_new ("activate_shortcut", GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsViewClass, activate_shortcut), + G_STRUCT_OFFSET (EShortcutsViewClass, activate_shortcut), e_shell_marshal_NONE__POINTER_STRING_INT, GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, @@ -722,7 +722,7 @@ class_init (EShortcutsViewClass *klass) gtk_signal_new ("hide_requested", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsViewClass, + G_STRUCT_OFFSET (EShortcutsViewClass, hide_requested), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 478327c02f..d3b26e0a07 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -677,13 +677,13 @@ class_init (EShortcutsClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); signals[NEW_GROUP] = gtk_signal_new ("new_group", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, new_group), + G_STRUCT_OFFSET (EShortcutsClass, new_group), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -692,7 +692,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("remove_group", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, remove_group), + G_STRUCT_OFFSET (EShortcutsClass, remove_group), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); @@ -701,7 +701,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("rename_group", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, rename_group), + G_STRUCT_OFFSET (EShortcutsClass, rename_group), e_shell_marshal_NONE__INT_STRING, GTK_TYPE_NONE, 2, GTK_TYPE_INT, @@ -711,7 +711,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("group_change_icon_size", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, group_change_icon_size), + G_STRUCT_OFFSET (EShortcutsClass, group_change_icon_size), e_shell_marshal_NONE__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_INT, @@ -721,7 +721,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("new_shortcut", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, new_shortcut), + G_STRUCT_OFFSET (EShortcutsClass, new_shortcut), e_shell_marshal_NONE__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_INT, @@ -731,7 +731,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("remove_shortcut", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, remove_shortcut), + G_STRUCT_OFFSET (EShortcutsClass, remove_shortcut), e_shell_marshal_NONE__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_INT, @@ -741,7 +741,7 @@ class_init (EShortcutsClass *klass) = gtk_signal_new ("update_shortcut", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EShortcutsClass, update_shortcut), + G_STRUCT_OFFSET (EShortcutsClass, update_shortcut), e_shell_marshal_NONE__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_INT, diff --git a/shell/e-splash.c b/shell/e-splash.c index f56cf7c4e8..08a735c46f 100644 --- a/shell/e-splash.c +++ b/shell/e-splash.c @@ -137,8 +137,8 @@ icon_new (ESplash *splash, static void icon_free (Icon *icon) { - gdk_pixbuf_unref (icon->dark_pixbuf); - gdk_pixbuf_unref (icon->light_pixbuf); + g_object_unref (icon->dark_pixbuf); + g_object_unref (icon->light_pixbuf); /* g_object_unref (icon->canvas_item); */ @@ -168,7 +168,7 @@ layout_icons (ESplash *splash) icon = (Icon *) p->data; - gtk_object_set (GTK_OBJECT (icon->canvas_item), + g_object_set((icon->canvas_item), "x", (double) x, "y", (double) ICON_Y, NULL); @@ -219,7 +219,7 @@ impl_dispose (GObject *object) priv = splash->priv; if (priv->splash_image_pixbuf != NULL) { - gdk_pixbuf_unref (priv->splash_image_pixbuf); + g_object_unref (priv->splash_image_pixbuf); priv->splash_image_pixbuf = NULL; } @@ -265,7 +265,7 @@ class_init (ESplashClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_window_get_type ()); + parent_class = g_type_class_ref(gtk_window_get_type ()); } static void @@ -317,7 +317,7 @@ e_splash_construct (ESplash *splash, priv = splash->priv; - priv->splash_image_pixbuf = gdk_pixbuf_ref (splash_image_pixbuf); + priv->splash_image_pixbuf = g_object_ref (splash_image_pixbuf); canvas = gnome_canvas_new_aa (); priv->canvas = GNOME_CANVAS (canvas); @@ -327,7 +327,7 @@ e_splash_construct (ESplash *splash, image_width = gdk_pixbuf_get_width (splash_image_pixbuf); image_height = gdk_pixbuf_get_height (splash_image_pixbuf); - gtk_widget_set_usize (canvas, image_width, image_height); + gtk_widget_set_size_request (canvas, image_width, image_height); gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, image_width, image_height); gtk_widget_show (canvas); @@ -346,7 +346,7 @@ e_splash_construct (ESplash *splash, g_signal_connect (splash, "button-press-event", G_CALLBACK (button_press_event), splash); - gtk_object_set (GTK_OBJECT (splash), "type", GTK_WINDOW_TOPLEVEL, NULL); + g_object_set((splash), "type", GTK_WINDOW_TOPLEVEL, NULL); gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER); gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE); gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height); @@ -375,7 +375,7 @@ e_splash_new (void) new = g_object_new (e_splash_get_type (), NULL); e_splash_construct (new, splash_image_pixbuf); - /* gdk_pixbuf_unref (splash_image_pixbuf); */ + /* g_object_unref (splash_image_pixbuf); */ return GTK_WIDGET (new); } @@ -438,7 +438,7 @@ e_splash_set_icon_highlight (ESplash *splash, icon = (Icon *) g_list_nth_data (priv->icons, num); g_return_if_fail (icon != NULL); - gtk_object_set (GTK_OBJECT (icon->canvas_item), + g_object_set((icon->canvas_item), "pixbuf", highlight ? icon->light_pixbuf : icon->dark_pixbuf, NULL); } diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index a18d23a34d..d57dd59968 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -325,7 +325,7 @@ get_pixbuf_for_folder (EStorageSetView *storage_set_view, icon_pixbuf_height = gdk_pixbuf_get_height (icon_pixbuf); if (icon_pixbuf_width == E_SHELL_MINI_ICON_SIZE && icon_pixbuf_height == E_SHELL_MINI_ICON_SIZE) { - scaled_pixbuf = gdk_pixbuf_ref (icon_pixbuf); + scaled_pixbuf = g_object_ref (icon_pixbuf); } else { scaled_pixbuf = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (icon_pixbuf), gdk_pixbuf_get_has_alpha (icon_pixbuf), @@ -815,7 +815,7 @@ static void pixbuf_free_func (gpointer key, gpointer value, gpointer user_data) { g_free (key); - gdk_pixbuf_unref ((GdkPixbuf*)value); + g_object_unref ((GdkPixbuf*)value); } static void @@ -1788,7 +1788,7 @@ class_init (EStorageSetViewClass *klass) GObjectClass *object_class; ETreeClass *etree_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); object_class->dispose = impl_dispose; @@ -1811,7 +1811,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("folder_selected", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, folder_selected), + G_STRUCT_OFFSET (EStorageSetViewClass, folder_selected), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -1820,7 +1820,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("folder_opened", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, folder_opened), + G_STRUCT_OFFSET (EStorageSetViewClass, folder_opened), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -1829,7 +1829,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("dnd_action", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, dnd_action), + G_STRUCT_OFFSET (EStorageSetViewClass, dnd_action), e_shell_marshal_NONE__POINTER_POINTER_POINTER_POINTER, GTK_TYPE_NONE, 4, GTK_TYPE_POINTER, @@ -1841,7 +1841,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("folder_context_menu_popping_up", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, folder_context_menu_popping_up), + G_STRUCT_OFFSET (EStorageSetViewClass, folder_context_menu_popping_up), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -1850,7 +1850,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("folder_context_menu_popped_down", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, folder_context_menu_popped_down), + G_STRUCT_OFFSET (EStorageSetViewClass, folder_context_menu_popped_down), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -1858,7 +1858,7 @@ class_init (EStorageSetViewClass *klass) = gtk_signal_new ("checkboxes_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetViewClass, checkboxes_changed), + G_STRUCT_OFFSET (EStorageSetViewClass, checkboxes_changed), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -1989,12 +1989,12 @@ setup_folder_changed_callbacks (EStorageSetView *storage_set_view, folder_changed_callback_data->path = g_strdup (path); gtk_signal_connect_while_alive (GTK_OBJECT (folder), "name_changed", - GTK_SIGNAL_FUNC (folder_name_changed_cb), + G_CALLBACK (folder_name_changed_cb), folder_changed_callback_data, GTK_OBJECT (storage_set_view)); e_gtk_signal_connect_full_while_alive (GTK_OBJECT (folder), "changed", - GTK_SIGNAL_FUNC (folder_changed_cb), + G_CALLBACK (folder_changed_cb), NULL, folder_changed_callback_data, folder_changed_callback_data_destroy_notify, @@ -2141,7 +2141,7 @@ e_storage_set_view_construct (EStorageSetView *storage_set_view, extras = e_table_extras_new (); cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT); - gtk_object_set (GTK_OBJECT (cell), "bold_column", 1, NULL); + g_object_set((cell), "bold_column", 1, NULL); e_table_extras_add_cell (extras, "render_tree", e_cell_tree_new (NULL, NULL, TRUE, cell)); diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c index 82f25afce4..ab2f32ba0c 100644 --- a/shell/e-storage-set.c +++ b/shell/e-storage-set.c @@ -380,7 +380,7 @@ class_init (EStorageSetClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); object_class = G_OBJECT_CLASS (klass); object_class->dispose = impl_dispose; @@ -390,7 +390,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("new_storage", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, new_storage), + G_STRUCT_OFFSET (EStorageSetClass, new_storage), e_shell_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); @@ -398,7 +398,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("removed_storage", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, removed_storage), + G_STRUCT_OFFSET (EStorageSetClass, removed_storage), e_shell_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); @@ -406,7 +406,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("new_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, new_folder), + G_STRUCT_OFFSET (EStorageSetClass, new_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -414,7 +414,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("updated_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, updated_folder), + G_STRUCT_OFFSET (EStorageSetClass, updated_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -422,7 +422,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("removed_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, removed_folder), + G_STRUCT_OFFSET (EStorageSetClass, removed_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -430,7 +430,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("moved_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, moved_folder), + G_STRUCT_OFFSET (EStorageSetClass, moved_folder), e_shell_marshal_NONE__STRING_STRING, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, @@ -439,7 +439,7 @@ class_init (EStorageSetClass *klass) gtk_signal_new ("close_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageSetClass, close_folder), + G_STRUCT_OFFSET (EStorageSetClass, close_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); diff --git a/shell/e-storage.c b/shell/e-storage.c index 713e0dad4e..64fbbb332a 100644 --- a/shell/e-storage.c +++ b/shell/e-storage.c @@ -268,7 +268,7 @@ class_init (EStorageClass *class) GObjectClass *object_class; object_class = G_OBJECT_CLASS (class); - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); object_class->finalize = impl_finalize; @@ -288,7 +288,7 @@ class_init (EStorageClass *class) gtk_signal_new ("new_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageClass, new_folder), + G_STRUCT_OFFSET (EStorageClass, new_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -296,7 +296,7 @@ class_init (EStorageClass *class) gtk_signal_new ("updated_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageClass, updated_folder), + G_STRUCT_OFFSET (EStorageClass, updated_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -304,7 +304,7 @@ class_init (EStorageClass *class) gtk_signal_new ("removed_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageClass, removed_folder), + G_STRUCT_OFFSET (EStorageClass, removed_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -312,7 +312,7 @@ class_init (EStorageClass *class) gtk_signal_new ("close_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EStorageClass, close_folder), + G_STRUCT_OFFSET (EStorageClass, close_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); diff --git a/shell/e-task-bar.c b/shell/e-task-bar.c index 64a9cebfe5..522d473373 100644 --- a/shell/e-task-bar.c +++ b/shell/e-task-bar.c @@ -84,7 +84,7 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) static void class_init (GtkObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/e-task-widget.c b/shell/e-task-widget.c index 9adf84fe4b..41a59f40d6 100644 --- a/shell/e-task-widget.c +++ b/shell/e-task-widget.c @@ -71,7 +71,7 @@ impl_dispose (GObject *object) } if (priv->icon_pixbuf != NULL) { - gdk_pixbuf_unref (priv->icon_pixbuf); + g_object_unref (priv->icon_pixbuf); priv->icon_pixbuf = NULL; } @@ -97,7 +97,7 @@ impl_finalize (GObject *object) static void class_init (GObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; @@ -151,9 +151,9 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_container_add (GTK_CONTAINER (frame), box); gtk_widget_show (box); - gtk_widget_set_usize (box, 1, -1); + gtk_widget_set_size_request (box, 1, -1); - priv->icon_pixbuf = gdk_pixbuf_ref (icon_pixbuf); + priv->icon_pixbuf = g_object_ref (icon_pixbuf); gdk_pixbuf_render_pixmap_and_mask (icon_pixbuf, &pixmap, &mask, 128); @@ -167,7 +167,7 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0); gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (mask); + g_object_unref (mask); priv->tooltips = gtk_tooltips_new (); g_object_ref (priv->tooltips); diff --git a/shell/e-uri-schema-registry.c b/shell/e-uri-schema-registry.c index 57784c6e49..468d640fd3 100644 --- a/shell/e-uri-schema-registry.c +++ b/shell/e-uri-schema-registry.c @@ -101,7 +101,7 @@ impl_finalize (GObject *object) static void class_init (GObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->finalize = impl_finalize; } diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 38d59b2139..7959458096 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -220,7 +220,7 @@ class_init (EvolutionActivityClientClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); object_class->dispose = impl_dispose; @@ -230,7 +230,7 @@ class_init (EvolutionActivityClientClass *klass) = gtk_signal_new ("show_details", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionActivityClientClass, show_details), + G_STRUCT_OFFSET (EvolutionActivityClientClass, show_details), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -238,7 +238,7 @@ class_init (EvolutionActivityClientClass *klass) = gtk_signal_new ("cancel", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionActivityClientClass, cancel), + G_STRUCT_OFFSET (EvolutionActivityClientClass, cancel), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); } diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index da781292ff..d5b9338678 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -156,11 +156,11 @@ class_init (EvolutionConfigControlClass *class) signals[APPLY] = gtk_signal_new ("apply", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionConfigControlClass, apply), + G_STRUCT_OFFSET (EvolutionConfigControlClass, apply), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c index 4f11935c84..515d191948 100644 --- a/shell/evolution-folder-selector-button.c +++ b/shell/evolution-folder-selector-button.c @@ -105,7 +105,7 @@ set_folder (EvolutionFolderSelectorButton *folder_selector_button, pixbuf = evolution_shell_client_get_pixbuf_for_type (priv->shell_client, folder->type, TRUE); gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon), pixbuf); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); folder_lname = e_utf8_to_gtk_string (w, folder->displayName); storage_lname = NULL; @@ -245,7 +245,7 @@ class_init (EvolutionFolderSelectorButtonClass *klass) GObjectClass *object_class; GtkButtonClass *button_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); button_class = GTK_BUTTON_CLASS (klass); @@ -258,20 +258,20 @@ class_init (EvolutionFolderSelectorButtonClass *klass) signals[POPPED_UP] = gtk_signal_new ("popped_up", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, popped_up), + G_STRUCT_OFFSET (EvolutionFolderSelectorButtonClass, popped_up), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); signals[SELECTED] = gtk_signal_new ("selected", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, selected), + G_STRUCT_OFFSET (EvolutionFolderSelectorButtonClass, selected), e_shell_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); signals[CANCELED] = gtk_signal_new ("canceled", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, canceled), + G_STRUCT_OFFSET (EvolutionFolderSelectorButtonClass, canceled), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); } diff --git a/shell/evolution-session.c b/shell/evolution-session.c index 9971f680d7..a53b2c3629 100644 --- a/shell/evolution-session.c +++ b/shell/evolution-session.c @@ -118,7 +118,7 @@ class_init (EvolutionSessionClass *klass) GObjectClass *object_class; object_class = G_OBJECT_CLASS (klass); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; @@ -127,7 +127,7 @@ class_init (EvolutionSessionClass *klass) = gtk_signal_new ("load_configuration", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionSessionClass, load_configuration), + G_STRUCT_OFFSET (EvolutionSessionClass, load_configuration), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -135,7 +135,7 @@ class_init (EvolutionSessionClass *klass) = gtk_signal_new ("save_configuration", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionSessionClass, save_configuration), + G_STRUCT_OFFSET (EvolutionSessionClass, save_configuration), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c index c300fdad51..b0b6101279 100644 --- a/shell/evolution-shell-client.c +++ b/shell/evolution-shell-client.c @@ -265,7 +265,7 @@ static void unref_pixbuf (gpointer name, gpointer pixbuf, gpointer data) { g_free (name); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); } static void @@ -347,7 +347,7 @@ class_init (EvolutionShellClientClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); @@ -641,7 +641,7 @@ evolution_shell_client_get_pixbuf_for_type (EvolutionShellClient *shell_client, } else g_free (hash_name); - gdk_pixbuf_ref (pixbuf); + g_object_ref (pixbuf); return pixbuf; } diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index b076753ded..09f91a7bc0 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -370,7 +370,7 @@ class_init (EvolutionShellComponentClientClass *klass) GObjectClass *object_class; object_class = G_OBJECT_CLASS (klass); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; diff --git a/shell/evolution-shell-component-dnd.c b/shell/evolution-shell-component-dnd.c index c3be3db88b..7a2ab7c0ff 100644 --- a/shell/evolution-shell-component-dnd.c +++ b/shell/evolution-shell-component-dnd.c @@ -136,7 +136,7 @@ evolution_shell_component_dnd_source_folder_class_init (EvolutionShellComponentD klass->epv.deleteData = impl_GNOME_Evolution_ShellComponentDnd_SourceFolder_deleteData; klass->epv.endDrag = impl_GNOME_Evolution_ShellComponentDnd_SourceFolder_endDrag; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void @@ -259,7 +259,7 @@ evolution_shell_component_dnd_destination_folder_class_init (EvolutionShellCompo klass->epv.handleMotion = impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleMotion; klass->epv.handleDrop = impl_GNOME_Evolution_ShellComponentDnd_DestinationFolder_handleDrop; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 17434f6dea..c9e9edf960 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -62,7 +62,7 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache) g_warning ("Cannot load image -- %s", path); } else { pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); bonobo_ui_component_set_prop (uic, pixcache [i].path, "pixname", pixcache [i].pixbuf, NULL); @@ -136,7 +136,7 @@ e_activation_failure_dialog (GtkWindow *parent, const char *msg, } CORBA_exception_free (&ev); - e_notice (parent, GNOME_MESSAGE_BOX_ERROR, errmsg); + e_notice (parent, GTK_MESSAGE_ERROR, errmsg); g_free (errmsg); } diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index 3aee87a74c..bf98d743cf 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -123,7 +123,7 @@ user_creatable_item_type_new (const char *id, if (icon == NULL) type->icon = NULL; else - type->icon = gdk_pixbuf_ref (icon); + type->icon = g_object_ref (icon); return type; } @@ -137,7 +137,7 @@ user_creatable_item_type_free (UserCreatableItemType *type) g_free (type->folder_type); if (type->icon != NULL) - gdk_pixbuf_unref (type->icon); + g_object_unref (type->icon); g_free (type); } @@ -950,7 +950,7 @@ class_init (EvolutionShellComponentClass *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); epv->_get_supportedTypes = impl__get_supportedTypes; epv->_get_externalUriSchemas = impl__get_externalUriSchemas; diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index 7ec337ee55..c7e8425630 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -167,7 +167,7 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("set_message", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_message), + G_STRUCT_OFFSET (EvolutionShellViewClass, set_message), e_shell_marshal_NONE__STRING_INT, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, @@ -177,7 +177,7 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("unset_message", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, unset_message), + G_STRUCT_OFFSET (EvolutionShellViewClass, unset_message), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -185,7 +185,7 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("change_current_view", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, change_current_view), + G_STRUCT_OFFSET (EvolutionShellViewClass, change_current_view), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -194,7 +194,7 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("set_title", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_title), + G_STRUCT_OFFSET (EvolutionShellViewClass, set_title), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -203,7 +203,7 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("set_folder_bar_label", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_folder_bar_label), + G_STRUCT_OFFSET (EvolutionShellViewClass, set_folder_bar_label), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -212,11 +212,11 @@ class_init (EvolutionShellViewClass *klass) = gtk_signal_new ("show_settings", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionShellViewClass, show_settings), + G_STRUCT_OFFSET (EvolutionShellViewClass, show_settings), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - parent_class = gtk_type_class (bonobo_x_object_get_type ()); + parent_class = g_type_class_ref(bonobo_x_object_get_type ()); } static void diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index f0570a3844..59bbc62391 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -251,7 +251,7 @@ class_init (EvolutionStorageListenerClass *klass) { GObjectClass *object_class; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; @@ -259,14 +259,14 @@ class_init (EvolutionStorageListenerClass *klass) signals[DESTROYED] = gtk_signal_new ("destroyed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, destroyed), + G_STRUCT_OFFSET (EvolutionStorageListenerClass, destroyed), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); signals[NEW_FOLDER] = gtk_signal_new ("new_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, new_folder), + G_STRUCT_OFFSET (EvolutionStorageListenerClass, new_folder), e_shell_marshal_NONE__STRING_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, @@ -275,7 +275,7 @@ class_init (EvolutionStorageListenerClass *klass) signals[UPDATE_FOLDER] = gtk_signal_new ("update_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, update_folder), + G_STRUCT_OFFSET (EvolutionStorageListenerClass, update_folder), e_shell_marshal_NONE__STRING_INT, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, @@ -284,7 +284,7 @@ class_init (EvolutionStorageListenerClass *klass) signals[REMOVED_FOLDER] = gtk_signal_new ("removed_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, removed_folder), + G_STRUCT_OFFSET (EvolutionStorageListenerClass, removed_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -292,7 +292,7 @@ class_init (EvolutionStorageListenerClass *klass) signals[HAS_SUBFOLDERS] = gtk_signal_new ("has_subfolders", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, has_subfolders), + G_STRUCT_OFFSET (EvolutionStorageListenerClass, has_subfolders), e_shell_marshal_NONE__STRING_STRING, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c index b0f23ef50d..b34ccf317a 100644 --- a/shell/evolution-storage-set-view-listener.c +++ b/shell/evolution-storage-set-view-listener.c @@ -198,19 +198,19 @@ class_init (EvolutionStorageSetViewListenerClass *klass) object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_object_get_type ()); + parent_class = g_type_class_ref(gtk_object_get_type ()); signals[FOLDER_SELECTED] = gtk_signal_new ("folder_selected", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, folder_selected), + G_STRUCT_OFFSET (EvolutionStorageSetViewListenerClass, folder_selected), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); signals[FOLDER_TOGGLED] = gtk_signal_new ("folder_toggled", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, folder_toggled), + G_STRUCT_OFFSET (EvolutionStorageSetViewListenerClass, folder_toggled), e_shell_marshal_NONE__NONE, GTK_TYPE_NONE, 0); diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c index c4eadc7ec7..7234c33ffe 100644 --- a/shell/evolution-storage-set-view.c +++ b/shell/evolution-storage-set-view.c @@ -423,7 +423,7 @@ class_init (EvolutionStorageSetViewClass *klass) epv->_set_checkedFolders = impl_StorageSetView__set_checkedFolders; epv->_get_checkedFolders = impl_StorageSetView__get_checkedFolders; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); } static void diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 60261c8847..cf88c924d2 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -665,7 +665,7 @@ impl_finalize (GObject *object) g_free (item->label); g_free (item->tooltip); if (item->icon != NULL) - gdk_pixbuf_unref (item->icon); + g_object_unref (item->icon); g_free (item); } g_slist_free (priv->folder_property_items); @@ -704,12 +704,12 @@ class_init (EvolutionStorageClass *klass) epv->showFolderProperties = impl_Storage_showFolderProperties; epv->_get_folderPropertyItems = impl_Storage__get_folderPropertyItems; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); signals[CREATE_FOLDER] = gtk_signal_new ("create_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, create_folder), e_shell_marshal_NONE__POINTER_STRING_STRING_STRING_STRING, GTK_TYPE_NONE, 5, @@ -722,7 +722,7 @@ class_init (EvolutionStorageClass *klass) signals[REMOVE_FOLDER] = gtk_signal_new ("remove_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, remove_folder), e_shell_marshal_NONE__POINTER_STRING_STRING, GTK_TYPE_NONE, 3, @@ -733,7 +733,7 @@ class_init (EvolutionStorageClass *klass) signals[XFER_FOLDER] = gtk_signal_new ("xfer_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, xfer_folder), e_shell_marshal_NONE__POINTER_STRING_STRING_BOOL, GTK_TYPE_NONE, 4, @@ -745,7 +745,7 @@ class_init (EvolutionStorageClass *klass) signals[UPDATE_FOLDER] = gtk_signal_new ("update_folder", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, update_folder), e_shell_marshal_NONE__STRING_INT, GTK_TYPE_NONE, 2, @@ -755,7 +755,7 @@ class_init (EvolutionStorageClass *klass) signals[OPEN_FOLDER] = gtk_signal_new ("open_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, open_folder), e_shell_marshal_NONE__STRING, GTK_TYPE_NONE, 1, @@ -764,7 +764,7 @@ class_init (EvolutionStorageClass *klass) signals[DISCOVER_SHARED_FOLDER] = gtk_signal_new ("discover_shared_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, discover_shared_folder), e_shell_marshal_NONE__POINTER_STRING_STRING, GTK_TYPE_NONE, 3, @@ -775,7 +775,7 @@ class_init (EvolutionStorageClass *klass) signals[CANCEL_DISCOVER_SHARED_FOLDER] = gtk_signal_new ("cancel_discover_shared_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, cancel_discover_shared_folder), e_shell_marshal_NONE__STRING_STRING, GTK_TYPE_NONE, 2, @@ -785,7 +785,7 @@ class_init (EvolutionStorageClass *klass) signals[REMOVE_SHARED_FOLDER] = gtk_signal_new ("remove_shared_folder", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, remove_shared_folder), e_shell_marshal_NONE__STRING_POINTER, GTK_TYPE_NONE, 2, @@ -795,7 +795,7 @@ class_init (EvolutionStorageClass *klass) signals[SHOW_FOLDER_PROPERTIES] = gtk_signal_new ("show_folder_properties", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionStorageClass, + G_STRUCT_OFFSET (EvolutionStorageClass, show_folder_properties), e_shell_marshal_NONE__STRING_INT_INT, GTK_TYPE_NONE, 3, @@ -1324,7 +1324,7 @@ evolution_storage_add_property_item (EvolutionStorage *evolution_storage, item->tooltip = g_strdup (tooltip); item->icon = icon; if (icon != NULL) - gdk_pixbuf_ref (icon); + g_object_ref (icon); evolution_storage->priv->folder_property_items = g_slist_append (evolution_storage->priv->folder_property_items, item); diff --git a/shell/evolution-wizard.c b/shell/evolution-wizard.c index fdc1046c5f..673a7ad06b 100644 --- a/shell/evolution-wizard.c +++ b/shell/evolution-wizard.c @@ -192,42 +192,42 @@ evolution_wizard_class_init (EvolutionWizardClass *klass) signals[NEXT] = gtk_signal_new ("next", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, next), + G_STRUCT_OFFSET (EvolutionWizardClass, next), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); signals[PREPARE] = gtk_signal_new ("prepare", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, prepare), + G_STRUCT_OFFSET (EvolutionWizardClass, prepare), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); signals[BACK] = gtk_signal_new ("back", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, back), + G_STRUCT_OFFSET (EvolutionWizardClass, back), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); signals[FINISH] = gtk_signal_new ("finish", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, finish), + G_STRUCT_OFFSET (EvolutionWizardClass, finish), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); signals[CANCEL] = gtk_signal_new ("cancel", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, cancel), + G_STRUCT_OFFSET (EvolutionWizardClass, cancel), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); signals[HELP] = gtk_signal_new ("help", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (EvolutionWizardClass, help), + G_STRUCT_OFFSET (EvolutionWizardClass, help), e_shell_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); epv->_get_pageCount = impl_GNOME_Evolution_Wizard__get_pageCount; epv->getControl = impl_GNOME_Evolution_Wizard_getControl; diff --git a/shell/main.c b/shell/main.c index 1f98b2a7aa..64febd4fcd 100644 --- a/shell/main.c +++ b/shell/main.c @@ -39,6 +39,8 @@ #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <gtk/gtkwindow.h> +#include <gtk/gtkdialog.h> +#include <gtk/gtkstock.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> @@ -163,7 +165,7 @@ shell_weak_notify (void *data, /* Warning dialog to scare people off a little bit. */ static void -warning_dialog_clicked_callback (GnomeDialog *dialog, +warning_dialog_response_callback (GtkDialog *dialog, int button_number, void *data) { @@ -199,9 +201,9 @@ show_development_warning (GtkWindow *parent) g_object_unref (client); - warning_dialog = gnome_dialog_new ("Ximian Evolution " VERSION, GNOME_STOCK_BUTTON_OK, NULL); - gtk_window_set_transient_for (GTK_WINDOW (warning_dialog), parent); - + warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent, + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); label = gtk_label_new ( /* xgettext:no-c-format */ _("Hi. Thanks for taking the time to download this preview release\n" @@ -222,7 +224,7 @@ show_development_warning (GtkWindow *parent) )); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), label, TRUE, TRUE, 4); label = gtk_label_new (_("Thanks\n" @@ -230,7 +232,7 @@ show_development_warning (GtkWindow *parent) gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); gtk_misc_set_alignment(GTK_MISC(label), 1, .5); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), label, TRUE, TRUE, 0); dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Don't tell me again")); @@ -239,13 +241,13 @@ show_development_warning (GtkWindow *parent) alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), alignment, FALSE, FALSE, 0); gtk_widget_show_all (warning_dialog); - g_signal_connect (warning_dialog, "clicked", - G_CALLBACK (warning_dialog_clicked_callback), + g_signal_connect (warning_dialog, "response", + G_CALLBACK (warning_dialog_response_callback), dont_bother_me_again_checkbox); } @@ -355,7 +357,7 @@ idle_cb (void *data) case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER: corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot access the Ximian Evolution shell.")); CORBA_exception_free (&ev); bonobo_main_quit (); @@ -364,7 +366,7 @@ idle_cb (void *data) break; default: - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot initialize the Ximian Evolution shell: %s"), e_shell_construct_result_to_string (result)); CORBA_exception_free (&ev); |