Commit 99581c49 authored by Johannes Schmid's avatar Johannes Schmid Committed by Johannes Schmid

Patch from Maxim Ermilov <zaspire@rambler.ru>:

2009-03-30  Johannes Schmid  <jhs@gnome.org>

  Patch from Maxim Ermilov <zaspire@rambler.ru>:
	* configure.in:
	* libanjuta/anjuta-launcher.c (create_password_dialog):
	* libanjuta/anjuta-plugin.c (anjuta_plugin_class_init),
	(anjuta_plugin_init):
	* libanjuta/anjuta-preferences.c
	(block_update_property_on_change_str),
	(unblock_update_property_on_change_str):
	* libanjuta/anjuta-preferences.h:
	* libanjuta/anjuta-serializer.c:
	* libanjuta/cell-renderer-captioned-image.h:
	* libanjuta/e-splash.h:
	* plugins/build-basic-autotools/plugin.c:
	* plugins/class-gen/window.c:
	* plugins/class-inheritance/class-inherit.h:
	* plugins/class-inheritance/plugin.c:
	* plugins/cvs-plugin/cvs-execute.c:
	* plugins/debug-manager/breakpoints.c:
	* plugins/debug-manager/data_view.c (dma_data_view_child_type):
	* plugins/debug-manager/memory.c:
	* plugins/debug-manager/plugin.c:
	* plugins/debug-manager/sharedlib.c (sharedlibs_show),
	(sharedlibs_hide):
	* plugins/debug-manager/signals.c (create_signals_gui),
	(signals_show), (signals_hide):
	* plugins/debug-manager/stack_trace.c:
	* plugins/debug-manager/start.c (add_source_show):
	* plugins/debug-manager/threads.c:
	* plugins/debug-manager/watch.c:
	* plugins/document-manager/anjuta-bookmarks.c
	(anjuta_bookmarks_init):
	* plugins/document-manager/anjuta-docman.c:
	* plugins/document-manager/plugin.c (activate_plugin):
	* plugins/document-manager/search-box.c:
	* plugins/file-loader/dnd.c:
	* plugins/file-loader/dnd.h:
	* plugins/file-loader/plugin.c (RowSeparatorFunc),
	(open_with_dialog), (create_open_with_submenu):
	* plugins/file-wizard/anjuta-file-wizard.glade:
	* plugins/file-wizard/file.c (create_new_file_dialog),
	(on_new_file_okbutton_clicked), (on_new_file_entry_changed),
	(on_new_file_type_changed):
	* plugins/file-wizard/file.h:
	* plugins/gdb/debugger.c:
	* plugins/gdb/plugin.c:
	* plugins/gdb/utilities.c:
	* plugins/gdb/utilities.h:
	* plugins/glade/designer-associations-item.c
	(associations_file_from_xml):
	* plugins/glade/plugin.c (activate_plugin):
	* plugins/gtodo/add_edit_item.c (RowSeparatorFunc),
	(gui_add_todo_item), (add_edit_option_changed):
	* plugins/gtodo/callback.c (category_changed), (purge_category):
	* plugins/gtodo/export.c (export_gui):
	* plugins/gtodo/interface.c (gtodo_update_settings),
	(gui_create_todo_widget):
	* plugins/gtodo/list_tooltip.c (get_tooltip_text):
	* plugins/gtodo/main.h:
	* plugins/gtodo/mcategory.c (category_manager):
	* plugins/gtodo/tasklists.c (open_playlist), (create_playlist):
	* plugins/gtodo/todo_db.c (RowSeparatorFunc), (read_categorys),
	(load_category):
	* plugins/indent/indent-dialog.c (indent_connect_items),
	(on_indent_checkbutton_toggled),
	(on_indent_spinbutton_value_changed), (create_dialog):
	* plugins/language-support-cpp-java/plugin.c:
	* plugins/macro/macro-actions.c (on_menu_insert_macro):
	* plugins/macro/macro-util.c:
	* plugins/message-view/anjuta-msgman.c (on_message_view_destroy),
	(anjuta_msgman_append_view), (anjuta_msgman_remove_all_views):
	* plugins/message-view/message-view.h:
	* plugins/patch/patch-plugin.c (patch_show_gui):
	* plugins/project-manager/gbf-project-model.h:
	* plugins/project-manager/gbf-project-view.h:
	* plugins/project-wizard/autogen.c:
	* plugins/project-wizard/druid.c (cb_druid_add_property),
	(npw_druid_new), (npw_druid_free):
	* plugins/project-wizard/property.c:
	* plugins/run-program/parameters.c (run_dialog_init):
	* plugins/scintilla/anjuta-editor-scintilla.glade:
	* plugins/scintilla/print.c:
	* plugins/scintilla/scintilla/PlatGTK.cxx:
	* plugins/scintilla/scintilla/ScintillaGTK.cxx:
	* plugins/scintilla/scintilla/include/ScintillaWidget.h:
	* plugins/scintilla/style-editor.c (on_hilite_style_entry_changed),
	(sync_from_props), (sync_to_props), (create_style_editor_gui):
	* plugins/scintilla/text-editor-iterable.c:
	* plugins/scintilla/text_editor.c:
	* plugins/scintilla/text_editor_cbs.c:
	* plugins/scintilla/text_editor_cbs.h:
	* plugins/search/plugin.c:
	* plugins/search/plugin.h:
	* plugins/search/search-replace.c:
	* plugins/search/search-replace_backend.c:
	* plugins/search/search-replace_backend.h:
	* plugins/search/search_preferences.c:
	* plugins/sourceview/anjuta-view.h:
	* plugins/sourceview/assist-window.c (assist_window_init):
	* plugins/symbol-db/symbol-db-engine-core.c:
	* plugins/symbol-db/symbol-db-view-search.c (sdb_view_search_init):
	* plugins/terminal/terminal.c:
	* plugins/tools/dialog.c (atp_tool_dialog_show):
	* plugins/tools/editor.c (atp_variable_dialog_show),
	(atp_tool_editor_show):
	* plugins/tools/execute.c:
	* plugins/valgrind/vggeneralprefs.h:
	* plugins/valgrind/vghelgrindprefs.c (menu_item_activated),
	(show_last_access_new), (vg_helgrind_prefs_init):
	* plugins/valgrind/vghelgrindprefs.h:
	* plugins/valgrind/vgmemcheckprefs.c (menu_item_activated),
	(combo_box_new), (vg_memcheck_prefs_init):
	* plugins/valgrind/vgmemcheckprefs.h:
	* plugins/valgrind/vgrule-editor.c (type_menu_changed),
	(rule_type_menu_new), (call_stack_frame_new),
	(vg_rule_editor_init), (vg_rule_editor_set_type),
	(vg_rule_editor_get_rule):
	* plugins/valgrind/vgrule-editor.h:
	* plugins/valgrind/vgsearchbar.c (clear_clicked),
	(vg_search_bar_init), (item_activate), (search_bar_set_menu_items):
	* plugins/valgrind/vgsearchbar.h:
	* src/about.c (on_about_plugin_activate):
	* src/action-callbacks.h:
	* src/anjuta-app.c (anjuta_app_add_widget_full):
	* src/main.c (main):
	* src/shell.c (on_shortcuts_activate),
	(anjuta_test_shell_instance_init):
	* src/start-with.c (on_application_wizard_clicked),
	(on_import_wizard_clicked), (on_open_project_clicked),
	(on_open_file_clicked), (on_new_file_clicked):
	#572754 – Remove deprecated GTK+ symbols

svn path=/trunk/; revision=4912
parent 75c30fe8
2009-03-30 Johannes Schmid <jhs@gnome.org>
Patch from Maxim Ermilov <zaspire@rambler.ru>:
* configure.in:
* libanjuta/anjuta-launcher.c (create_password_dialog):
* libanjuta/anjuta-plugin.c (anjuta_plugin_class_init),
(anjuta_plugin_init):
* libanjuta/anjuta-preferences.c
(block_update_property_on_change_str),
(unblock_update_property_on_change_str):
* libanjuta/anjuta-preferences.h:
* libanjuta/anjuta-serializer.c:
* libanjuta/cell-renderer-captioned-image.h:
* libanjuta/e-splash.h:
* plugins/build-basic-autotools/plugin.c:
* plugins/class-gen/window.c:
* plugins/class-inheritance/class-inherit.h:
* plugins/class-inheritance/plugin.c:
* plugins/cvs-plugin/cvs-execute.c:
* plugins/debug-manager/breakpoints.c:
* plugins/debug-manager/data_view.c (dma_data_view_child_type):
* plugins/debug-manager/memory.c:
* plugins/debug-manager/plugin.c:
* plugins/debug-manager/sharedlib.c (sharedlibs_show),
(sharedlibs_hide):
* plugins/debug-manager/signals.c (create_signals_gui),
(signals_show), (signals_hide):
* plugins/debug-manager/stack_trace.c:
* plugins/debug-manager/start.c (add_source_show):
* plugins/debug-manager/threads.c:
* plugins/debug-manager/watch.c:
* plugins/document-manager/anjuta-bookmarks.c
(anjuta_bookmarks_init):
* plugins/document-manager/anjuta-docman.c:
* plugins/document-manager/plugin.c (activate_plugin):
* plugins/document-manager/search-box.c:
* plugins/file-loader/dnd.c:
* plugins/file-loader/dnd.h:
* plugins/file-loader/plugin.c (RowSeparatorFunc),
(open_with_dialog), (create_open_with_submenu):
* plugins/file-wizard/anjuta-file-wizard.glade:
* plugins/file-wizard/file.c (create_new_file_dialog),
(on_new_file_okbutton_clicked), (on_new_file_entry_changed),
(on_new_file_type_changed):
* plugins/file-wizard/file.h:
* plugins/gdb/debugger.c:
* plugins/gdb/plugin.c:
* plugins/gdb/utilities.c:
* plugins/gdb/utilities.h:
* plugins/glade/designer-associations-item.c
(associations_file_from_xml):
* plugins/glade/plugin.c (activate_plugin):
* plugins/gtodo/add_edit_item.c (RowSeparatorFunc),
(gui_add_todo_item), (add_edit_option_changed):
* plugins/gtodo/callback.c (category_changed), (purge_category):
* plugins/gtodo/export.c (export_gui):
* plugins/gtodo/interface.c (gtodo_update_settings),
(gui_create_todo_widget):
* plugins/gtodo/list_tooltip.c (get_tooltip_text):
* plugins/gtodo/main.h:
* plugins/gtodo/mcategory.c (category_manager):
* plugins/gtodo/tasklists.c (open_playlist), (create_playlist):
* plugins/gtodo/todo_db.c (RowSeparatorFunc), (read_categorys),
(load_category):
* plugins/indent/indent-dialog.c (indent_connect_items),
(on_indent_checkbutton_toggled),
(on_indent_spinbutton_value_changed), (create_dialog):
* plugins/language-support-cpp-java/plugin.c:
* plugins/macro/macro-actions.c (on_menu_insert_macro):
* plugins/macro/macro-util.c:
* plugins/message-view/anjuta-msgman.c (on_message_view_destroy),
(anjuta_msgman_append_view), (anjuta_msgman_remove_all_views):
* plugins/message-view/message-view.h:
* plugins/patch/patch-plugin.c (patch_show_gui):
* plugins/project-manager/gbf-project-model.h:
* plugins/project-manager/gbf-project-view.h:
* plugins/project-wizard/autogen.c:
* plugins/project-wizard/druid.c (cb_druid_add_property),
(npw_druid_new), (npw_druid_free):
* plugins/project-wizard/property.c:
* plugins/run-program/parameters.c (run_dialog_init):
* plugins/scintilla/anjuta-editor-scintilla.glade:
* plugins/scintilla/print.c:
* plugins/scintilla/scintilla/PlatGTK.cxx:
* plugins/scintilla/scintilla/ScintillaGTK.cxx:
* plugins/scintilla/scintilla/include/ScintillaWidget.h:
* plugins/scintilla/style-editor.c (on_hilite_style_entry_changed),
(sync_from_props), (sync_to_props), (create_style_editor_gui):
* plugins/scintilla/text-editor-iterable.c:
* plugins/scintilla/text_editor.c:
* plugins/scintilla/text_editor_cbs.c:
* plugins/scintilla/text_editor_cbs.h:
* plugins/search/plugin.c:
* plugins/search/plugin.h:
* plugins/search/search-replace.c:
* plugins/search/search-replace_backend.c:
* plugins/search/search-replace_backend.h:
* plugins/search/search_preferences.c:
* plugins/sourceview/anjuta-view.h:
* plugins/sourceview/assist-window.c (assist_window_init):
* plugins/symbol-db/symbol-db-engine-core.c:
* plugins/symbol-db/symbol-db-view-search.c (sdb_view_search_init):
* plugins/terminal/terminal.c:
* plugins/tools/dialog.c (atp_tool_dialog_show):
* plugins/tools/editor.c (atp_variable_dialog_show),
(atp_tool_editor_show):
* plugins/tools/execute.c:
* plugins/valgrind/vggeneralprefs.h:
* plugins/valgrind/vghelgrindprefs.c (menu_item_activated),
(show_last_access_new), (vg_helgrind_prefs_init):
* plugins/valgrind/vghelgrindprefs.h:
* plugins/valgrind/vgmemcheckprefs.c (menu_item_activated),
(combo_box_new), (vg_memcheck_prefs_init):
* plugins/valgrind/vgmemcheckprefs.h:
* plugins/valgrind/vgrule-editor.c (type_menu_changed),
(rule_type_menu_new), (call_stack_frame_new),
(vg_rule_editor_init), (vg_rule_editor_set_type),
(vg_rule_editor_get_rule):
* plugins/valgrind/vgrule-editor.h:
* plugins/valgrind/vgsearchbar.c (clear_clicked),
(vg_search_bar_init), (item_activate), (search_bar_set_menu_items):
* plugins/valgrind/vgsearchbar.h:
* src/about.c (on_about_plugin_activate):
* src/action-callbacks.h:
* src/anjuta-app.c (anjuta_app_add_widget_full):
* src/main.c (main):
* src/shell.c (on_shortcuts_activate),
(anjuta_test_shell_instance_init):
* src/start-with.c (on_application_wizard_clicked),
(on_import_wizard_clicked), (on_open_project_clicked),
(on_open_file_clicked), (on_new_file_clicked):
#572754 – Remove deprecated GTK+ symbols
2009-03-30 Mario Blättermann <mariobl@svn.gnome.org>
* manuals/anjuta-manual/de/de.po:
......@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
m4_define(anjuta_major_version, 2)
m4_define(anjuta_minor_version, 26)
m4_define(anjuta_minor_version, 27)
m4_define(anjuta_micro_version, 0)
m4_define(anjuta_nano_version, 0)
m4_define(anjuta_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version.anjuta_nano_version)
......@@ -25,7 +25,7 @@ AC_SUBST(ANJUTA_VERSION)
GLIB_REQUIRED=2.16.0
GDK_PIXBUF_REQUIRED=2.0.0
GTK_REQUIRED=2.12.10
GTK_REQUIRED=2.14.0
ORBIT_REQUIRED=2.6.0
LIBGLADE_REQUIRED=2.3.0
GNOME_REQUIRED=2.12.0
......@@ -34,7 +34,7 @@ VTE_REQUIRED=0.9.0
VTE_NEW_REQUIRED=0.13.1
LIBXML_REQUIRED=2.4.23
LIBDEVHELP_REQUIRED=0.22
GDL_REQUIRED=2.26.0
GDL_REQUIRED=2.24.0
GLADEUI_REQUIRED=3.6.0
LIBGRAPHVIZ_REQUIRED=1.0
NEON_REQUIRED=0.28.2
......@@ -45,7 +45,7 @@ SUBVERSION_REQUIRED=$SVN_MAJOR.$SVN_MINOR.$SVN_PATCH
GTKSOURCEVIEW_REQUIRED=2.4.0
BINUTILS_REQUIRED=2.15.92
LIBWNCK_REQUIRED=2.12
GDA_REQUIRED=3.99.7
GDA_REQUIRED=4.0.0
UNIQUE_REQUIRED=1.0.0
dnl LIBGTODO_REQUIRED=0.15
......
......@@ -561,7 +561,7 @@ create_password_dialog (const gchar* prompt)
icon = anjuta_res_get_image (ANJUTA_PIXMAP_PASSWORD);
gtk_widget_show (icon);
gtk_box_pack_start_defaults (GTK_BOX(hbox), icon);
gtk_box_pack_start (GTK_BOX(hbox), icon, TRUE, TRUE, 0);
if (strlen (prompt) < 20) {
box = gtk_hbox_new (FALSE, 5);
......@@ -569,7 +569,7 @@ create_password_dialog (const gchar* prompt)
box = gtk_vbox_new (FALSE, 5);
}
gtk_widget_show (box);
gtk_box_pack_start_defaults (GTK_BOX (hbox), box);
gtk_box_pack_start (GTK_BOX (hbox), box, TRUE, TRUE, 0);
label = gtk_label_new (_(prompt));
gtk_widget_show (label);
......
......@@ -214,7 +214,7 @@ static guint plugin_signals[LAST_SIGNAL] = { 0 };
static void anjuta_plugin_finalize (GObject *object);
static void anjuta_plugin_class_init (AnjutaPluginClass *class);
GNOME_CLASS_BOILERPLATE (AnjutaPlugin, anjuta_plugin, GObject, G_TYPE_OBJECT);
G_DEFINE_TYPE (AnjutaPlugin, anjuta_plugin, G_TYPE_OBJECT);
static void
destroy_watch (Watch *watch)
......@@ -310,7 +310,7 @@ static void
anjuta_plugin_class_init (AnjutaPluginClass *class)
{
GObjectClass *object_class = (GObjectClass*) class;
parent_class = g_type_class_peek_parent (class);
GObjectClass *parent_class = g_type_class_peek_parent (class);
object_class->dispose = anjuta_plugin_dispose;
object_class->finalize = anjuta_plugin_finalize;
......@@ -350,7 +350,7 @@ anjuta_plugin_class_init (AnjutaPluginClass *class)
}
static void
anjuta_plugin_instance_init (AnjutaPlugin *plugin)
anjuta_plugin_init (AnjutaPlugin *plugin)
{
plugin->priv = g_new0 (AnjutaPluginPrivate, 1);
}
......
......@@ -64,6 +64,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <glade/glade-parser.h>
#include <gconf/gconf-client.h>
......@@ -911,7 +912,7 @@ block_update_property_on_change_str (GtkWidget *widget, GdkEvent *event,
{
AnjutaProperty *p = (AnjutaProperty *) user_data;
gtk_signal_handler_block_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
g_signal_handlers_block_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
return FALSE;
}
......@@ -921,7 +922,7 @@ unblock_update_property_on_change_str (GtkWidget *widget, GdkEvent *event,
{
AnjutaProperty *p = (AnjutaProperty *) user_data;
gtk_signal_handler_unblock_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
g_signal_handlers_unblock_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
return FALSE;
}
......
......@@ -20,7 +20,9 @@
#ifndef _ANJUTA_PREFERENCES_H_
#define _ANJUTA_PREFERENCES_H_
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <glade/glade.h>
#include <libanjuta/anjuta-preferences-dialog.h>
......
......@@ -28,6 +28,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <anjuta-enum-types.h>
#include "anjuta-serializer.h"
......
......@@ -27,11 +27,11 @@
G_BEGIN_DECLS
#define ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE (anjuta_cell_renderer_captioned_image_get_type ())
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj) (GTK_CHECK_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj) (GTK_CHECK_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
typedef struct _AnjutaCellRendererCaptionedImage AnjutaCellRendererCaptionedImage;
typedef struct _AnjutaCellRendererCaptionedImageClass AnjutaCellRendererCaptionedImageClass;
......
......@@ -30,10 +30,10 @@
G_BEGIN_DECLS
#define E_TYPE_SPLASH (e_splash_get_type ())
#define E_SPLASH(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
#define E_SPLASH_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
#define E_IS_SPLASH(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
#define E_IS_SPLASH_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
#define E_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SPLASH, ESplash))
#define E_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
#define E_IS_SPLASH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SPLASH))
#define E_IS_SPLASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
typedef struct _ESplash ESplash;
typedef struct _ESplashPrivate ESplashPrivate;
......@@ -49,7 +49,7 @@ struct _ESplashClass {
GtkWindowClass parent_class;
};
GtkType e_splash_get_type (void);
GType e_splash_get_type (void);
void e_splash_construct (ESplash *splash,
GdkPixbuf *splash_image_pixbuf,
gint progressbar_position);
......
......@@ -20,6 +20,7 @@
#include <config.h>
#include <ctype.h>
#include <stdlib.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
......
......@@ -23,7 +23,7 @@
#include "element-editor.h"
#include <libanjuta/anjuta-plugin.h>
#include <stdlib.h>
#include <glib.h>
#include <ctype.h>
......
......@@ -21,6 +21,7 @@
#define _CLASS_INHERIT_H
#include <libanjuta/interfaces/ianjuta-symbol-manager.h>
#include <gnome.h>
#include "plugin.h"
......
......@@ -27,7 +27,7 @@
#include <libanjuta/interfaces/ianjuta-document-manager.h>
#include <libanjuta/interfaces/ianjuta-project-manager.h>
#include <libanjuta/anjuta-debug.h>
#include <gnome.h>
#include "plugin.h"
#include "class-inherit.h"
......
......@@ -27,6 +27,7 @@
#include <libanjuta/anjuta-launcher.h>
#include <libanjuta/anjuta-debug.h>
#include <unistd.h>
#include <glade/glade.h>
#define CVS_ICON ""
......
......@@ -48,7 +48,8 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <libanjuta/resources.h>
......
......@@ -751,7 +751,7 @@ dma_data_view_refresh (DmaDataView *view)
static GType
dma_data_view_child_type (GtkContainer *container)
{
return GTK_TYPE_NONE;
return G_TYPE_NONE;
}
static void
......
......@@ -26,7 +26,9 @@
#include <unistd.h>
#include <string.h>
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gdk/gdk.h>
/*#define DEBUG*/
#include <libanjuta/anjuta-debug.h>
......
......@@ -38,6 +38,7 @@
#include "queue.h"
#include "variable.h"
#include <glib/gi18n.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/anjuta-status.h>
......
......@@ -287,7 +287,7 @@ sharedlibs_show (Sharedlibs* sl)
}
else
{
gtk_widget_set_uposition(sl->widgets.window, sl->win_pos_x,
gdk_window_move(sl->widgets.window->window, sl->win_pos_x,
sl->win_pos_y);
gtk_window_set_default_size(GTK_WINDOW(sl->widgets.window),
sl->win_width, sl->win_height);
......@@ -309,7 +309,7 @@ sharedlibs_hide (Sharedlibs* sl)
if(sl->is_showing == FALSE) return;
gdk_window_get_root_origin(sl->widgets.window->window,
&sl->win_pos_x, &sl->win_pos_y);
gdk_window_get_size(sl ->widgets.window->window, &sl->win_width,
gdk_drawable_get_size(sl ->widgets.window->window, &sl->win_width,
&sl->win_height);
gtk_widget_hide(sl->widgets.window);
sl->is_showing = FALSE;
......
......@@ -26,6 +26,8 @@
#include <string.h>
#include <ctype.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/resources.h>
......@@ -363,10 +365,10 @@ create_signals_gui (Signals *sg)
tv = signals_create_list_store_and_treeview (sg);
gtk_widget_show (tv);
gtk_container_add (GTK_CONTAINER (scrolledwindow4), tv);
gtk_signal_connect (GTK_OBJECT (window3), "delete_event",
GTK_SIGNAL_FUNC (on_signals_delete_event),sg);
gtk_signal_connect (GTK_OBJECT (window3), "key-press-event",
GTK_SIGNAL_FUNC (on_signals_key_press_event), sg);
g_signal_connect (G_OBJECT (window3), "delete_event",
G_CALLBACK (on_signals_delete_event),sg);
g_signal_connect (G_OBJECT (window3), "key-press-event",
G_CALLBACK (on_signals_key_press_event), sg);
sg->widgets.window = window3;
sg->widgets.treeview = tv;
......@@ -421,7 +423,7 @@ signals_show (Signals * sg)
}
else
{
gtk_widget_set_uposition (sg->widgets.window, sg->win_pos_x,
gdk_window_move (sg->widgets.window->window, sg->win_pos_x,
sg->win_pos_y);
gtk_window_set_default_size (GTK_WINDOW (sg->widgets.window),
sg->win_width, sg->win_height);
......@@ -444,7 +446,7 @@ signals_hide (Signals * sg)
return;
gdk_window_get_root_origin (sg->widgets.window->window, &sg->win_pos_x,
&sg->win_pos_y);
gdk_window_get_size (sg->widgets.window->window, &sg->win_width,
gdk_drawable_get_size (sg->widgets.window->window, &sg->win_width,
&sg->win_height);
gtk_widget_hide (sg->widgets.window);
sg->is_showing = FALSE;
......
......@@ -27,7 +27,8 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
/*#define DEBUG*/
......
......@@ -44,7 +44,8 @@
#include <glade/glade-xml.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
#include <ctype.h>
......@@ -1273,7 +1274,7 @@ add_source_show (DmaStart *this)
gtk_tree_view_append_column (dlg.tree, column);
gtk_tree_view_set_expander_column(dlg.tree, column);
dlg.model = gtk_list_store_new (1, GTK_TYPE_STRING);
dlg.model = gtk_list_store_new (1, G_TYPE_STRING);
gtk_tree_view_set_model (dlg.tree, GTK_TREE_MODEL (dlg.model));
gtk_window_set_transient_for (GTK_WINDOW (widget), parent);
......
......@@ -25,6 +25,7 @@
#include "queue.h"
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
......
......@@ -26,6 +26,7 @@
#include "utilities.h"
/*#define DEBUG*/
#include <glib/gi18n.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-editor-selection.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
......
......@@ -236,8 +236,8 @@ anjuta_bookmarks_init (AnjutaBookmarks *bookmarks)
g_signal_connect (G_OBJECT(priv->button_remove), "clicked", G_CALLBACK(on_remove_clicked), bookmarks);
gtk_widget_set_sensitive (GTK_WIDGET(priv->button_add), FALSE);
gtk_widget_set_sensitive (GTK_WIDGET(priv->button_remove), FALSE);
gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_add);
gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_remove);
gtk_box_pack_start (GTK_BOX(button_box), priv->button_add, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(button_box), priv->button_remove, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(priv->window),
button_box,
......
......@@ -29,6 +29,7 @@
#include <libanjuta/interfaces/ianjuta-editor.h>
#include <libanjuta/interfaces/ianjuta-editor-factory.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include "anjuta-docman.h"
......
......@@ -1708,7 +1708,7 @@ activate_plugin (AnjutaPlugin *plugin)
dplugin->uiid = anjuta_ui_merge (ui, UI_FILE);
dplugin->vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (dplugin->vbox);
gtk_box_pack_start_defaults (GTK_BOX(dplugin->vbox), docman);
gtk_box_pack_start (GTK_BOX(dplugin->vbox), docman, TRUE, TRUE, 0);
anjuta_shell_add_widget_full (plugin->shell, dplugin->vbox,
"AnjutaDocumentManager", _("Documents"),
"editor-plugin-icon",
......
......@@ -25,6 +25,7 @@
#include <glib/gi18n.h>
#include "search-box.h"
#include <stdlib.h>
#include <gtk/gtk.h>
#include <libanjuta/anjuta-shell.h>
......
......@@ -30,7 +30,9 @@
#endif
#include <stdarg.h>
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gdk/gdk.h>
#include "dnd.h"
......
......@@ -23,7 +23,9 @@
* USA.
*/
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gdk/gdk.h>
#ifndef _DND_H_
#define _DND_H_
......
......@@ -20,6 +20,8 @@
#include <config.h>
#include <stdlib.h>
#include <unistd.h>
#include <glib/gi18n.h>
#include <libanjuta/anjuta-shell.h>
......@@ -190,19 +192,29 @@ get_available_plugins_for_mime (AnjutaPlugin* plugin,
return plugin_descs;
}
static gboolean
RowSeparatorFunc (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
{
int n = GPOINTER_TO_INT(data), k;
gchar *path = gtk_tree_model_get_string_from_iter (model, iter);
sscanf (path, "%d", &k);
g_free (path);
return n == k;
}
static void
open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
const gchar *mime_type)
{
GList *plugin_descs, *snode;
GList *mime_apps, *node;
GtkWidget *menu, *menuitem;
GAppInfo *mime_app;
GtkWidget *dialog, *parent, *hbox, *label;
GtkWidget *options;
gchar *message;
gchar *basename;
gint col = -1;
AnjutaPluginManager *plugin_manager;
plugin_manager = anjuta_shell_get_plugin_manager (ANJUTA_PLUGIN (plugin)->shell,
......@@ -232,15 +244,13 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox), hbox,
FALSE, FALSE, 5);
label = gtk_label_new (_("Open with:"));
options = gtk_option_menu_new ();
options = gtk_combo_box_new_text ();
gtk_box_pack_end (GTK_BOX(hbox), options, FALSE, FALSE, 10);
gtk_box_pack_end (GTK_BOX(hbox), label, FALSE, FALSE, 10);
menu = gtk_menu_new ();
/* Document manager plugin */
menuitem = gtk_menu_item_new_with_label (_("Document Manager"));
gtk_menu_append (menu, menuitem);
gtk_combo_box_append_text (GTK_COMBO_BOX (options), _("Document Manager"));
col ++;
/* Open with plugins menu items */
plugin_descs = get_available_plugins_for_mime (ANJUTA_PLUGIN (plugin), mime_type);
......@@ -267,8 +277,8 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
anjuta_plugin_description_get_string (desc, "Anjuta Plugin",
"Location", &name);
}
menuitem = gtk_menu_item_new_with_label (name);
gtk_menu_append (menu, menuitem);
gtk_combo_box_append_text (GTK_COMBO_BOX (options), name);
col ++;
g_free (name);
snode = g_list_next (snode);
}
......@@ -278,8 +288,9 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
if (mime_apps)
{
/* Separator */
menuitem = gtk_menu_item_new ();
gtk_menu_append (menu, menuitem);
col++;
gtk_combo_box_append_text (GTK_COMBO_BOX (options), "");
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (options), RowSeparatorFunc, GINT_TO_POINTER(col), NULL);
}
node = mime_apps;
while (node)
......@@ -287,21 +298,18 @@ open_with_dialog (AnjutaFileLoaderPlugin *plugin, const gchar *uri,
mime_app = (GAppInfo *)(node->data);
if (g_app_info_should_show (mime_app))
{
menuitem = gtk_menu_item_new_with_label (
g_app_info_get_name (mime_app));
gtk_menu_append (menu, menuitem);
gtk_combo_box_append_text (GTK_COMBO_BOX (options), g_app_info_get_name (mime_app));
}
node = g_list_next (node);
}
gtk_option_menu_set_menu (GTK_OPTION_MENU (options), menu);
gtk_combo_box_set_active (GTK_COMBO_BOX (options), 0);
gtk_widget_show_all (hbox);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
gint option;
option = gtk_option_menu_get_history(GTK_OPTION_MENU (options));
option = gtk_combo_box_get_active(GTK_COMBO_BOX (options));
if (option == 0)
{
IAnjutaDocumentManager *docman;
......@@ -935,7 +943,7 @@ create_open_with_submenu (AnjutaFileLoaderPlugin *plugin, GtkWidget *parentmenu,
g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (callback), callback_data);
gtk_menu_append (menu, menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_free (name);
}
g_list_free (plugin_descs);
......@@ -945,7 +953,7 @@ create_open_with_submenu (AnjutaFileLoaderPlugin *plugin, GtkWidget *parentmenu,
if (plugin_descs && mime_apps)
{
menuitem = gtk_menu_item_new ();
gtk_menu_append (menu, menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
for (node = mime_apps; node != NULL; node = g_list_next (node))
......@@ -960,7 +968,7 @@ create_open_with_submenu (AnjutaFileLoaderPlugin *plugin, GtkWidget *parentmenu,
g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (callback), callback_data);
gtk_menu_append (menu, menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
else
{
......
......@@ -105,10 +105,10 @@ The extension will be added according to the type.</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="new.file.type">
<widget class="GtkComboBox" id="new.file.type">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="items" translatable="no"></property>
<signal name="changed" handler="on_new_file_type_changed"/>
</widget>