[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. debian/1.0.0-1-10-g3982131
Antonio Terceiro
terceiro at debian.org
Sun Nov 6 15:32:24 UTC 2011
The following commit has been merged in the master branch:
commit 9c549391236d47ac6bec3e005405496e75354e64
Author: Antonio Terceiro <terceiro at debian.org>
Date: Tue Nov 1 18:47:24 2011 -0200
Drop Debian-only patch that was breaking stuff (Closes: #639398)
This patch was written by Philipp Kern for #383309, but it is causing
problems. I talked with him on IRC and he agreed to drop the patch.
Since the patch never made it to upstream, I assume no one is rellying
on it anyway.
This reverts commit 976607998118e4efd3e7c2e6ee5e457ebf36dd8a.
diff --git a/gtk2/ext/gtk2/rbgtkliststore.c b/gtk2/ext/gtk2/rbgtkliststore.c
index 7554c64..97ab40a 100644
--- a/gtk2/ext/gtk2/rbgtkliststore.c
+++ b/gtk2/ext/gtk2/rbgtkliststore.c
@@ -11,8 +11,6 @@
#include "global.h"
-#include "rbgtktreedrag.h"
-
#define _SELF(s) (GTK_LIST_STORE(RVAL2GOBJ(s)))
static ID id_to_a, id_size;
@@ -31,8 +29,7 @@ lstore_initialize(int argc, VALUE *argv, VALUE self)
buf[cnt] = CLASS2GTYPE(argv[cnt]);
}
- store = GTK_LIST_STORE(g_object_new(RB_TYPE_DND_LIST_STORE, NULL));
- gtk_list_store_set_column_types(store, argc, buf);
+ store = gtk_list_store_newv(argc, buf);
G_INITIALIZE(self, store);
@@ -363,12 +360,12 @@ lstore_move_after(VALUE self, VALUE iter, VALUE position)
void
Init_gtk_list_store()
{
- VALUE ls = G_DEF_CLASS(RB_TYPE_DND_LIST_STORE, "ListStore", mGtk);
+ VALUE ls = G_DEF_CLASS(GTK_TYPE_LIST_STORE, "ListStore", mGtk);
id_to_a = rb_intern("to_a");
id_size = rb_intern("size");
- rbgtk_register_treeiter_set_value_func(RB_TYPE_DND_LIST_STORE,
+ rbgtk_register_treeiter_set_value_func(GTK_TYPE_LIST_STORE,
(rbgtkiter_set_value_func)>k_list_store_set_value);
rb_define_method(ls, "initialize", lstore_initialize, -1);
rb_define_method(ls, "set_column_types", lstore_set_column_types, -1);
diff --git a/gtk2/ext/gtk2/rbgtktreedrag.c b/gtk2/ext/gtk2/rbgtktreedrag.c
deleted file mode 100644
index 4270741..0000000
--- a/gtk2/ext/gtk2/rbgtktreedrag.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
- rbgtktreedrag.c -
-
- $Author: ck $
- $Date: 2006/08/16 02:06:00 $
-
- Copyright (C) 2006 Armin Burgmeier
-************************************************/
-
-#include "global.h"
-#include "rbgtktreedrag.h"
-
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed(v)
-#define g_marshal_value_peek_object(v) g_value_get_object(v)
-
-static void
-_rb_marshal_BOOLEAN__BOXED(GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__BOXED callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__BOXED) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_boxed (param_values + 1),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-static void
-_rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED(GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_boxed (param_values + 1),
- g_marshal_value_peek_object (param_values + 2),
- g_marshal_value_peek_boxed (param_values + 3),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-static void
-rb_dnd_tree_drag_class_init(GType type)
-{
- g_signal_new("row-draggable",
- type,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- _rb_marshal_BOOLEAN__BOXED,
- G_TYPE_BOOLEAN, 1,
- GTK_TYPE_TREE_PATH);
-
- g_signal_new("row-drop-possible",
- type,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- _rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED,
- G_TYPE_BOOLEAN, 3,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_MODEL,
- GTK_TYPE_TREE_PATH);
-}
-
-static gboolean
-rb_dnd_tree_drag_row_draggable(GtkTreeDragSource *drag_source,
- GtkTreePath *path)
-{
- gboolean retval;
- g_assert(G_TYPE_FROM_INSTANCE(drag_source) == RB_TYPE_DND_TREE_STORE ||
- G_TYPE_FROM_INSTANCE(drag_source) == RB_TYPE_DND_LIST_STORE);
-
- guint signal_id = g_signal_lookup("row-draggable", G_TYPE_FROM_INSTANCE(drag_source));
-
- if(g_signal_has_handler_pending(drag_source, signal_id, 0, FALSE))
- g_signal_emit(drag_source, signal_id, 0, path, &retval);
- else
- retval = TRUE; /* default value */
-
- return retval;
-}
-
-static gboolean
-rb_dnd_tree_drag_row_drop_possible(GtkTreeDragDest* drag_dest,
- GtkTreePath* dest_path,
- GtkSelectionData* selection_data)
-{
- gboolean retval;
-
- g_assert(G_TYPE_FROM_INSTANCE(drag_dest) == RB_TYPE_DND_TREE_STORE ||
- G_TYPE_FROM_INSTANCE(drag_dest) == RB_TYPE_DND_LIST_STORE);
-
- guint signal_id = g_signal_lookup("row-drop-possible", G_TYPE_FROM_INSTANCE(drag_dest));
-
- GtkTreeModel* source_model = NULL;
- GtkTreePath* source_path = NULL;
- /* The selection_data must be of type GTK_TREE_MODEL_ROW, otherwise
- the get function returns false and the out values are hopefully left
- as-is. */
- gtk_tree_get_row_drag_data(selection_data, &source_model, &source_path);
-
- if(g_signal_has_handler_pending(drag_dest, signal_id, 0, FALSE))
- g_signal_emit(drag_dest, signal_id, 0, dest_path, source_model, source_path, &retval);
- else
- retval = TRUE; /* default value */
-
- if(source_path)
- gtk_tree_path_free(source_path);
- return retval;
-}
-
-static void
-rb_dnd_tree_store_init(RbDndTreeStore* store)
-{
- GTK_TREE_DRAG_SOURCE_GET_IFACE(store)->row_draggable = rb_dnd_tree_drag_row_draggable;
- GTK_TREE_DRAG_DEST_GET_IFACE(store)->row_drop_possible = rb_dnd_tree_drag_row_drop_possible;
-}
-
-static void
-rb_dnd_list_store_init(RbDndListStore* store)
-{
- GTK_TREE_DRAG_SOURCE_GET_IFACE(store)->row_draggable = rb_dnd_tree_drag_row_draggable;
- GTK_TREE_DRAG_DEST_GET_IFACE(store)->row_drop_possible = rb_dnd_tree_drag_row_drop_possible;
-}
-
-static void
-rb_dnd_tree_store_class_init(RbDndTreeStoreClass* klass)
-{
- rb_dnd_tree_drag_class_init(G_TYPE_FROM_CLASS(klass));
-}
-
-static void
-rb_dnd_list_store_class_init(RbDndListStoreClass* klass)
-{
- rb_dnd_tree_drag_class_init(G_TYPE_FROM_CLASS(klass));
-}
-
-G_DEFINE_TYPE(RbDndTreeStore, rb_dnd_tree_store, GTK_TYPE_TREE_STORE)
-G_DEFINE_TYPE(RbDndListStore, rb_dnd_list_store, GTK_TYPE_LIST_STORE)
diff --git a/gtk2/ext/gtk2/rbgtktreedrag.h b/gtk2/ext/gtk2/rbgtktreedrag.h
deleted file mode 100644
index 0cd47e6..0000000
--- a/gtk2/ext/gtk2/rbgtktreedrag.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
- rbgtktreedrag.h -
-
- $Author: ck $
- $Date: 2006/08/16 02:24:00 $
-
- Copyright (C) 2006 Armin Burgmeier
-************************************************/
-
-#ifndef __RBGTKTREEDRAG_H__
-#define __RBGTKTREEDRAG_H__
-
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkliststore.h>
-
-#define RB_TYPE_DND_TREE_STORE (rb_dnd_tree_store_get_type())
-#define RB_TYPE_DND_LIST_STORE (rb_dnd_list_store_get_type())
-
-typedef struct _RbDndTreeStore RbDndTreeStore;
-typedef struct _RbDndListStore RbDndListStore;
-
-typedef struct _RbDndTreeStoreClass RbDndTreeStoreClass;
-typedef struct _RbDndListStoreClass RbDndListStoreClass;
-
-struct _RbDndTreeStore {
- GtkTreeStore parent;
-};
-
-struct _RbDndTreeStoreClass {
- GtkTreeStoreClass parent_class;
-};
-
-struct _RbDndListStore {
- GtkListStore parent;
-};
-
-struct _RbDndListStoreClass {
- GtkListStoreClass parent_class;
-};
-
-GType
-rb_dnd_tree_store_get_type(void) G_GNUC_CONST;
-
-GType
-rb_dnd_list_store_get_type(void) G_GNUC_CONST;
-
-#endif /* __RBGTKTREEDRAG_H__ */
diff --git a/gtk2/ext/gtk2/rbgtktreestore.c b/gtk2/ext/gtk2/rbgtktreestore.c
index bef520a..3a25f50 100644
--- a/gtk2/ext/gtk2/rbgtktreestore.c
+++ b/gtk2/ext/gtk2/rbgtktreestore.c
@@ -11,8 +11,6 @@
#include "global.h"
-#include "rbgtktreedrag.h"
-
#define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s)))
static VALUE
@@ -29,8 +27,7 @@ tstore_initialize(int argc, VALUE *argv, VALUE self)
buf[cnt] = CLASS2GTYPE(argv[cnt]);
}
- store = GTK_TREE_STORE(g_object_new(RB_TYPE_DND_TREE_STORE, NULL));
- gtk_tree_store_set_column_types(store, argc, buf);
+ store = gtk_tree_store_newv(argc, buf);
G_INITIALIZE(self, store);
@@ -329,9 +326,9 @@ tstore_move_after(VALUE self, VALUE iter, VALUE position)
void
Init_gtk_tree_store()
{
- VALUE ts = G_DEF_CLASS(RB_TYPE_DND_TREE_STORE, "TreeStore", mGtk);
+ VALUE ts = G_DEF_CLASS(GTK_TYPE_TREE_STORE, "TreeStore", mGtk);
- rbgtk_register_treeiter_set_value_func(RB_TYPE_DND_TREE_STORE,
+ rbgtk_register_treeiter_set_value_func(GTK_TYPE_TREE_STORE,
(rbgtkiter_set_value_func)>k_tree_store_set_value);
rb_define_method(ts, "initialize", tstore_initialize, -1);
--
ruby-gnome2.git
More information about the Pkg-ruby-extras-commits
mailing list