[Xfce4-commits] r30088 - terminal/trunk/terminal
Nick Schermer
nick at xfce.org
Sat Jun 27 21:26:39 CEST 2009
Author: nick
Date: 2009-06-27 19:26:39 +0000 (Sat, 27 Jun 2009)
New Revision: 30088
Modified:
terminal/trunk/terminal/terminal-accel-map.c
terminal/trunk/terminal/terminal-app.c
terminal/trunk/terminal/terminal-image-loader.c
terminal/trunk/terminal/terminal-monitor.c
terminal/trunk/terminal/terminal-preferences-dialog.c
terminal/trunk/terminal/terminal-preferences.c
terminal/trunk/terminal/terminal-shortcut-editor.c
terminal/trunk/terminal/terminal-tab-header.c
terminal/trunk/terminal/terminal-toolbars-model.c
terminal/trunk/terminal/terminal-toolbars-view.c
terminal/trunk/terminal/terminal-widget.c
terminal/trunk/terminal/terminal-window.c
Log:
Fix a whole bunch of compiler warnings.
Modified: terminal/trunk/terminal/terminal-accel-map.c
===================================================================
--- terminal/trunk/terminal/terminal-accel-map.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-accel-map.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -29,8 +29,6 @@
-static void terminal_accel_map_class_init (TerminalAccelMapClass *klass);
-static void terminal_accel_map_init (TerminalAccelMap *map);
static void terminal_accel_map_finalize (GObject *object);
static void terminal_accel_map_notify (TerminalPreferences *preferences,
GParamSpec *pspec,
@@ -46,7 +44,7 @@
-G_DEFINE_TYPE (TerminalAccelMap, terminal_accel_map, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TerminalAccelMap, terminal_accel_map, G_TYPE_OBJECT)
Modified: terminal/trunk/terminal/terminal-app.c
===================================================================
--- terminal/trunk/terminal/terminal-app.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-app.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -46,8 +46,6 @@
-static void terminal_app_class_init (TerminalAppClass *klass);
-static void terminal_app_init (TerminalApp *app);
static void terminal_app_finalize (GObject *object);
static void terminal_app_update_accels (TerminalApp *app);
static GtkWidget *terminal_app_create_window (TerminalApp *app,
@@ -100,7 +98,7 @@
-G_DEFINE_TYPE (TerminalApp, terminal_app, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TerminalApp, terminal_app, G_TYPE_OBJECT)
Modified: terminal/trunk/terminal/terminal-image-loader.c
===================================================================
--- terminal/trunk/terminal/terminal-image-loader.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-image-loader.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -29,8 +29,6 @@
-static void terminal_image_loader_class_init (TerminalImageLoaderClass *klass);
-static void terminal_image_loader_init (TerminalImageLoader *loader);
static void terminal_image_loader_finalize (GObject *object);
static void terminal_image_loader_check (TerminalImageLoader *loader);
static void terminal_image_loader_pixbuf_destroyed (gpointer data,
@@ -56,7 +54,7 @@
-G_DEFINE_TYPE (TerminalImageLoader, terminal_image_loader, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TerminalImageLoader, terminal_image_loader, G_TYPE_OBJECT)
Modified: terminal/trunk/terminal/terminal-monitor.c
===================================================================
--- terminal/trunk/terminal/terminal-monitor.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-monitor.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -37,7 +37,6 @@
-static void terminal_monitor_class_init (TerminalMonitorClass *klass);
static void terminal_monitor_finalize (GObject *object);
static gboolean terminal_monitor_idle (gpointer user_data);
static void terminal_monitor_idle_destroy (gpointer user_data);
@@ -74,7 +73,7 @@
-static GObjectClass *terminal_monitor_parent_class;
+G_DEFINE_TYPE (TerminalMonitor, terminal_monitor, G_TYPE_OBJECT)
@@ -116,37 +115,6 @@
-GType
-terminal_monitor_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- static const GTypeInfo info =
- {
- sizeof (TerminalMonitorClass),
- NULL,
- NULL,
- (GClassInitFunc) terminal_monitor_class_init,
- NULL,
- NULL,
- sizeof (TerminalMonitor),
- 0,
- NULL,
- NULL
- };
-
- type = g_type_register_static (G_TYPE_OBJECT,
- "TerminalMonitor",
- &info, 0);
- }
-
- return type;
-}
-
-
-
static void
terminal_monitor_class_init (TerminalMonitorClass *klass)
{
@@ -161,6 +129,13 @@
static void
+terminal_monitor_init (TerminalMonitor *monitor)
+{
+}
+
+
+
+static void
terminal_monitor_finalize (GObject *object)
{
TerminalMonitor *monitor = TERMINAL_MONITOR (object);
Modified: terminal/trunk/terminal/terminal-preferences-dialog.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences-dialog.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-preferences-dialog.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -43,8 +43,6 @@
-static void terminal_preferences_dialog_class_init (TerminalPreferencesDialogClass *klass);
-static void terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog);
static void terminal_preferences_dialog_finalize (GObject *object);
static void terminal_preferences_dialog_response (TerminalPreferencesDialog *dialog,
gint response);
@@ -55,7 +53,7 @@
-G_DEFINE_TYPE (TerminalPreferencesDialog, terminal_preferences_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (TerminalPreferencesDialog, terminal_preferences_dialog, GTK_TYPE_DIALOG)
@@ -123,7 +121,7 @@
AtkObject *object;
GSList *group;
gchar *name;
- gint index;
+ gint idx;
gint n;
dialog->preferences = terminal_preferences_get ();
@@ -177,7 +175,7 @@
*/
box = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
- index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+ idx = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
gtk_widget_show (box);
frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -233,9 +231,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Goes after initial title"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Isn't displayed"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "title-mode", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_widget_show (combo);
@@ -330,9 +325,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("On the left side"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("On the right side"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "scrolling-bar", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_widget_show (combo);
@@ -367,7 +359,7 @@
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, icon,
TEXT_COLUMN, _("General"),
- INDEX_COLUMN, index,
+ INDEX_COLUMN, idx,
-1);
g_object_unref (G_OBJECT (icon));
@@ -377,7 +369,7 @@
*/
box = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
- index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+ idx = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
gtk_widget_show (box);
frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -434,9 +426,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Background image"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Transparent background"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "background-mode", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 0);
gtk_widget_show (combo);
@@ -485,9 +474,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Scaled"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Stretched"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "background-image-style", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_widget_show (combo);
@@ -572,7 +558,7 @@
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, icon,
TEXT_COLUMN, _("Appearance"),
- INDEX_COLUMN, index,
+ INDEX_COLUMN, idx,
-1);
g_object_unref (icon);
@@ -582,7 +568,7 @@
*/
box = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
- index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+ idx = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
gtk_widget_show (box);
frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -691,7 +677,6 @@
gtk_widget_show (table);
button = gtk_radio_button_new_with_mnemonic (NULL, _("Use _default color"));
- g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (g_object_notify), "active");
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "color-selection-use-default", G_OBJECT (button), "active");
terminal_gtk_widget_set_tooltip (button, _("Use the default text selection background color"));
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
@@ -699,7 +684,6 @@
gtk_widget_show (button);
button = gtk_radio_button_new_with_mnemonic (group, _("Use _custom color"));
- g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (g_object_notify), "active");
exo_mutual_binding_new_with_negation (G_OBJECT (dialog->preferences), "color-selection-use-default", G_OBJECT (button), "active");
terminal_gtk_widget_set_tooltip (button, _("Use a custom text selection background color"));
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
@@ -822,7 +806,7 @@
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, icon,
TEXT_COLUMN, _("Colors"),
- INDEX_COLUMN, index,
+ INDEX_COLUMN, idx,
-1);
g_object_unref (G_OBJECT (icon));
@@ -832,7 +816,7 @@
*/
box = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
- index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+ idx = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
gtk_widget_show (box);
frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -892,7 +876,7 @@
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, icon,
TEXT_COLUMN, _("Shortcuts"),
- INDEX_COLUMN, index,
+ INDEX_COLUMN, idx,
-1);
g_object_unref (icon);
@@ -902,7 +886,7 @@
*/
box = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
- index = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
+ idx = gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), box, NULL);
gtk_widget_show (box);
frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
@@ -939,9 +923,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Escape sequence"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Control-H"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "binding-backspace", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_widget_show (combo);
@@ -960,9 +941,6 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Escape sequence"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Control-H"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "binding-delete", G_OBJECT (combo), "active");
-#if !GTK_CHECK_VERSION(2,9,0)
- g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
-#endif
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_widget_show (combo);
@@ -1076,7 +1054,7 @@
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, icon,
TEXT_COLUMN, _("Advanced"),
- INDEX_COLUMN, index,
+ INDEX_COLUMN, idx,
-1);
g_object_unref (icon);
Modified: terminal/trunk/terminal/terminal-preferences.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-preferences.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -258,7 +258,7 @@
-G_DEFINE_TYPE (TerminalPreferences, terminal_preferences, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TerminalPreferences, terminal_preferences, G_TYPE_OBJECT)
Modified: terminal/trunk/terminal/terminal-shortcut-editor.c
===================================================================
--- terminal/trunk/terminal/terminal-shortcut-editor.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-shortcut-editor.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -53,8 +53,6 @@
-static void terminal_shortcut_editor_class_init (TerminalShortcutEditorClass *klass);
-static void terminal_shortcut_editor_init (TerminalShortcutEditor *editor);
static void terminal_shortcut_editor_finalize (GObject *object);
static void terminal_shortcut_editor_activate (TerminalShortcutEditor *editor,
GtkTreePath *path,
@@ -70,8 +68,8 @@
typedef struct
{
- gchar *title;
- gchar *accels[32];
+ const gchar *title;
+ const gchar *accels[32];
} ToplevelMenu;
@@ -154,7 +152,7 @@
-G_DEFINE_TYPE (TerminalShortcutEditor, terminal_shortcut_editor, GTK_TYPE_TREE_VIEW);
+G_DEFINE_TYPE (TerminalShortcutEditor, terminal_shortcut_editor, GTK_TYPE_TREE_VIEW)
@@ -179,7 +177,7 @@
GtkTreeIter parent;
GtkTreeIter child;
GParamSpec *pspec;
- gchar *signal;
+ gchar *notify_signal;
gchar *accel;
gint n;
@@ -198,10 +196,10 @@
{
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (editor->preferences), menu->accels[n]);
- signal = g_strconcat ("notify::", menu->accels[n], NULL);
- g_signal_connect (G_OBJECT (editor->preferences), signal,
+ notify_signal = g_strconcat ("notify::", menu->accels[n], NULL);
+ g_signal_connect (G_OBJECT (editor->preferences), notify_signal,
G_CALLBACK (terminal_shortcut_editor_notify), editor);
- g_free (signal);
+ g_free (notify_signal);
g_object_get (G_OBJECT (editor->preferences), pspec->name, &accel, NULL);
Modified: terminal/trunk/terminal/terminal-tab-header.c
===================================================================
--- terminal/trunk/terminal/terminal-tab-header.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-tab-header.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -49,8 +49,6 @@
-static void terminal_tab_header_class_init (TerminalTabHeaderClass *klass);
-static void terminal_tab_header_init (TerminalTabHeader *header);
static void terminal_tab_header_finalize (GObject *object);
static void terminal_tab_header_get_property (GObject *object,
guint prop_id,
@@ -86,7 +84,7 @@
-G_DEFINE_TYPE (TerminalTabHeader, terminal_tab_header, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (TerminalTabHeader, terminal_tab_header, GTK_TYPE_HBOX)
Modified: terminal/trunk/terminal/terminal-toolbars-model.c
===================================================================
--- terminal/trunk/terminal/terminal-toolbars-model.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-toolbars-model.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -30,8 +30,6 @@
-static void terminal_toolbars_model_class_init (TerminalToolbarsModelClass *klass);
-static void terminal_toolbars_model_init (TerminalToolbarsModel *model);
static void terminal_toolbars_model_finalize (GObject *object);
static void terminal_toolbars_model_queue_sync (TerminalToolbarsModel *model);
static gboolean terminal_toolbars_model_sync (TerminalToolbarsModel *model);
@@ -62,7 +60,7 @@
-G_DEFINE_TYPE (TerminalToolbarsModel, terminal_toolbars_model, EXO_TYPE_TOOLBARS_MODEL);
+G_DEFINE_TYPE (TerminalToolbarsModel, terminal_toolbars_model, EXO_TYPE_TOOLBARS_MODEL)
Modified: terminal/trunk/terminal/terminal-toolbars-view.c
===================================================================
--- terminal/trunk/terminal/terminal-toolbars-view.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-toolbars-view.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -29,15 +29,13 @@
-static void terminal_toolbars_view_class_init (TerminalToolbarsViewClass *klass);
-static void terminal_toolbars_view_init (TerminalToolbarsView *toolbar);
static void terminal_toolbars_view_finalize (GObject *object);
static void terminal_toolbars_view_edit_done (ExoToolbarsEditorDialog *dialog,
TerminalToolbarsView *toolbar);
-G_DEFINE_TYPE (TerminalToolbarsView, terminal_toolbars_view, EXO_TYPE_TOOLBARS_VIEW);
+G_DEFINE_TYPE (TerminalToolbarsView, terminal_toolbars_view, EXO_TYPE_TOOLBARS_VIEW)
Modified: terminal/trunk/terminal/terminal-widget.c
===================================================================
--- terminal/trunk/terminal/terminal-widget.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-widget.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -77,8 +77,6 @@
-static void terminal_widget_class_init (TerminalWidgetClass *klass);
-static void terminal_widget_init (TerminalWidget *widget);
static void terminal_widget_finalize (GObject *object);
static gboolean terminal_widget_button_press_event (GtkWidget *widget,
GdkEventButton *event);
@@ -125,20 +123,20 @@
static const GtkTargetEntry targets[] =
{
- { "text/uri-list", 0, TARGET_URI_LIST },
- { "text/x-moz-url", 0, TARGET_MOZ_URL },
- { "UTF8_STRING", 0, TARGET_UTF8_STRING },
- { "TEXT", 0, TARGET_TEXT },
- { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
- { "STRING", 0, TARGET_STRING },
- { "text/plain", 0, TARGET_TEXT_PLAIN },
- { "application/x-color", 0, TARGET_APPLICATION_X_COLOR },
- { "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, TARGET_GTK_NOTEBOOK_TAB },
+ { (gchar *) "text/uri-list", 0, TARGET_URI_LIST },
+ { (gchar *) "text/x-moz-url", 0, TARGET_MOZ_URL },
+ { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
+ { (gchar *) "TEXT", 0, TARGET_TEXT },
+ { (gchar *) "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
+ { (gchar *) "STRING", 0, TARGET_STRING },
+ { (gchar *) "text/plain", 0, TARGET_TEXT_PLAIN },
+ { (gchar *) "application/x-color", 0, TARGET_APPLICATION_X_COLOR },
+ { (gchar *) "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, TARGET_GTK_NOTEBOOK_TAB },
};
-G_DEFINE_TYPE (TerminalWidget, terminal_widget, VTE_TYPE_TERMINAL);
+G_DEFINE_TYPE (TerminalWidget, terminal_widget, VTE_TYPE_TERMINAL)
@@ -259,7 +257,7 @@
static void
terminal_widget_context_menu (TerminalWidget *widget,
gint button,
- gint time,
+ guint32 event_time,
gint x,
gint y)
{
@@ -327,8 +325,8 @@
g_object_ref (G_OBJECT (menu));
gtk_object_sink (GTK_OBJECT (menu));
- if (time < 0)
- time = gtk_get_current_event_time ();
+ if (event_time < 0)
+ event_time = gtk_get_current_event_time ();
loop = g_main_loop_new (NULL, FALSE);
@@ -340,7 +338,7 @@
/* run our custom main loop */
gtk_grab_add (menu);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, event_time);
g_main_loop_run (loop);
g_main_loop_unref (loop);
gtk_grab_remove (menu);
@@ -428,7 +426,7 @@
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time)
+ guint32 drag_time)
{
const guint16 *ucs;
GdkColor color;
@@ -574,7 +572,7 @@
if (G_LIKELY (screen))
{
g_signal_emit_by_name (G_OBJECT (screen), "drag-data-received", context,
- x, y, selection_data, info, time);
+ x, y, selection_data, info, drag_time);
}
break;
@@ -584,7 +582,7 @@
}
if (info != TARGET_GTK_NOTEBOOK_TAB)
- gtk_drag_finish (context, TRUE, FALSE, time);
+ gtk_drag_finish (context, TRUE, FALSE, drag_time);
}
Modified: terminal/trunk/terminal/terminal-window.c
===================================================================
--- terminal/trunk/terminal/terminal-window.c 2009-06-27 19:26:16 UTC (rev 30087)
+++ terminal/trunk/terminal/terminal-window.c 2009-06-27 19:26:39 UTC (rev 30088)
@@ -206,7 +206,7 @@
static guint window_signals[LAST_SIGNAL];
#if GTK_CHECK_VERSION (2,12,0)
-static gpointer window_notebook_group = "Terminal";
+static gconstpointer window_notebook_group = "Terminal";
#endif
@@ -250,7 +250,7 @@
-G_DEFINE_TYPE (TerminalWindow, terminal_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (TerminalWindow, terminal_window, GTK_TYPE_WINDOW)
@@ -398,7 +398,7 @@
/* set the notebook group id */
#if GTK_CHECK_VERSION (2,12,0)
- gtk_notebook_set_group (GTK_NOTEBOOK (window->notebook), window_notebook_group);
+ gtk_notebook_set_group (GTK_NOTEBOOK (window->notebook), (gpointer) window_notebook_group);
#else
gtk_notebook_set_group_id (GTK_NOTEBOOK (window->notebook), 1);
#endif
@@ -1069,7 +1069,7 @@
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time,
+ guint32 drag_time,
TerminalWindow *window)
{
GtkWidget *source_widget;
@@ -1119,7 +1119,7 @@
g_object_unref (G_OBJECT (*screen));
/* finish the drag */
- gtk_drag_finish (context, TRUE, TRUE, time);
+ gtk_drag_finish (context, TRUE, TRUE, drag_time);
}
}
More information about the Xfce4-commits
mailing list