[gitg] Bump gtk+ version to 2.14
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gitg] Bump gtk+ version to 2.14
- Date: Sun, 10 Jan 2010 00:03:52 +0000 (UTC)
commit fc31d94d87b20d100474f7725d3acf1f6843abbc
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Sun Jan 10 01:03:43 2010 +0100
Bump gtk+ version to 2.14
configure.ac | 2 +-
gitg/gitg-preferences.ui | 2 +-
gitg/gitg-repository.ui | 2 +-
gitg/gitg-window.c | 16 ++++++++--------
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1de521b..e470c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
AM_GLIB_GNU_GETTEXT
PKG_CHECK_MODULES(PACKAGE, [
- gtk+-2.0 >= 2.12.0
+ gtk+-2.0 >= 2.14.0
gthread-2.0
gtksourceview-2.0 >= 2.8
gio-2.0
diff --git a/gitg/gitg-preferences.ui b/gitg/gitg-preferences.ui
index d19c884..846a829 100644
--- a/gitg/gitg-preferences.ui
+++ b/gitg/gitg-preferences.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.14"/>
<!-- interface-requires gitg 0.2 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment_collapse_inactive_lanes">
diff --git a/gitg/gitg-repository.ui b/gitg/gitg-repository.ui
index 61c8afd..5b821ae 100644
--- a/gitg/gitg-repository.ui
+++ b/gitg/gitg-repository.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.14"/>
<!-- interface-requires gitg 0.2 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="list_store_remotes">
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index bde62cc..6266bb0 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -2160,7 +2160,7 @@ popup_ref (GitgWindow *window, GdkEventButton *event)
{
gchar *label = g_strdup_printf (_("New local branch <%s>"), local);
- gtk_action_set_label (checkout, label);
+ g_object_set (checkout, "label", label, NULL);
gtk_action_set_visible (checkout, TRUE);
g_free (label);
}
@@ -2170,15 +2170,15 @@ popup_ref (GitgWindow *window, GdkEventButton *event)
}
g_free (local);
- gtk_action_set_label (remove, _("Remove remote branch"));
+ g_object_set (remove, "label", _("Remove remote branch"), NULL);
gtk_action_set_visible (rename, FALSE);
}
else if (gitg_ref_get_ref_type (ref) == GITG_REF_TYPE_BRANCH)
{
- gtk_action_set_label (checkout, _("Checkout working copy"));
- gtk_action_set_label (remove, _("Remove local branch"));
+ g_object_set (checkout, "label", _("Checkout working copy"), NULL);
+ g_object_set (remove, "label", _("Remove local branch"), NULL);
gtk_action_set_visible (rename, TRUE);
- gtk_action_set_label (rename, _("Rename local branch"));
+ g_object_set (rename, "label", _("Rename local branch"), NULL);
GitgRef *working = gitg_repository_get_current_working_ref (window->priv->repository);
@@ -2186,20 +2186,20 @@ popup_ref (GitgWindow *window, GdkEventButton *event)
}
else if (gitg_ref_get_ref_type (ref) == GITG_REF_TYPE_STASH)
{
- gtk_action_set_label (remove, _("Remove stash"));
+ g_object_set (remove, "label", _("Remove stash"), NULL);
gtk_action_set_visible (rename, FALSE);
gtk_action_set_visible (checkout, FALSE);
}
else if (gitg_ref_get_ref_type (ref) == GITG_REF_TYPE_TAG)
{
- gtk_action_set_label (remove, _("Remove tag"));
+ g_object_set (remove, "label", _("Remove tag"), NULL);
gtk_action_set_visible (rename, FALSE);
if (!has_local_ref (window, gitg_ref_get_shortname (ref)))
{
gchar *label = g_strdup_printf (_("New local branch <%s>"), gitg_ref_get_shortname (ref));
- gtk_action_set_label (checkout, label);
+ g_object_set (checkout, "label", label, NULL);
gtk_action_set_visible (checkout, TRUE);
g_free (label);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]