[gnome-builder/wip/libide] libide: track recent upstream changes in gtksourceview



commit ac8afea5ece02073805ddf3d4797a8c9021b63d9
Author: Christian Hergert <christian hergert me>
Date:   Wed Mar 11 13:19:55 2015 -0700

    libide: track recent upstream changes in gtksourceview
    
    We have just slight variants of how things work on these (mostly due to
    where we want to place the cursor afterwards). Some of them might actually
    be the same, but I don't want to make that call until I have the time to
    sit down and be sure.
    
    So for now, just override the class closure.

 build/autotools/autoconf.d/50_dependencies.post-am |    2 +-
 libide/ide-source-view.c                           |   29 ++++---------------
 libide/ide-source-view.h                           |    3 --
 3 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/build/autotools/autoconf.d/50_dependencies.post-am 
b/build/autotools/autoconf.d/50_dependencies.post-am
index 9ffabdf..6efe3b7 100644
--- a/build/autotools/autoconf.d/50_dependencies.post-am
+++ b/build/autotools/autoconf.d/50_dependencies.post-am
@@ -1,6 +1,6 @@
 m4_define([gtk_required_version], [3.15.6])
 m4_define([glib_required_version], [2.43.90])
-m4_define([gtksourceview_required_version], [3.15.4])
+m4_define([gtksourceview_required_version], [3.15.92])
 m4_define([ggit_required_version], [0.0.24])
 m4_define([gjs_required_version], [1.42.0])
 m4_define([pygobject_required_version], [3.0.0])
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index 40e3527..f406162 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -154,7 +154,6 @@ enum {
   APPEND_TO_COUNT,
   AUTO_INDENT,
   CAPTURE_MODIFIER,
-  CHANGE_CASE,
   CLEAR_COUNT,
   CLEAR_MODIFIER,
   CLEAR_SELECTION,
@@ -164,7 +163,6 @@ enum {
   INDENT_SELECTION,
   INSERT_AT_CURSOR_AND_INDENT,
   INSERT_MODIFIER,
-  JOIN_LINES,
   JUMP,
   MOVEMENT,
   PASTE_CLIPBOARD_EXTENDED,
@@ -3313,7 +3311,6 @@ ide_source_view_class_init (IdeSourceViewClass *klass)
   klass->append_to_count = ide_source_view_real_append_to_count;
   klass->auto_indent = ide_source_view_real_auto_indent;
   klass->capture_modifier = ide_source_view_real_capture_modifier;
-  klass->change_case = ide_source_view_real_change_case;
   klass->clear_count = ide_source_view_real_clear_count;
   klass->clear_modifier = ide_source_view_real_clear_modifier;
   klass->clear_snippets = ide_source_view_clear_snippets;
@@ -3323,7 +3320,6 @@ ide_source_view_class_init (IdeSourceViewClass *klass)
   klass->indent_selection = ide_source_view_real_indent_selection;
   klass->insert_at_cursor_and_indent = ide_source_view_real_insert_at_cursor_and_indent;
   klass->insert_modifier = ide_source_view_real_insert_modifier;
-  klass->join_lines = ide_source_view_real_join_lines;
   klass->jump = ide_source_view_real_jump;
   klass->movement = ide_source_view_real_movement;
   klass->paste_clipboard_extended = ide_source_view_real_paste_clipboard_extended;
@@ -3487,16 +3483,9 @@ ide_source_view_class_init (IdeSourceViewClass *klass)
                   G_TYPE_NONE,
                   0);
 
-  gSignals [CHANGE_CASE] =
-    g_signal_new ("change-case",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  G_STRUCT_OFFSET (IdeSourceViewClass, change_case),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__ENUM,
-                  G_TYPE_NONE,
-                  1,
-                  GTK_SOURCE_TYPE_CHANGE_CASE_TYPE);
+  g_signal_override_class_handler ("change-case",
+                                   G_TYPE_FROM_CLASS (klass),
+                                   G_CALLBACK (ide_source_view_real_change_case));
 
   gSignals [CLEAR_COUNT] =
     g_signal_new ("clear-count",
@@ -3601,15 +3590,9 @@ ide_source_view_class_init (IdeSourceViewClass *klass)
                   1,
                   G_TYPE_BOOLEAN);
 
-  gSignals [JOIN_LINES] =
-    g_signal_new ("join-lines",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  G_STRUCT_OFFSET (IdeSourceViewClass, join_lines),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE,
-                  0);
+  g_signal_override_class_handler ("join-lines",
+                                   G_TYPE_FROM_CLASS (klass),
+                                   G_CALLBACK (ide_source_view_real_join_lines));
 
   gSignals [JUMP] =
     g_signal_new ("jump",
diff --git a/libide/ide-source-view.h b/libide/ide-source-view.h
index b55c2a2..22d6fd0 100644
--- a/libide/ide-source-view.h
+++ b/libide/ide-source-view.h
@@ -210,8 +210,6 @@ struct _IdeSourceViewClass
                                        gint                     digit);
   void (*auto_indent)                 (IdeSourceView           *self);
   void (*capture_modifier)            (IdeSourceView           *self);
-  void (*change_case)                 (IdeSourceView           *self,
-                                       GtkSourceChangeCaseType  type);
   void (*clear_count)                 (IdeSourceView           *self);
   void (*clear_modifier)              (IdeSourceView           *self);
   void (*clear_selection)             (IdeSourceView           *self);
@@ -230,7 +228,6 @@ struct _IdeSourceViewClass
                                        gboolean                 apply_count);
   void (*insert_modifier)             (IdeSourceView           *self,
                                        gboolean                 use_count);
-  void (*join_lines)                  (IdeSourceView           *self);
   void (*jump)                        (IdeSourceView           *self,
                                        const GtkTextIter       *location);
   void (*paste_clipboard_extended)    (IdeSourceView           *self,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]