[geany/geany-plugins] a36f16: scope: removed support gor gtk+ 2.16
Dimitar Zhekov
git-noreply at xxxxx
Fri Apr 24 17:11:19 UTC 2015
Branch: refs/heads/master
Author: Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer: Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date: Fri, 24 Apr 2015 17:11:19 UTC
Commit: a36f16d53a564b334725eb8c331c09defe36c3bd
https://github.com/geany/geany-plugins/commit/a36f16d53a564b334725eb8c331c09defe36c3bd
Log Message:
-----------
scope: removed support gor gtk+ 2.16
Modified Paths:
--------------
scope/ChangeLog
scope/data/scope.glade
scope/src/Makefile.am
scope/src/common.h
scope/src/gtk216.c
scope/src/gtk216.h
scope/src/scope.c
Modified: scope/ChangeLog
15 lines changed, 15 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,18 @@
+2015-04-24 Dimitar Zhekov <dimitar.zhekov at gmail.com>
+
+ * data/scope.glade, src/Makefile.am, src/common.h, src/scope.c:
+ Removed support for gtk+ 2.16.
+
+ * src/gtk216.c, src/gtk216.h:
+ Removed.
+
+
+2015-04-19 Dimitar Zhekov <dimitar.zhekov at gmail.com>
+
+ * README, src/store/scptreestore.c:
+ Removed support for gtk+ 2.16.
+
+
2014-06-12 Dimitar Zhekov <dimitar.zhekov at gmail.com>
* docs/scope.html:
Modified: scope/data/scope.glade
33 lines changed, 31 insertions(+), 2 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.18"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAdjustment" id="option_inspect_count_adjustment">
<property name="upper">99999</property>
@@ -1592,6 +1592,7 @@
<object class="GtkTreeViewColumn" id="thread_id_column">
<property name="resizable">True</property>
<property name="title">Id</property>
+ <property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererText" id="thread_id"/>
<attributes>
@@ -1604,6 +1605,7 @@
<object class="GtkTreeViewColumn" id="thread_pid_column">
<property name="resizable">True</property>
<property name="title">Pid</property>
+ <property name="sort_column_id">3</property>
<child>
<object class="GtkCellRendererText" id="thread_pid"/>
<attributes>
@@ -1616,6 +1618,7 @@
<object class="GtkTreeViewColumn" id="thread_group_id_column">
<property name="resizable">True</property>
<property name="title">Gid</property>
+ <property name="sort_column_id">4</property>
<child>
<object class="GtkCellRendererText" id="thread_group_id"/>
<attributes>
@@ -1628,6 +1631,7 @@
<object class="GtkTreeViewColumn" id="thread_state_column">
<property name="resizable">True</property>
<property name="title">State</property>
+ <property name="sort_column_id">5</property>
<child>
<object class="GtkCellRendererText" id="thread_state"/>
<attributes>
@@ -1641,6 +1645,7 @@
<property name="resizable">True</property>
<property name="title">File</property>
<property name="expand">True</property>
+ <property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="thread_base_name"/>
<attributes>
@@ -1666,6 +1671,7 @@
<property name="resizable">True</property>
<property name="title">Function</property>
<property name="expand">True</property>
+ <property name="sort_column_id">7</property>
<child>
<object class="GtkCellRendererText" id="thread_func"/>
<attributes>
@@ -1678,6 +1684,7 @@
<object class="GtkTreeViewColumn" id="thread_addr_column">
<property name="resizable">True</property>
<property name="title">Address</property>
+ <property name="sort_column_id">8</property>
<child>
<object class="GtkCellRendererText" id="thread_addr"/>
<attributes>
@@ -1691,6 +1698,7 @@
<property name="resizable">True</property>
<property name="title">Target Id</property>
<property name="expand">True</property>
+ <property name="sort_column_id">9</property>
<child>
<object class="GtkCellRendererText" id="thread_target_id"/>
<attributes>
@@ -1703,6 +1711,7 @@
<object class="GtkTreeViewColumn" id="thread_core_column">
<property name="resizable">True</property>
<property name="title">Core</property>
+ <property name="sort_column_id">10</property>
<child>
<object class="GtkCellRendererText" id="thread_core"/>
<attributes>
@@ -1744,6 +1753,7 @@
<object class="GtkTreeViewColumn" id="break_type_column">
<property name="resizable">True</property>
<property name="title">Type</property>
+ <property name="sort_column_id">4</property>
<child>
<object class="GtkCellRendererText" id="break_type"/>
<attributes>
@@ -1756,6 +1766,7 @@
<object class="GtkTreeViewColumn" id="break_id_column">
<property name="resizable">True</property>
<property name="title">Id</property>
+ <property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererText" id="break_id"/>
<attributes>
@@ -1767,6 +1778,7 @@
<child>
<object class="GtkTreeViewColumn" id="break_enabled_column">
<property name="resizable">True</property>
+ <property name="sort_column_id">5</property>
<child>
<object class="GtkCellRendererToggle" id="break_enabled"/>
<attributes>
@@ -1780,6 +1792,7 @@
<property name="resizable">True</property>
<property name="title">Location or expr</property>
<property name="expand">True</property>
+ <property name="sort_column_id">15</property>
<child>
<object class="GtkCellRendererText" id="break_display"/>
<attributes>
@@ -1792,6 +1805,7 @@
<object class="GtkTreeViewColumn" id="break_addr_column">
<property name="resizable">True</property>
<property name="title">Address</property>
+ <property name="sort_column_id">8</property>
<child>
<object class="GtkCellRendererText" id="break_addr"/>
<attributes>
@@ -1804,6 +1818,7 @@
<object class="GtkTreeViewColumn" id="break_times_column">
<property name="resizable">True</property>
<property name="title">Times</property>
+ <property name="sort_column_id">9</property>
<child>
<object class="GtkCellRendererText" id="break_times"/>
<attributes>
@@ -1816,6 +1831,7 @@
<object class="GtkTreeViewColumn" id="break_ignore_column">
<property name="resizable">True</property>
<property name="title">Ignore</property>
+ <property name="sort_column_id">10</property>
<child>
<object class="GtkCellRendererText" id="break_ignore"/>
<attributes>
@@ -1829,6 +1845,7 @@
<property name="resizable">True</property>
<property name="title">Condition</property>
<property name="expand">True</property>
+ <property name="sort_column_id">11</property>
<child>
<object class="GtkCellRendererText" id="break_cond"/>
<attributes>
@@ -1842,6 +1859,7 @@
<property name="resizable">True</property>
<property name="title">Script</property>
<property name="expand">True</property>
+ <property name="sort_column_id">12</property>
<child>
<object class="GtkCellRendererText" id="break_script"/>
<attributes>
@@ -1881,6 +1899,7 @@
<object class="GtkTreeViewColumn" id="stack_id_column">
<property name="resizable">True</property>
<property name="title">#</property>
+ <property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererText" id="stack_id"/>
<attributes>
@@ -1894,6 +1913,7 @@
<property name="resizable">True</property>
<property name="title">File</property>
<property name="expand">True</property>
+ <property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="stack_base_name"/>
<attributes>
@@ -1919,6 +1939,7 @@
<property name="resizable">True</property>
<property name="title">Function</property>
<property name="expand">True</property>
+ <property name="sort_column_id">4</property>
<child>
<object class="GtkCellRendererText" id="stack_func"/>
<attributes>
@@ -1932,6 +1953,7 @@
<property name="resizable">True</property>
<property name="title">Arguments</property>
<property name="expand">True</property>
+ <property name="sort_column_id">5</property>
<child>
<object class="GtkCellRendererText" id="stack_args"/>
<attributes>
@@ -1944,6 +1966,7 @@
<object class="GtkTreeViewColumn" id="stack_addr_column">
<property name="resizable">True</property>
<property name="title">Address</property>
+ <property name="sort_column_id">6</property>
<child>
<object class="GtkCellRendererText" id="stack_addr"/>
<attributes>
@@ -1983,6 +2006,7 @@
<child>
<object class="GtkTreeViewColumn" id="local_arg1_column">
<property name="resizable">True</property>
+ <property name="sort_column_id">5</property>
<child>
<object class="GtkCellRendererText" id="local_arg1"/>
<attributes>
@@ -1995,6 +2019,7 @@
<object class="GtkTreeViewColumn" id="local_name_column">
<property name="resizable">True</property>
<property name="title">Name</property>
+ <property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererText" id="local_name"/>
<attributes>
@@ -2008,6 +2033,7 @@
<property name="resizable">True</property>
<property name="title">Value</property>
<property name="expand">True</property>
+ <property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="local_display"/>
<attributes>
@@ -2048,6 +2074,7 @@
<child>
<object class="GtkTreeViewColumn" id="watch_enabled_column">
<property name="resizable">True</property>
+ <property name="sort_column_id">6</property>
<child>
<object class="GtkCellRendererToggle" id="watch_enabled"/>
<attributes>
@@ -2060,6 +2087,7 @@
<object class="GtkTreeViewColumn" id="watch_expr_column">
<property name="resizable">True</property>
<property name="title">Expression</property>
+ <property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererText" id="watch_expr"/>
<attributes>
@@ -2073,6 +2101,7 @@
<property name="resizable">True</property>
<property name="title">Value</property>
<property name="expand">True</property>
+ <property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="watch_display"/>
<attributes>
@@ -3315,7 +3344,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="option_library_messages">
- <property name="label" translatable="yes">Show li_brary messages</property>
+ <property name="label" translatable="yes">Show =li_brary messages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: scope/src/Makefile.am
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -13,8 +13,6 @@ scope_la_SOURCES = \
conterm.h \
debug.c \
debug.h \
- gtk216.c \
- gtk216.h \
inspect.c \
inspect.h \
local.c \
Modified: scope/src/common.h
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -29,7 +29,6 @@ typedef struct _MenuItem MenuItem;
#include "break.h"
#include "conterm.h"
#include "debug.h"
-#include "gtk216.h"
#include "inspect.h"
#include "local.h"
#include "memory.h"
Modified: scope/src/gtk216.c
78 lines changed, 0 insertions(+), 78 deletions(-)
===================================================================
@@ -1,78 +0,0 @@
-/*
- * gtk216.c
- *
- * Copyright 2012 Dimitar Toshkov Zhekov <dimitar.zhekov at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "common.h"
-
-#if !GTK_CHECK_VERSION(2, 18, 0)
-void gtk_widget_set_visible(GtkWidget *widget, gboolean visible)
-{
- if (visible)
- gtk_widget_show(widget);
- else
- gtk_widget_hide(widget);
-}
-#endif /* GTK 2.18.0 */
-
-typedef struct _SortColumnId
-{
- const char *id;
- gint sort_column_id;
-} SortColumnId;
-
-static const SortColumnId sort_column_ids[] =
-{
- { "thread_id_column", 0 },
- { "thread_pid_column", 3 },
- { "thread_group_id_column", 4 },
- { "thread_state_column", 5 },
- { "thread_base_name_column", 1 },
- { "thread_func_column", 7 },
- { "thread_addr_column", 8 },
- { "thread_target_id_column", 9 },
- { "thread_core_column", 10 },
- { "break_type_column", 4 },
- { "break_id_column", 0 },
- { "break_enabled_column", 5 },
- { "break_display_column", 14 },
- { "break_addr_column", 8 },
- { "break_times_column", 9 },
- { "break_ignore_column", 10 },
- { "break_cond_column", 11 },
- { "break_script_column", 12 },
- { "stack_id_column", 0 },
- { "stack_base_name_column", 1 },
- { "stack_func_column", 4 },
- { "stack_args_column", 5 },
- { "stack_addr_column", 6 },
- { "local_name_column", 0 },
- { "local_arg1_column", 5 },
- { "local_display_column", 1 },
- { "watch_enabled_column", 6 },
- { "watch_expr_column", 0 },
- { "watch_display_column", 1 },
- { NULL, 0 }
-};
-
-void gtk216_init(void)
-{
- const SortColumnId *scd;
-
- for (scd = sort_column_ids; scd->id; scd++)
- gtk_tree_view_column_set_sort_column_id(get_column(scd->id), scd->sort_column_id);
-}
Modified: scope/src/gtk216.h
32 lines changed, 0 insertions(+), 32 deletions(-)
===================================================================
@@ -1,32 +0,0 @@
-/*
- * gtk216.h
- *
- * Copyright 2012 Dimitar Toshkov Zhekov <dimitar.zhekov at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GTK216_H
-
-#if !GTK_CHECK_VERSION(2, 18, 0)
-#define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget)
-#define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget)
-void gtk_widget_set_visible(GtkWidget *widget, gboolean visible);
-#endif
-
-void gtk216_init(void);
-void gtk216_finalize(void);
-
-#define GTK216_H 1
-#endif
Modified: scope/src/scope.c
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -594,7 +594,6 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata)
debug_panel, get_widget("debug_label"));
/* startup */
- gtk216_init();
program_init();
prefs_init();
conterm_init();
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list