[pan2: 257/268] fddsf
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2: 257/268] fddsf
- Date: Mon, 2 Jan 2012 15:59:36 +0000 (UTC)
commit a34e7ea5457981321270817329fd60180863451b
Author: Heinrich MÃller <henmull src gnome org>
Date: Mon Jan 2 01:45:12 2012 +0100
fddsf
pan/gui/body-pane.cc | 2 +-
pan/gui/e-charset-combo-box.c | 2 +-
pan/gui/group-pane.cc | 10 +++++-----
pan/gui/group-prefs-dialog.cc | 2 +-
pan/gui/gtk_compat.h | 6 +++---
pan/gui/gui.cc | 2 +-
pan/gui/gui.h | 2 +-
pan/gui/header-pane.cc | 2 +-
pan/gui/post-ui.cc | 2 +-
pan/gui/prefs-ui.cc | 2 +-
pan/gui/save-ui.cc | 2 +-
pan/gui/score-add-ui.cc | 16 ++++++++--------
pan/gui/score-view-ui.cc | 14 +++++++-------
pan/gui/server-ui.cc | 8 ++++----
14 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 94b405e..26c9c34 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -42,7 +42,7 @@ extern "C" {
#include "tango-colors.h"
#include "xface.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#define FIRST_PICTURE "first-picture"
diff --git a/pan/gui/e-charset-combo-box.c b/pan/gui/e-charset-combo-box.c
index 2fe1948..42b1d30 100644
--- a/pan/gui/e-charset-combo-box.c
+++ b/pan/gui/e-charset-combo-box.c
@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include "e-charset.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#define E_CHARSET_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 378cf92..155dafa 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -33,7 +33,7 @@ extern "C" {
#include <pan/data/data.h>
#include "group-pane.h"
#include "pad.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -215,7 +215,7 @@ namespace
blah->path = path;
blah->col = col;
g_idle_add (maybe_activate_on_idle_idle, blah);
- }
+ }
}
gboolean
@@ -343,8 +343,8 @@ namespace
headers[0].groupname = *sub_title_quark;
headers[1].groupname = *other_title_quark;
g_object_weak_ref (G_OBJECT(store), delete_rows, headers);
-
- //
+
+ //
// subscribed
//
@@ -428,7 +428,7 @@ GroupPane :: on_group_subscribe (const Quark& groupname, bool sub)
++pos;
} while (gtk_tree_model_iter_next (model, &group_iter));
}
-
+
// move the row
_tree_store->reparent (_tree_store->get_row(§ion_iter), find_row(groupname), pos);
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index ee47e02..7f61be7 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -35,7 +35,7 @@ extern "C" {
#include "hig.h"
#include "pad.h"
#include "pan-file-entry.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
diff --git a/pan/gui/gtk_compat.h b/pan/gui/gtk_compat.h
index c4c5b29..ff58503 100644
--- a/pan/gui/gtk_compat.h
+++ b/pan/gui/gtk_compat.h
@@ -1,5 +1,5 @@
//========================================================================
-/** file pan/pan/gui/gtk_compat.h
+/** file pan/pan/gui/gtk-compat.h
* @author kid
* @date
* Created: Mon 09 May 2011 04:42:46 PM MDT \n
@@ -7,7 +7,7 @@
*/
/*------------------------------------------------------------------------
* Description: ÂdescriptionÂ
- *
+ *
*========================================================================
*/
@@ -116,5 +116,5 @@ namespace
#ifdef __cplusplus
}
#endif
-
+
#endif
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index a4c2187..99e89a8 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -63,7 +63,7 @@ extern "C" {
#include "server-ui.h"
#include "task-pane.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
namespace pan
{
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index 0babeb6..677fb38 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -30,7 +30,7 @@
#include <pan/gui/group-prefs.h>
#include <pan/gui/wait.h>
-#include "gtk_compat.h"
+#include "gtk-compat.h"
namespace pan
{
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index 46d56e4..27de4c3 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -41,7 +41,7 @@ extern "C" {
#include "header-pane.h"
#include "render-bytes.h"
#include "tango-colors.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 366e927..6cc0a58 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -47,7 +47,7 @@ extern "C" {
#include "post.ui.h"
#include "profiles-dialog.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#ifdef HAVE_GTKSPELL
#define DEFAULT_SPELLCHECK_FLAG true
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 2f7cce5..816ec64 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -31,7 +31,7 @@ extern "C" {
#include "prefs-ui.h"
#include "tango-colors.h"
#include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
#include "e-charset-dialog.h"
using namespace pan;
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 2cf3f1a..19a37e2 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -32,7 +32,7 @@ extern "C" {
#include "pad.h"
#include "pan-file-entry.h"
#include "save-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index 9584736..4703925 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -29,7 +29,7 @@ extern "C" {
#include "pad.h"
#include "score-add-ui.h"
#include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -195,9 +195,9 @@ namespace
{ TextMatch::CONTAINS, true, N_("doesn't contain")},
{ TextMatch::IS, false, N_("is")},
{ TextMatch::IS, true, N_("isn't")},
- { TextMatch::BEGINS_WITH, false, N_("starts with")},
+ { TextMatch::BEGINS_WITH, false, N_("starts with")},
{ TextMatch::ENDS_WITH, false, N_("ends with")},
- { TextMatch::REGEX, false, N_("matches regex")},
+ { TextMatch::REGEX, false, N_("matches regex")},
};
GtkListStore * store = gtk_list_store_new (TEXT_MATCH_COLS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
@@ -319,7 +319,7 @@ namespace
GtkTreeModel * model = field_tree_model_new ();
GtkWidget * field = setme_field = value_combo_new (model);
- g_object_unref (G_OBJECT(model));
+ g_object_unref (G_OBJECT(model));
gtk_box_pack_start (GTK_BOX(h), field, false, false, 0);
g_signal_connect (field, "changed", G_CALLBACK(field_changed_cb), h);
g_object_set_data (G_OBJECT(h), "field", field);
@@ -353,7 +353,7 @@ namespace
void
ScoreAddDialog :: add_this_to_scorefile (bool do_rescore)
{
-
+
// section
bool negate (false);
int value (0);
@@ -552,12 +552,12 @@ namespace
GtkWidget * button = gtk_button_new ();
GtkWidget * label = gtk_label_new_with_mnemonic (_("Add and Re_score"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
+
GtkWidget * image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
GtkWidget * image2 = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
GtkWidget * hbox = gtk_hbox_new (FALSE, 2);
GtkWidget * align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
+
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), image2, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -643,7 +643,7 @@ ScoreAddDialog :: ScoreAddDialog (Data & data,
gtk_widget_show (w);
// score
- h = gtk_hbox_new (false, PAD_SMALL);
+ h = gtk_hbox_new (false, PAD_SMALL);
model = score_tree_model_new ();
w = _score_menu = value_combo_new (model);
g_object_unref (model);
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index 6bc1974..d4ab4af 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -26,19 +26,19 @@ extern "C" {
#include "pad.h"
#include "score-add-ui.h"
#include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
namespace
{
- void
+ void
response_cb (GtkDialog * dialog, int response, gpointer data)
{
if (response == GTK_RESPONSE_APPLY)
static_cast<Data*>(data)->rescore ();
- gtk_widget_destroy (GTK_WIDGET(dialog));
+ gtk_widget_destroy (GTK_WIDGET(dialog));
}
enum
@@ -55,13 +55,13 @@ namespace
GtkWidget * button = gtk_button_new ();
GtkWidget * label = gtk_label_new_with_mnemonic (_("Close and Re_score"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
+
GtkWidget * image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
GtkWidget * image2 = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
GtkWidget * hbox = gtk_hbox_new (FALSE, 2);
GtkWidget * align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
+
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), image2, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -167,7 +167,7 @@ ScoreView :: tree_view_refresh ()
COLUMN_DATA, i, // index into _items
-1);
- // cleanup
+ // cleanup
g_string_free (criteria, TRUE);
}
}
@@ -185,7 +185,7 @@ ScoreView :: ScoreView (Data& data, GtkWindow* parent,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
GtkWidget * button = create_rescore_button ();
- gtk_widget_show (button);
+ gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG(w), button, GTK_RESPONSE_APPLY);
gtk_window_set_resizable (GTK_WINDOW(w), true);
g_signal_connect (GTK_OBJECT(w), "response", G_CALLBACK(response_cb), &data);
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 3ba8ee2..a368784 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -32,7 +32,7 @@ extern "C" {
#include "server-ui.h"
#include "pad.h"
#include "hig.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
using namespace pan;
@@ -417,7 +417,7 @@ namespace
GtkDialogFlags(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
- _("Really delete \"%s\"?"),
+ _("Really delete \"%s\"?"),
addr.c_str());
gtk_dialog_add_buttons (GTK_DIALOG(w),
GTK_STOCK_NO, GTK_RESPONSE_NO,
@@ -471,7 +471,7 @@ namespace
void
server_tree_view_row_activated_cb (GtkTreeView*, GtkTreePath*, GtkTreeViewColumn*, gpointer user_data)
{
- edit_button_clicked_cb (NULL, user_data);
+ edit_button_clicked_cb (NULL, user_data);
}
void
@@ -514,7 +514,7 @@ pan :: server_list_dialog_new (Data& data, Queue& queue, GtkWindow* parent)
gtk_tree_view_append_column (GTK_TREE_VIEW (d->server_tree_view), column);
GtkTreeSelection * selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (d->server_tree_view));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
+
// add callbacks
g_signal_connect (GTK_TREE_VIEW (d->server_tree_view), "row-activated",
G_CALLBACK (server_tree_view_row_activated_cb), d->dialog);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]